Merge pull request #474 from return42/simple-results

 [simple theme] various improvements #474 

5 files changed, 44 insertions, 71 deletions

diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less
index e40acb947..a09735c5e 100644
--- a/searx/static/themes/simple/src/less/definitions.less
+++ b/searx/static/themes/simple/src/less/definitions.less
@@ -25,7 +25,6 @@
   --color-backtotop-font: #444;
   --color-backtotop-border: #ddd;
   --color-backtotop-background: #fff;
-  --color-backtotop-shadow: #ccc;
   /// Button Colors
   --color-btn-background: #3050ff;
   --color-btn-font: #fff;
@@ -54,7 +53,6 @@
   --color-answer-font: #444;  // same as --color-base-font
   --color-answer-background: #f7f7f7; // same as --color-header-background:
   /// Results Colors
-  --color-result-shadow: #ccc;
   --color-result-border: #ddd;
   --color-result-url-font: #000;
   --color-result-vim-selected: #f7f7f7;
@@ -94,14 +92,12 @@
   --color-toolkit-select-border: #ddd;
   --color-toolkit-select-border-hover: #bbb;
   --color-toolkit-checkbox-onoff-background: #ddd;
-  --color-toolkit-checkbox-onoff-label-shadow: rgba(0, 0, 0, 0.3);
   --color-toolkit-checkbox-onoff-label-background: #3050ff;
-  --color-toolkit-checkbox-onoff-checked-background: #ddd;
+  --color-toolkit-checkbox-onoff-checked-background: #aaa;
   --color-toolkit-checkbox-label-background: #fff;
   --color-toolkit-checkbox-label-border: #ddd;
   --color-toolkit-checkbox-input-border: #3050ff;
   --color-toolkit-engine-tooltip-border: #ddd;
-  --color-toolkit-engine-tooltip-shadow: #ccc;
   --color-toolkit-engine-tooltip-background: #fff;
   --color-toolkit-loader-border: rgba(0, 0, 0, 0.2);
   --color-toolkit-loader-borderleft: rgba(255, 255, 255, 0);
@@ -129,7 +125,6 @@
     --color-backtotop-font: #bbb;
     --color-backtotop-border: #333;
     --color-backtotop-background: #181818;
-    --color-backtotop-shadow: #333;
     /// Button Colors
     --color-btn-background: #58f;
     --color-btn-font: #222;
@@ -158,7 +153,6 @@
     --color-answer-font: #bbb; // same as --color-base-font
     --color-answer-background: #181818; // same as --color-header-background:
     /// Results Colors
-    --color-result-shadow: #333;
     --color-result-border: #333;
     --color-result-url-font: #fff;
     --color-result-vim-selected: #181818;
@@ -198,14 +192,12 @@
     --color-toolkit-select-border: #555;
     --color-toolkit-select-border-hover: #777;
     --color-toolkit-checkbox-onoff-background: #3c3b31;
-    --color-toolkit-checkbox-onoff-label-shadow: rgba(0, 0, 0, 0.3);
     --color-toolkit-checkbox-onoff-label-background: #58f;
     --color-toolkit-checkbox-onoff-checked-background: #ddd;
     --color-toolkit-checkbox-label-background: #fff;
     --color-toolkit-checkbox-label-border: #333;
     --color-toolkit-checkbox-input-border: #58f;
     --color-toolkit-engine-tooltip-border: #333;
-    --color-toolkit-engine-tooltip-shadow: #333;
     --color-toolkit-engine-tooltip-background: #222;
     --color-toolkit-loader-border: rgba(255, 255, 255, 0.2);
     --color-toolkit-loader-borderleft: rgba(0, 0, 0, 0);
diff --git a/searx/static/themes/simple/src/less/mixins.less b/searx/static/themes/simple/src/less/mixins.less
index 19955675b..cc4a5bc64 100644
--- a/searx/static/themes/simple/src/less/mixins.less
+++ b/searx/static/themes/simple/src/less/mixins.less
@@ -22,6 +22,12 @@
   border-radius: @radius;
 }
 
