Browse Source

oscar template: using less to generate oscar.min.css

Thomas Pointhuber 10 years ago
parent
commit
f4457da0a1

+ 1 - 0
Makefile

@@ -46,6 +46,7 @@ minimal: bin/buildout minimal.cfg setup.py
 styles:
 styles:
 	@lessc -x searx/static/default/less/style.less > searx/static/default/css/style.css
 	@lessc -x searx/static/default/less/style.less > searx/static/default/css/style.css
 	@lessc -x searx/static/oscar/less/bootstrap/bootstrap.less > searx/static/oscar/css/bootstrap.min.css
 	@lessc -x searx/static/oscar/less/bootstrap/bootstrap.less > searx/static/oscar/css/bootstrap.min.css
+	@lessc -x searx/static/oscar/less/oscar/oscar.less > searx/static/oscar/css/oscar.min.css
 
 
 locales:
 locales:
 	@pybabel compile -d searx/translations
 	@pybabel compile -d searx/translations

+ 0 - 71
searx/static/oscar/css/oscar.css

@@ -1,71 +0,0 @@
-/* Sticky footer styles
--------------------------------------------------- */
-
-html {
-  position: relative;
-  min-height: 100%;
-}
-body {
-  /* Margin bottom by footer height */
-  margin-bottom: 80px;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  /* Set the fixed height of the footer here */
-  height: 60px;
-}
-
-input[type=checkbox]:checked ~ .label_hide_if_checked {
-  display:none;
-}
-
-input[type=checkbox]:not(:checked) ~ .label_hide_if_not_checked {
-  display:none;
-}
-
-.search_categories {
-  margin:10px 0;
-  text-transform: capitalize;
-}
-
-.result-default {
-    clear: both;
-}
-
-.result-images {
-    float: left !important;
-}
-
-.result-videos {
-    clear: both;
-}
-
-.result-torrents {
-    clear: both;
-}
-
-.img-thumbnail {
-    margin: 5px;
-    max-height: 128px;
-    min-height: 128px;
-}
-
-.suggestion_item {
-    margin: 2px 5px;
-}
-
-.result_download {
-    margin-right: 5px;
-}
-
-#pagination {
-    margin-top: 30px;
-    padding-bottom: 50px;
-}
-
-.cursor-text {
-    cursor: text !important;
-}

+ 15 - 0
searx/static/oscar/css/oscar.min.css

@@ -0,0 +1,15 @@
+html{position:relative;min-height:100%}
+body{margin-bottom:80px}
+.footer{position:absolute;bottom:0;width:100%;height:60px}
+input[type=checkbox]:checked~.label_hide_if_checked{display:none}
+input[type=checkbox]:not(:checked)~.label_hide_if_not_checked{display:none}
+.result-default{clear:both}
+.result-images{float:left !important}
+.img-thumbnail{margin:5px;max-height:128px;min-height:128px}
+.result-videos{clear:both}
+.result-torrents{clear:both}
+.suggestion_item{margin:2px 5px}
+.result_download{margin-right:5px}
+#pagination{margin-top:30px;padding-bottom:50px}
+.search_categories{margin:10px 0;text-transform:capitalize}
+.cursor-text{cursor:text !important}

+ 9 - 0
searx/static/oscar/less/oscar/checkbox.less

@@ -0,0 +1,9 @@
+// Hide element if checkbox is checked
+input[type=checkbox]:checked ~ .label_hide_if_checked {
+  display:none;
+}
+
+// Hide element if checkbox is not checked
+input[type=checkbox]:not(:checked) ~ .label_hide_if_not_checked {
+  display:none;
+}

+ 4 - 0
searx/static/oscar/less/oscar/cursor.less

@@ -0,0 +1,4 @@
+// display cursor
+.cursor-text {
+    cursor: text !important;
+}

+ 19 - 0
searx/static/oscar/less/oscar/footer.less

@@ -0,0 +1,19 @@
+// Sticky footer styles
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  /* Margin bottom by footer height */
+  margin-bottom: 80px;
+}
+
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  /* Set the fixed height of the footer here */
+  height: 60px;
+}

+ 9 - 0
searx/static/oscar/less/oscar/oscar.less

@@ -0,0 +1,9 @@
+@import "footer.less";
+
+@import "checkbox.less";
+
+@import "results.less";
+
+@import "search.less";
+
+@import "cursor.less";

+ 41 - 0
searx/static/oscar/less/oscar/results.less

@@ -0,0 +1,41 @@
+// default formating of results
+.result-default {
+    clear: both;
+}
+
+// image formating of results
+.result-images {
+    float: left !important;
+}
+
+.img-thumbnail {
+    margin: 5px;
+    max-height: 128px;
+    min-height: 128px;
+}
+
+// video formating of results
+.result-videos {
+    clear: both;
+}
+
+// torrent formating of results
+.result-torrents {
+    clear: both;
+}
+
+// suggestion
+.suggestion_item {
+    margin: 2px 5px;
+}
+
+// download result
+.result_download {
+    margin-right: 5px;
+}
+
+// page forward, backward
+#pagination {
+    margin-top: 30px;
+    padding-bottom: 50px;
+}

+ 4 - 0
searx/static/oscar/less/oscar/search.less

@@ -0,0 +1,4 @@
+.search_categories {
+  margin:10px 0;
+  text-transform: capitalize;
+}

+ 1 - 1
searx/templates/oscar/base.html

@@ -10,7 +10,7 @@
     
     
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}" type="text/css" />
     {% if autocomplete %}<link rel="stylesheet" href="{{ url_for('static', filename='css/typeahead.css') }}" type="text/css" />{% endif %}
     {% if autocomplete %}<link rel="stylesheet" href="{{ url_for('static', filename='css/typeahead.css') }}" type="text/css" />{% endif %}
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.css') }}" type="text/css" />  
+    <link rel="stylesheet" href="{{ url_for('static', filename='css/oscar.min.css') }}" type="text/css" />  
     
     
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
     <!--[if lt IE 9]>