From 7b44fd47a72ab0c9a4c586193757a4f195bb5fe4 Mon Sep 17 00:00:00 2001
From: Thomas Pointhuber <thomas.pointhuber@gmx.at>
Date: Mon, 22 Dec 2014 15:28:23 +0100
Subject: [PATCH] [enh] improve grunt-file for oscar_template

---
 searx/static/oscar/css/bootstrap.min.css | Bin 114586 -> 113911 bytes
 searx/static/oscar/css/oscar.min.css     | Bin 3454 -> 3387 bytes
 searx/static/oscar/gruntfile.js          |  43 +++++++++++++++++++++--
 searx/static/oscar/js/searx.min.js       | Bin 5026 -> 5026 bytes
 searx/static/oscar/package.json          |   3 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/searx/static/oscar/css/bootstrap.min.css b/searx/static/oscar/css/bootstrap.min.css
index 691604be6ac3671e5df785c4720f3adeba26acf2..fb0e84ae429d9fe45130887dafe747f77cfa7f31 100644
GIT binary patch
delta 5892
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

delta 6707
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

diff --git a/searx/static/oscar/css/oscar.min.css b/searx/static/oscar/css/oscar.min.css
index 6ca433a3392109364ed4dfcb0f1ae66cecabc514..28f66e3d35d1f10b889eeeed6dafec986f92e421 100644
GIT binary patch
delta 666
zcmew-wOeY#21aIc1B1z17~R42e@4^Irc7HIC%<OaoGi*RPq!#FrB*K^Gd&{*h)Wdo
zva6HxbMlL<(u-14^Q_bI^GbBfQ$bQzKw~yPVG(C!25Oo7pH)mGFR`o=UBzTwHs5$`
z5-66W7gwX1j4E9UbwojFQ9({Bh8+*s4C=AE55<)16ntJmRhmb<(gLtjc4!DqUdS#c
ziq$QX&$G9(f@LO0b4UuhVfdnrBiaBMrYH`{ONBZ_*~Q4j(AW_}lQ3t14Te#uMwH<5
z%jCtJCc=(J7)DHf&3TE*$#L?2E-zsxGb0RpWw}lCoXjlH#Zhc7u0XbVauatJ#Q&Q=
TbGtG!8z>k|cIMS*0n)Vqj*IFd

delta 693
zcmdlj^-pTU21b^o{G61@n;G39jK7Sgj0&5Ln6@%9DolRPtO+CqSmv=Prx_Sb-pC><
zp=@AaVPIfjotB?hqFbJtnVwN%1u|jtZ5DAxBapIMy$qme4oF5pFFm6=IX@@A$O@<r
zq!UBmWO+7UkfGQm8`xwZ&YI6ACZP<n7@HBN*$i;HYq9{lSTZh0qc}A?58+g-UPM)0
zfU0_OBRkNAI09$#8unHrs3eLhdC3S<(lEm&fg>8?{e2wb;weTZhQ^7Qie7UBIAH2U
zwWb7N4OXvBF6T56Ni@PVX7WDHOKeGrMutX)lLcAjCvW9a7fCWR!gR%ZE)&BfGYbp}
w6n7L?pt@snAa@o!G+Z_x;C5x?E-6aPD=tVZO3f>oY{(-#S(;ad2T80J0F9mKU;qFB

diff --git a/searx/static/oscar/gruntfile.js b/searx/static/oscar/gruntfile.js
index 79da491c4..c591e8505 100644
--- a/searx/static/oscar/gruntfile.js
+++ b/searx/static/oscar/gruntfile.js
@@ -33,9 +33,43 @@ module.exports = function(grunt) {
         }
       }
     },
+    less: {
+        development: {
+            options: {
+                paths: ["less/oscar"]
+                //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n'
+            },
+            files: {"css/oscar.css": "less/oscar/oscar.less"}
+        },
+        production: {
+            options: {
+                paths: ["less/oscar"],
+                //banner: '/*! less/oscar/oscar.css | <%= grunt.template.today("dd-mm-yyyy") %> | https://github.com/asciimoo/searx */\n',
+                cleancss: true
+            },
+            files: {"css/oscar.min.css": "less/oscar/oscar.less"}
+        },
+        bootstrap: {
+            options: {
+                paths: ["less/bootstrap"],
+                cleancss: true
+            },
+            files: {"css/bootstrap.min.css": "less/bootstrap/bootstrap.less"}
+        },
+    },
     watch: {
-      files: ['<%= jshint.files %>'],
-      tasks: ['jshint']
+        scripts: {
+            files: ['<%= jshint.files %>'],
+            tasks: ['jshint', 'concat', 'uglify']
+        },
+        oscar_styles: {
+            files: ['less/oscar/**/*.less'],
+            tasks: ['less:development', 'less:production']
+        },
+        bootstrap_styles: {
+            files: ['less/bootstrap/**/*.less'],
+            tasks: ['less:bootstrap']
+        }
     }
   });
 
@@ -43,9 +77,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-concat');
+  grunt.loadNpmTasks('grunt-contrib-less');
 
   grunt.registerTask('test', ['jshint']);
 
-  grunt.registerTask('default', ['jshint', 'concat', 'uglify']);
+  grunt.registerTask('default', ['jshint', 'concat', 'uglify', 'less']);
+  
+  grunt.registerTask('styles', ['less']);
 
 };
diff --git a/searx/static/oscar/js/searx.min.js b/searx/static/oscar/js/searx.min.js
index 2fba710630d38cc0c3eaf502750699834ac52550..0b3aa73f9e799a3252ab027a2cb7d26e57bb92ed 100644
GIT binary patch
delta 13
UcmZ3azDRw7B$JWRM(K8803O){2mk;8

delta 13
UcmZ3azDRw7B$J`#M(K8803P-P4gdfE

diff --git a/searx/static/oscar/package.json b/searx/static/oscar/package.json
index 945b7943d..7eae9df2b 100644
--- a/searx/static/oscar/package.json
+++ b/searx/static/oscar/package.json
@@ -4,7 +4,8 @@
         "grunt-contrib-uglify": "~0.6.0",
         "grunt-contrib-watch" : "~0.6.1",
         "grunt-contrib-concat" : "~0.5.0",
-        "grunt-contrib-jshint" : "~0.10.0"
+        "grunt-contrib-jshint" : "~0.10.0",
+        "grunt-contrib-less" : "~0.11.0"
     },
     
     "scripts": {