+.rounded-corners-tiny (@radius: 5px) {
+  -webkit-border-radius: @radius;
+  -moz-border-radius: @radius;
+  border-radius: @radius;
+}
+
 // disable user selection
 .disable-user-select () {
   -webkit-touch-callout: none;
diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less
index 90a6a299e..960e8bc9c 100644
--- a/searx/static/themes/simple/src/less/search.less
+++ b/searx/static/themes/simple/src/less/search.less
@@ -38,12 +38,6 @@
   display: inline-flex;
   flex-direction: row;
   white-space: nowrap;
-
-  /*
-  &:has(q:focus) {
-  box-shadow: 0px 0px 5px #CCC;
-}
-*/
 }
 
 #clear_search {
@@ -252,10 +246,6 @@
     .disable-user-select;
   }
 
-  input[type="checkbox"]:focus + label {
-    box-shadow: 0 0 8px var(--color-categories-item-border-selected);
-  }
-
   input[type="checkbox"]:checked + label {
     color: var(--color-categories-item-selected-font);
     border-bottom: 2px solid var(--color-categories-item-border-selected);
diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less
index 8fc760aaa..2c08c5d31 100644
--- a/searx/static/themes/simple/src/less/style.less
+++ b/searx/static/themes/simple/src/less/style.less
@@ -140,6 +140,16 @@ article.result-images[data-vim-selected] {
   }
 }
 
+article[data-vim-selected].category-videos,
+article[data-vim-selected].category-news,
+article[data-vim-selected].category-map,
+article[data-vim-selected].category-music,
+article[data-vim-selected].category-files,
+article[data-vim-selected].category-social {
+  border: 1px solid var(--color-result-vim-arrow);
+  .rounded-corners;
+}
+
 .result {
   margin: @results-margin 0;
   padding: @result-padding;
@@ -164,8 +174,6 @@ article.result-images[data-vim-selected] {
       &:hover {
         text-decoration: underline;
         border: none;
-        -webkit-box-shadow: none;
-        box-shadow: none;
         outline: none;
       }
     }
@@ -239,6 +247,17 @@ article.result-images[data-vim-selected] {
   }
 }
 
