Browse Source

[fix] fix the reset button in the oscar theme (#2306)

Rely on javascript instead of type="clear"

Close #2009
GazoilKerozen 4 years ago
parent
commit
1b700738eb

+ 15 - 0
searx/static/themes/oscar/css/logicodev-dark.css

@@ -175,6 +175,10 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
   font-size: 10px;
   float: right;
 }
+.result-abstract {
+  margin-top: 0.5em;
+  margin-bottom: 0.8em;
+}
 .external-link {
   color: #068922;
   font-size: 12px;
@@ -238,6 +242,17 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
 .result-torrent .leechers {
   color: #f35e77;
 }
+.result-metadata {
+  clear: both;
+  margin: 1em;
+}
+.result-metadata td {
+  padding-right: 1em;
+  color: #a4a4a4;
+}
+.result-metadata td:first-of-type {
+  color: #666666;
+}
 .result-map {
   clear: both;
 }

File diff suppressed because it is too large
+ 0 - 0
searx/static/themes/oscar/css/logicodev-dark.min.css


+ 15 - 0
searx/static/themes/oscar/css/logicodev.css

@@ -148,6 +148,10 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
   font-size: 10px;
   float: right;
 }
+.result-abstract {
+  margin-top: 0.5em;
+  margin-bottom: 0.8em;
+}
 .external-link {
   color: #068922;
   font-size: 12px;
@@ -211,6 +215,17 @@ input[type=checkbox]:not(:checked) + .label_hide_if_checked + .label_hide_if_not
 .result-torrent .leechers {
   color: #f35e77;
 }
+.result-metadata {
+  clear: both;
+  margin: 1em;
+}
+.result-metadata td {
+  padding-right: 1em;
+  color: #a4a4a4;
+}
+.result-metadata td:first-of-type {
+  color: #666666;
+}
 .result-map {
   clear: both;
 }

File diff suppressed because it is too large
+ 0 - 0
searx/static/themes/oscar/css/logicodev.min.css


+ 7 - 0
searx/static/themes/oscar/js/searx.js

@@ -123,6 +123,13 @@ $(document).ready(function(){
      */
     $('#q.autofocus').focus();
 
+    /**
+     * Empty search bar when click on reset button
+     */
+    $("#clear_search").click(function () {
+	document.getElementById("q").value = "";
+    });
+
     /**
      * select full content on click if class="select-all-on-click"
      */

File diff suppressed because it is too large
+ 0 - 1
searx/static/themes/oscar/js/searx.min.js


+ 7 - 0
searx/static/themes/oscar/js/searx_src/element_modifiers.js

@@ -21,6 +21,13 @@ $(document).ready(function(){
      */
     $('#q.autofocus').focus();
 
+    /**
+     * Empty search bar when click on reset button
+     */
+    $("#clear_search").click(function () {
+	document.getElementById("q").value = "";
+    });
+
     /**
      * select full content on click if class="select-all-on-click"
      */

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

@@ -6,7 +6,7 @@
         <input type="search" autofocus name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
-            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
+	    <button type="button" id="clear_search" class="btn btn-default hide_if_nojs" aria-label="{{ _('Clear search') }}">{{ icon('remove') }}</button>
         </span>
       </div>
     </div>

Some files were not shown because too many files changed in this diff