+.category-videos,
+.category-news,
+.category-map,
+.category-music,
+.category-files,
+.category-social {
+  border: 1px solid var(--color-result-border);
+  margin: 1rem 0;
+  .rounded-corners;
+}
+
 .category-social .image {
   width: auto !important;
   min-width: 48px;
@@ -275,7 +294,7 @@ article.result-images[data-vim-selected] {
   padding: 0;
   position: relative;
   max-height: 200px;
-  border: none;
+  border: none !important;
 
   img {
     float: inherit;
@@ -348,7 +367,6 @@ article.result-images[data-vim-selected] {
     "pagination sidebar";
 }
 
-#results #answers *:first-child,
 #results #sidebar *:first-child,
 #results #urls *:first-child {
   margin-top: 0;
@@ -373,9 +391,7 @@ article.result-images[data-vim-selected] {
 }
 
 #suggestions,
-#answers,
-#infoboxes,
-#corrections {
+#infoboxes {
   input {
     padding: 0;
     margin: 3px;
@@ -407,11 +423,13 @@ article.result-images[data-vim-selected] {
   h4,
   input[type="submit"] {
     display: inline-block;
-    margin: 0 0.5em 0 0;
+    padding: 0.5rem;
+    margin: 0.5rem;
   }
 
-  input[type="submit"]::after {
-    content: ", ";
+  input[type="submit"] {
+    font-size: 0.8rem;
+    .rounded-corners-tiny;
   }
 }
 
@@ -426,21 +444,17 @@ article.result-images[data-vim-selected] {
   grid-area: answers;
   border: 1px solid var(--color-answer-border);
   background: var(--color-answer-background);
-  padding: 0.9em;
-  margin-bottom: @results-margin;
+  padding: @result-padding;
+  margin: 1rem @results-tablet-offset;
+  margin-top: 0;
   color: var(--color-answer-font);
   .rounded-corners;
 
   h4 {
     display: none;
   }
-
-  .answer {
-    display: block;
-  }
 }
 
-#answers,
 #infoboxes {
   form {
     min-width: 210px;
@@ -549,7 +563,6 @@ article.result-images[data-vim-selected] {
   margin: 0;
   padding: 0;
   font-size: 1em;
-  box-shadow: 0 0 5px var(--color-backtotop-shadow);
   background: var(--color-backtotop-background);
   position: fixed;
   bottom: 8rem;
@@ -674,10 +687,6 @@ article.result-images[data-vim-selected] {
       "urls"
       "pagination";
   }
-
-  article[data-vim-selected]::before {
-    left: calc(((100% - @results-width) / 2) - 20px);
-  }
 }
 
 #main_results div#results.only_template_images {
@@ -711,12 +720,7 @@ article.result-images[data-vim-selected] {
 @media screen and (max-width: @phone) {
   #main_results div#results {
     grid-template-columns: 100%;
-    margin: 2rem 0 0 0;
-  }
-
-  article[data-vim-selected]::before {
-    display: none;
-    content: "";
+    margin: 2rem @results-tablet-offset 0 @results-tablet-offset;
   }
 
   #linkto_preferences {
@@ -726,20 +730,6 @@ article.result-images[data-vim-selected] {
     right: 0;
   }
 
-  #sidebar {
-    margin: 0 5px 2px 5px;
-  }
-
-  .infobox {
-    box-shadow: 0 0 5px var(--color-result-shadow);
-  }
-
-  #corrections,
-  #answers {
-    margin: 1rem @results-tablet-offset;
-    box-shadow: 0 0 5px var(--color-result-shadow);
-  }
-
   #results {
     margin: 0;
     padding: 0;
@@ -749,15 +739,14 @@ article.result-images[data-vim-selected] {
     margin: 2rem 1rem 0 1rem !important;
   }
 
-  .result {
-    margin: 1rem @results-tablet-offset;
-    border: 1px solid var(--color-result-border);
-    box-shadow: 0 0 5px var(--color-result-shadow);
+  article[data-vim-selected] {
+    border: 1px solid var(--color-result-vim-arrow);
     .rounded-corners;
   }
 
-  article[data-vim-selected] {
+  .result {
     border: 1px solid var(--color-result-border);
+    margin: 1rem 0;
     .rounded-corners;
   }
 
@@ -765,7 +754,6 @@ article.result-images[data-vim-selected] {
     margin: 0;
     padding: 0;
     border: none;
-    box-shadow: none;
   }
 }
 
diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less
index fef59b5a6..4f1c3f338 100644
--- a/searx/static/themes/simple/src/less/toolkit.less
+++ b/searx/static/themes/simple/src/less/toolkit.less
@@ -111,6 +111,7 @@ div.selectable_url {
   overflow: hidden;
   height: 1.2em;
   line-height: 1.2em;
+  .rounded-corners-tiny;
 
   pre {
     .pre();
@@ -200,7 +201,6 @@ div.selectable_url {
   transform: translate(-50%, -50%);
   z-index: 100000;
   margin: 0 50% 0 0;
-  box-shadow: 0 0 1em;
 }
 
 // btn-collapse
@@ -370,7 +370,6 @@ select {
       top: -5px;
       cursor: pointer;
       border-radius: 50px;
-      box-shadow: 0 3px 5px 0 var(--color-toolkit-checkbox-onoff-label-shadow);
       transition: all 0.4s ease;
       left: 27px;
       background-color: var(--color-toolkit-checkbox-onoff-label-background);
@@ -432,7 +431,6 @@ select {
     // disabled : can''t be focused, show only the check mark
     input[disabled] + label {
       background-color: transparent !important;
-      box-shadow: none !important;
       cursor: inherit;
     }
 
@@ -504,7 +502,6 @@ select {
   padding: 0.5rem 1rem;
   margin: 0 0 0 2rem;
   border: 1px solid var(--color-toolkit-engine-tooltip-border);
-  box-shadow: 0 0 5px var(--color-toolkit-engine-tooltip-shadow);
   background: var(--color-toolkit-engine-tooltip-background);
   font-size: 14px;
   font-weight: normal;