From 88c17d106d9fb04e6b77b5c12598d80fe6d8c477 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Fri, 24 Sep 2021 20:16:24 +0200 Subject: [PATCH 1/8] [fix] make selected tabs not change wifth anymore compared to not being selected --- searx/static/themes/simple/src/less/toolkit.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less index 8a5a7ef38..f56a0edd0 100644 --- a/searx/static/themes/simple/src/less/toolkit.less +++ b/searx/static/themes/simple/src/less/toolkit.less @@ -301,8 +301,6 @@ html body .tabs > input:checked { border-bottom: 2px solid @color-categories-item-border-selected; background: @color-categories-item-selected; color: @color-categories-item-selected-font; - font-weight: bold; - letter-spacing: -0.1px; } + label + section { From cc3c54f4cdd5d78a3db8cc80dd7ce53275133294 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 25 Jun 2021 11:31:14 +0200 Subject: [PATCH 2/8] simple theme: update --- .../themes/simple/src/less/definitions.less | 1 + .../static/themes/simple/src/less/search.less | 2 +- .../static/themes/simple/src/less/style.less | 102 ++++++++++++------ 3 files changed, 74 insertions(+), 31 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index 246f8daa1..6f2de5250 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -32,6 +32,7 @@ @color-url-font: #29314d; @color-url-visited-font: #684898; @results-width: 50em; +@results-offset: 4rem; @search-width: 40em; // diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less index ec67b9f1c..09ee92646 100644 --- a/searx/static/themes/simple/src/less/search.less +++ b/searx/static/themes/simple/src/less/search.less @@ -181,7 +181,7 @@ .category { display: block; - width: 90%; + width: 100%; label { border-bottom: 0; diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index c30d3e706..84c1a201b 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -52,9 +52,17 @@ main { margin: 0; } +body { + display: flex; + flex-direction: column; + height: 100vh; + margin: 0; +} + main { width: 100%; - // position: absolute; + margin-bottom: 2rem; + flex: 1; } #main_preferences, @@ -65,13 +73,14 @@ main { } footer { - bottom: 0; - height: 3em; - margin: 1em 0; - padding: 1em 0; clear: both; + min-height: 4rem; + padding: 1em 0; width: 100%; text-align: center; + background-color: #f2f2f2; + border-top: 1px solid #e4e4e4; + overflow: hidden; p { font-size: 0.9em; @@ -356,12 +365,33 @@ article.result-images[data-vim-selected]::before { } #results { - margin: 2em 2em 20px 2em; + margin: 2rem 2rem 0 2rem; + display: grid; + grid-template-columns: (@results-width + @results-offset) 1fr; + grid-template-rows: min-content 1fr min-content; + gap: 0 3rem; + grid-template-areas: + "answers sidebar" + "suggestions sidebar" + "urls sidebar" + "pagination sidebar"; +} + +#results #answers *:first-child, +#results #sidebar *:first-child, +#results #urls *:first-child { + margin-top: 0; +} + +#urls { + margin: 0.5em 2em 20px 0; padding: 0; - width: @results-width; + grid-area: urls; } #suggestions { + grid-area: suggestions; + .wrapper { display: flex; flex-flow: row wrap; @@ -430,6 +460,7 @@ article.result-images[data-vim-selected]::before { } #answers { + grid-area: answers; margin: 10px 8px 10px 8px; border: 1px solid #ddd; padding: 0.9em; @@ -454,9 +485,7 @@ article.result-images[data-vim-selected]::before { } #sidebar { - position: absolute; - top: 100px; - left: 57em; + grid-area: sidebar; margin: 0 2px 5px 5px; padding: 0 2px 2px; max-width: 25em; @@ -542,7 +571,7 @@ article.result-images[data-vim-selected]::before { } #pagination { - clear: both; + grid-area: pagination; br { clear: both; @@ -574,7 +603,7 @@ article.result-images[data-vim-selected]::before { } } -@media screen and (max-width: 75em) { +@media screen and (max-width: 1250px) { #main_preferences, #main_about, #main_stats { @@ -603,7 +632,6 @@ article.result-images[data-vim-selected]::before { } #sidebar { - position: static; max-width: @results-width; margin: 0 0 2px 0; padding: 0; @@ -673,32 +701,47 @@ article.result-images[data-vim-selected]::before { } #main_results div#results.only_template_images { - flex-direction: column; - width: auto; - display: flex; - - #sidebar { - position: relative; - top: auto; - order: 2; - } + margin: 2rem 2rem 0 2rem; + display: grid; + grid-template-columns: 100%; + grid-template-rows: min-content min-content 1fr min-content min-content; + gap: 0 3rem; + grid-template-areas: + "answers" + "suggestions" + "urls" + "sidebar" + "pagination"; #urls { - position: relative; - order: 1; + width: inherit; + margin: 0 0 20px 0; } #backToTop { right: 0.5em; left: auto; } - - #pagination { - position: relative; - order: 3; - } } +/* +@media screen and (max-width: 1250px) { + #main_results div#results { + margin: 2rem 2rem 0 2rem; + display: grid; + grid-template-columns: (@results-width + @results-offset) 1fr; + grid-template-rows: min-content min-content min-content 1fr min-content min-content; + gap: 0 3rem; + grid-template-areas: + "answers empty" + "suggestions empty" + "sidebar empty" + "urls empty" + "pagination empty"; + } +} +*/ + @media screen and (max-width: @results-width) { article[data-vim-selected]::before { display: none; @@ -723,7 +766,6 @@ article.result-images[data-vim-selected]::before { #results { margin: 0; padding: 0; - width: initial; } #backToTop { From 385dce213b3541feadcb820fdb49a8c7d6a39fc2 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Sat, 25 Sep 2021 15:59:10 +0200 Subject: [PATCH 3/8] [theme] cleanup grid layout and remove various margins and paddings from elements --- .../themes/simple/src/less/definitions.less | 16 +++++- .../static/themes/simple/src/less/search.less | 12 ++-- .../static/themes/simple/src/less/style.less | 57 ++++++++++--------- .../themes/simple/src/less/toolkit.less | 4 +- 4 files changed, 52 insertions(+), 37 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index 6f2de5250..c74358078 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -31,8 +31,10 @@ @color-url-font: #29314d; @color-url-visited-font: #684898; -@results-width: 50em; -@results-offset: 4rem; +@results-width: 40em; +@results-offset: 8rem; +@results-tablet-offset: 0.5rem; +@results-gap: 4em; @search-width: 40em; // @@ -41,6 +43,16 @@ /// Start-Screen +/// Header + +@color-header-background: #f7f7f7; +@color-header-border: #d7d7d7; + +/// Footer + +@color-footer-background: #f7f7f7; +@color-footer-border: #d7d7d7; + /// Search-Input @color-search-border: @color-base; diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less index 09ee92646..dd810de2a 100644 --- a/searx/static/themes/simple/src/less/search.less +++ b/searx/static/themes/simple/src/less/search.less @@ -3,10 +3,10 @@ */ #search { - padding: 0 2em; + padding: 0 2em 0 @results-offset; margin: 0; - background: #f7f7f7; - border-bottom: 1px solid #d7d7d7; + background: @color-header-background; + border-bottom: 1px solid @color-header-border; } #search_wrapper { @@ -104,7 +104,11 @@ vertical-align: middle; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 1250px) { + #search { + padding: 0 @results-tablet-offset; + } + #categories { font-size: 90%; clear: both; diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 84c1a201b..aab913639 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -78,8 +78,8 @@ footer { padding: 1em 0; width: 100%; text-align: center; - background-color: #f2f2f2; - border-top: 1px solid #e4e4e4; + background-color: @color-footer-background; + border-top: 1px solid @color-footer-border; overflow: hidden; p { @@ -102,7 +102,6 @@ footer { input[type="submit"], #results button[type="submit"] { padding: 0.5rem; - margin: 2px 4px; display: inline-block; background: @color-download-button-background; color: @color-download-button-font; @@ -365,11 +364,11 @@ article.result-images[data-vim-selected]::before { } #results { - margin: 2rem 2rem 0 2rem; + margin: 2rem 2rem 0 @results-offset; display: grid; - grid-template-columns: (@results-width + @results-offset) 1fr; - grid-template-rows: min-content 1fr min-content; - gap: 0 3rem; + grid-template-columns: (@results-width + @results-offset) 25em; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 @results-gap; grid-template-areas: "answers sidebar" "suggestions sidebar" @@ -384,7 +383,6 @@ article.result-images[data-vim-selected]::before { } #urls { - margin: 0.5em 2em 20px 0; padding: 0; grid-area: urls; } @@ -486,9 +484,6 @@ article.result-images[data-vim-selected]::before { #sidebar { grid-area: sidebar; - margin: 0 2px 5px 5px; - padding: 0 2px 2px; - max-width: 25em; word-wrap: break-word; .infobox { @@ -592,7 +587,7 @@ article.result-images[data-vim-selected]::before { background: white; position: fixed; bottom: 85px; - left: @results-width; + left: @results-width + @results-offset + @results-gap; transition: opacity 0.5s; opacity: 0; @@ -632,8 +627,6 @@ article.result-images[data-vim-selected]::before { } #sidebar { - max-width: @results-width; - margin: 0 0 2px 0; padding: 0; float: none; border: none; @@ -698,14 +691,18 @@ article.result-images[data-vim-selected]::before { max-width: 98%; } } + + #backToTop { + left: @results-width; + } } #main_results div#results.only_template_images { - margin: 2rem 2rem 0 2rem; + margin: 2rem @results-tablet-offset 0 @results-tablet-offset; display: grid; grid-template-columns: 100%; grid-template-rows: min-content min-content 1fr min-content min-content; - gap: 0 3rem; + gap: 0; grid-template-areas: "answers" "suggestions" @@ -715,7 +712,7 @@ article.result-images[data-vim-selected]::before { #urls { width: inherit; - margin: 0 0 20px 0; + margin: 0; } #backToTop { @@ -724,23 +721,27 @@ article.result-images[data-vim-selected]::before { } } -/* @media screen and (max-width: 1250px) { #main_results div#results { - margin: 2rem 2rem 0 2rem; + margin: 2rem @results-tablet-offset 0 @results-tablet-offset; display: grid; - grid-template-columns: (@results-width + @results-offset) 1fr; + grid-template-columns: 50em; grid-template-rows: min-content min-content min-content 1fr min-content min-content; - gap: 0 3rem; + gap: 0; grid-template-areas: - "answers empty" - "suggestions empty" - "sidebar empty" - "urls empty" - "pagination empty"; - } + "answers" + "suggestions" + "sidebar" + "urls" + "pagination"; + } +} + +@media screen and (max-width: 50em) { + #main_results div#results { + grid-template-columns: 100%; + } } -*/ @media screen and (max-width: @results-width) { article[data-vim-selected]::before { diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less index f56a0edd0..7299e2574 100644 --- a/searx/static/themes/simple/src/less/toolkit.less +++ b/searx/static/themes/simple/src/less/toolkit.less @@ -107,7 +107,6 @@ div.selectable_url { border: 1px solid @color-result-search-url-border; padding: 4px; color: @color-result-search-url-font; - width: 100%; margin: 0.1em; overflow: hidden; height: 1.2em; @@ -121,9 +120,8 @@ div.selectable_url { // dialog .dialog() { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; From 859179f0c9f03c3d719980cb8f89166e196d78d0 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Sat, 25 Sep 2021 17:44:54 +0200 Subject: [PATCH 4/8] [theme] optimize switching between different device types --- .../themes/simple/src/less/definitions.less | 6 ++-- .../static/themes/simple/src/less/search.less | 4 +-- .../static/themes/simple/src/less/style.less | 34 ++++++++----------- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index c74358078..d8e2cfd0c 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -31,10 +31,10 @@ @color-url-font: #29314d; @color-url-visited-font: #684898; -@results-width: 40em; -@results-offset: 8rem; +@results-width: 35em; +@results-offset: 10rem; @results-tablet-offset: 0.5rem; -@results-gap: 4em; +@results-gap: 6em; @search-width: 40em; // diff --git a/searx/static/themes/simple/src/less/search.less b/searx/static/themes/simple/src/less/search.less index dd810de2a..d497c673f 100644 --- a/searx/static/themes/simple/src/less/search.less +++ b/searx/static/themes/simple/src/less/search.less @@ -104,7 +104,7 @@ vertical-align: middle; } -@media screen and (max-width: 1250px) { +@media screen and (max-width: 80em) { #search { padding: 0 @results-tablet-offset; } @@ -146,7 +146,7 @@ } } -@media screen and (max-width: @results-width) { +@media screen and (max-width: 50em) { #search { width: 100%; margin: 0; diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index aab913639..0a11d42a7 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -598,7 +598,7 @@ article.result-images[data-vim-selected]::before { } } -@media screen and (max-width: 1250px) { +@media screen and (max-width: 80em) { #main_preferences, #main_about, #main_stats { @@ -695,6 +695,20 @@ article.result-images[data-vim-selected]::before { #backToTop { left: @results-width; } + + #main_results div#results { + margin: 2rem @results-tablet-offset 0 @results-tablet-offset; + display: grid; + grid-template-columns: 50em; + grid-template-rows: min-content min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: + "answers" + "suggestions" + "sidebar" + "urls" + "pagination"; + } } #main_results div#results.only_template_images { @@ -721,29 +735,11 @@ article.result-images[data-vim-selected]::before { } } -@media screen and (max-width: 1250px) { - #main_results div#results { - margin: 2rem @results-tablet-offset 0 @results-tablet-offset; - display: grid; - grid-template-columns: 50em; - grid-template-rows: min-content min-content min-content 1fr min-content min-content; - gap: 0; - grid-template-areas: - "answers" - "suggestions" - "sidebar" - "urls" - "pagination"; - } -} - @media screen and (max-width: 50em) { #main_results div#results { grid-template-columns: 100%; } -} -@media screen and (max-width: @results-width) { article[data-vim-selected]::before { display: none; content: ""; From b6ae1f1c7a82797ec8af52569d52920ccf5e562f Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Sat, 25 Sep 2021 18:29:12 +0200 Subject: [PATCH 5/8] [theme] margin around checkboxes is bigger now, index centers the search more and the pref, stats and about page have a max-width now --- searx/static/themes/simple/src/less/index.less | 17 ++++++++++++++++- searx/static/themes/simple/src/less/style.less | 7 ++++--- .../static/themes/simple/src/less/toolkit.less | 2 +- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/searx/static/themes/simple/src/less/index.less b/searx/static/themes/simple/src/less/index.less index 3a275763c..a74988a72 100644 --- a/searx/static/themes/simple/src/less/index.less +++ b/searx/static/themes/simple/src/less/index.less @@ -1,3 +1,7 @@ +#main_index { + margin-top: 16em; +} + .index { text-align: center; @@ -17,6 +21,7 @@ margin: 0 auto; background: inherit; border: inherit; + padding: 0; } .search_filters { @@ -30,10 +35,20 @@ } } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { div.title { h1 { font-size: 1em; } } + + #main_index { + margin-top: 6em; + } +} + +@media screen and (max-width: 50em) { + #main_index { + margin-top: 0; + } } diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 0a11d42a7..86214ccd5 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -68,8 +68,8 @@ main { #main_preferences, #main_about, #main_stats { - margin: 3em; - width: auto; + margin: 2em auto; + width: 85em; } footer { @@ -602,7 +602,7 @@ article.result-images[data-vim-selected]::before { #main_preferences, #main_about, #main_stats { - margin: 0.5em; + margin: 2em 0.5em; width: auto; } @@ -738,6 +738,7 @@ article.result-images[data-vim-selected]::before { @media screen and (max-width: 50em) { #main_results div#results { grid-template-columns: 100%; + margin: 2rem 0 0 0; } article[data-vim-selected]::before { diff --git a/searx/static/themes/simple/src/less/toolkit.less b/searx/static/themes/simple/src/less/toolkit.less index 7299e2574..e9e88e7e0 100644 --- a/searx/static/themes/simple/src/less/toolkit.less +++ b/searx/static/themes/simple/src/less/toolkit.less @@ -348,7 +348,7 @@ select { width: 40px; height: 10px; background: #dcdcdc; - margin: 8px auto; + margin: 8px 1rem; position: relative; border-radius: 50px; From 8268873701150f7abe1ea0cd88b936ef7aa7dd79 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Sun, 26 Sep 2021 13:01:22 +0200 Subject: [PATCH 6/8] [fix] several issues in the simple theme - using more rem in style and definitions - mobile width in preferences.less fix max-width: 75em to 80em (normalized with style.less and other) - do not display #backToTop position on tablet (when max-width: 80em) - fix answer box on mobile (when max-width: 50em) --- .../themes/simple/src/less/definitions.less | 6 +- .../themes/simple/src/less/preferences.less | 2 +- .../static/themes/simple/src/less/style.less | 66 ++++++++----------- 3 files changed, 32 insertions(+), 42 deletions(-) diff --git a/searx/static/themes/simple/src/less/definitions.less b/searx/static/themes/simple/src/less/definitions.less index d8e2cfd0c..946760ec1 100644 --- a/searx/static/themes/simple/src/less/definitions.less +++ b/searx/static/themes/simple/src/less/definitions.less @@ -31,11 +31,11 @@ @color-url-font: #29314d; @color-url-visited-font: #684898; -@results-width: 35em; +@results-width: 45rem; @results-offset: 10rem; @results-tablet-offset: 0.5rem; -@results-gap: 6em; -@search-width: 40em; +@results-gap: 5rem; +@search-width: 40rem; // @color-a-font: @color-base; diff --git a/searx/static/themes/simple/src/less/preferences.less b/searx/static/themes/simple/src/less/preferences.less index 0be6f9023..0909a6bf9 100644 --- a/searx/static/themes/simple/src/less/preferences.less +++ b/searx/static/themes/simple/src/less/preferences.less @@ -122,7 +122,7 @@ } } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { .preferences_back { clear: both; } diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 86214ccd5..7ebdfeb88 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -75,7 +75,7 @@ main { footer { clear: both; min-height: 4rem; - padding: 1em 0; + padding: 1rem 0; width: 100%; text-align: center; background-color: @color-footer-background; @@ -130,7 +130,7 @@ article[data-vim-selected] { article[data-vim-selected]::before { position: absolute; - left: 1em; + left: (@results-offset - 2rem); padding: 2px; content: ">"; font-weight: bold; @@ -366,12 +366,12 @@ article.result-images[data-vim-selected]::before { #results { margin: 2rem 2rem 0 @results-offset; display: grid; - grid-template-columns: (@results-width + @results-offset) 25em; + grid-template-columns: @results-width 25rem; grid-template-rows: min-content min-content 1fr min-content; gap: 0 @results-gap; grid-template-areas: + "corrections sidebar" "answers sidebar" - "suggestions sidebar" "urls sidebar" "pagination sidebar"; } @@ -388,8 +388,6 @@ article.result-images[data-vim-selected]::before { } #suggestions { - grid-area: suggestions; - .wrapper { display: flex; flex-flow: row wrap; @@ -402,12 +400,6 @@ article.result-images[data-vim-selected]::before { } } -#suggestions, -#answers, -#corrections { - max-width: @results-width; -} - #suggestions, #answers, #infoboxes, @@ -435,9 +427,10 @@ article.result-images[data-vim-selected]::before { } #corrections { + grid-area: corrections; display: flex; flex-flow: row wrap; - margin: 1em 0; + margin: 0 0 1em 0; h4, input[type="submit"] { @@ -459,7 +452,6 @@ article.result-images[data-vim-selected]::before { #answers { grid-area: answers; - margin: 10px 8px 10px 8px; border: 1px solid #ddd; padding: 0.9em; box-shadow: 0 0 5px #ccc; @@ -580,14 +572,14 @@ article.result-images[data-vim-selected]::before { #backToTop { border: 1px solid #ddd; - margin: 0 0 0 2em; + margin: 0; padding: 0; font-size: 1em; box-shadow: 0 0 5px #ccc; background: white; position: fixed; - bottom: 85px; - left: @results-width + @results-offset + @results-gap; + bottom: 8rem; + left: @results-width + @results-offset + (0.5 * @results-gap - 1.2em); transition: opacity 0.5s; opacity: 0; @@ -602,15 +594,10 @@ article.result-images[data-vim-selected]::before { #main_preferences, #main_about, #main_stats { - margin: 2em 0.5em; + margin: 2rem 0.5rem; width: auto; } - #suggestions, - #answers { - margin-top: 1em; - } - #infoboxes { position: inherit; max-width: inherit; @@ -693,22 +680,30 @@ article.result-images[data-vim-selected]::before { } #backToTop { - left: @results-width; + display: none; + } + + #pagination { + margin-top: 2rem; } #main_results div#results { margin: 2rem @results-tablet-offset 0 @results-tablet-offset; display: grid; - grid-template-columns: 50em; + grid-template-columns: @results-width; grid-template-rows: min-content min-content min-content 1fr min-content min-content; gap: 0; grid-template-areas: + "corrections" "answers" - "suggestions" "sidebar" "urls" "pagination"; } + + article[data-vim-selected]::before { + left: 0; + } } #main_results div#results.only_template_images { @@ -718,9 +713,9 @@ article.result-images[data-vim-selected]::before { grid-template-rows: min-content min-content 1fr min-content min-content; gap: 0; grid-template-areas: - "answers" - "suggestions" + "corrections" "urls" + "answers" "sidebar" "pagination"; @@ -728,11 +723,6 @@ article.result-images[data-vim-selected]::before { width: inherit; margin: 0; } - - #backToTop { - right: 0.5em; - left: auto; - } } @media screen and (max-width: 50em) { @@ -757,8 +747,9 @@ article.result-images[data-vim-selected]::before { margin: 0 5px 2px 5px; } - #corrections { - margin: 1em 5px 1em 5px; + #corrections, + #answers { + margin: 0 5px 1em 5px; } #results { @@ -766,9 +757,8 @@ article.result-images[data-vim-selected]::before { padding: 0; } - #backToTop { - left: 40em; - bottom: 35px; + #pagination { + margin: 2rem 1rem 0 1rem; } .result { From f81afed60b2061b36359513caa43141888b36b9d Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Mon, 27 Sep 2021 13:46:40 +0200 Subject: [PATCH 7/8] [fix] backtotop and pagination on image result page --- searx/static/themes/simple/src/less/style.less | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/searx/static/themes/simple/src/less/style.less b/searx/static/themes/simple/src/less/style.less index 7ebdfeb88..aaefb51fd 100644 --- a/searx/static/themes/simple/src/less/style.less +++ b/searx/static/themes/simple/src/less/style.less @@ -684,7 +684,7 @@ article.result-images[data-vim-selected]::before { } #pagination { - margin-top: 2rem; + margin: 2rem 0 0 0 !important; } #main_results div#results { @@ -723,6 +723,15 @@ article.result-images[data-vim-selected]::before { width: inherit; margin: 0; } + + #backToTop { + left: auto; + right: 2rem; + } + + #pagination { + margin-right: 4rem; + } } @media screen and (max-width: 50em) { @@ -758,7 +767,7 @@ article.result-images[data-vim-selected]::before { } #pagination { - margin: 2rem 1rem 0 1rem; + margin: 2rem 1rem 0 1rem !important; } .result { From e8ed56251aff1ce7241cdd3ed9c639990ef4ddb8 Mon Sep 17 00:00:00 2001 From: MrPaulBlack Date: Mon, 27 Sep 2021 13:47:00 +0200 Subject: [PATCH 8/8] [build] /static --- searx/static/themes/simple/css/searx-rtl.css | 174 ++++++++++-------- .../themes/simple/css/searx-rtl.min.css | Bin 34234 -> 35100 bytes .../themes/simple/css/searx-rtl.min.css.map | Bin 19252 -> 19593 bytes searx/static/themes/simple/css/searx.css | 174 ++++++++++-------- searx/static/themes/simple/css/searx.min.css | Bin 34195 -> 35061 bytes .../themes/simple/css/searx.min.css.map | Bin 19196 -> 19537 bytes 6 files changed, 204 insertions(+), 144 deletions(-) diff --git a/searx/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css index bf0c03bbf..d6756cdfa 100644 --- a/searx/static/themes/simple/css/searx-rtl.css +++ b/searx/static/themes/simple/css/searx-rtl.css @@ -1247,7 +1247,6 @@ div.selectable_url { border: 1px solid #888; padding: 4px; color: #444; - width: 100%; margin: 0.1em; overflow: hidden; height: 1.2em; @@ -1265,9 +1264,8 @@ div.selectable_url pre { } .dialog-error { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1315,9 +1313,8 @@ div.selectable_url pre { } .dialog-warning { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1365,9 +1362,8 @@ div.selectable_url pre { } .dialog-modal { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1500,8 +1496,6 @@ html body .tabs > input:checked + label { border-bottom: 2px solid #084999; background: #3498DB; color: #FFF; - font-weight: bold; - letter-spacing: -0.1px; } html body .tabs > input:checked + label + section { display: block; @@ -1544,7 +1538,7 @@ select:focus { width: 40px; height: 10px; background: #dcdcdc; - margin: 8px auto; + margin: 8px 1rem; position: relative; border-radius: 50px; } @@ -1800,7 +1794,7 @@ td:hover .engine-tooltip, .autocomplete.open:empty { display: none; } -@media screen and (max-width: 50em) { +@media screen and (max-width: 45rem) { .autocomplete { bottom: 0; } @@ -1810,6 +1804,9 @@ td:hover .engine-tooltip, text-align: left; } } +#main_index { + margin-top: 16em; +} .index { text-align: center; } @@ -1827,6 +1824,7 @@ td:hover .engine-tooltip, margin: 0 auto; background: inherit; border: inherit; + padding: 0; } .index .search_filters { display: block; @@ -1836,10 +1834,18 @@ td:hover .engine-tooltip, padding: 6px 10px; border-bottom: initial !important; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { div.title h1 { font-size: 1em; } + #main_index { + margin-top: 6em; + } +} +@media screen and (max-width: 50em) { + #main_index { + margin-top: 0; + } } .column-reliability .engine-tooltip { right: 12rem; @@ -1937,7 +1943,7 @@ td:hover .engine-tooltip, #main_preferences th.name .engine-tooltip .engine-description { margin-top: 0.5rem; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { .preferences_back { clear: both; } @@ -1946,7 +1952,7 @@ td:hover .engine-tooltip, * searx, A privacy-respecting, hackable metasearch engine */ #search { - padding: 0 2em; + padding: 0 2em 0 10rem; margin: 0; background: #f7f7f7; border-bottom: 1px solid #d7d7d7; @@ -2011,7 +2017,7 @@ td:hover .engine-tooltip, padding-left: 8px; padding-right: 0 !important; border-right: none; - width: 40em; + width: 40rem; } #q::-ms-clear, #q::-webkit-search-cancel-button { @@ -2033,7 +2039,10 @@ td:hover .engine-tooltip, display: inline-block; vertical-align: middle; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { + #search { + padding: 0 0.5rem; + } #categories { font-size: 90%; clear: both; @@ -2096,7 +2105,7 @@ td:hover .engine-tooltip, } .category { display: block; - width: 90%; + width: 100%; } .category label { border-bottom: 0; @@ -2200,23 +2209,32 @@ main { padding: 0; margin: 0; } +body { + display: flex; + flex-direction: column; + height: 100vh; + margin: 0; +} main { width: 100%; + margin-bottom: 2rem; + flex: 1; } #main_preferences, #main_about, #main_stats { - margin: 3em; - width: auto; + margin: 2em auto; + width: 85em; } footer { - bottom: 0; - height: 3em; - margin: 1em 0; - padding: 1em 0; clear: both; + min-height: 4rem; + padding: 1rem 0; width: 100%; text-align: center; + background-color: #f7f7f7; + border-top: 1px solid #d7d7d7; + overflow: hidden; } footer p { font-size: 0.9em; @@ -2235,7 +2253,6 @@ footer p { input[type="submit"], #results button[type="submit"] { padding: 0.5rem; - margin: 2px 4px; display: inline-block; background: #3498DB; color: #FFF; @@ -2260,7 +2277,7 @@ article[data-vim-selected] { } article[data-vim-selected]::before { position: absolute; - left: 1em; + left: 8rem; padding: 2px; content: ">"; font-weight: bold; @@ -2452,9 +2469,21 @@ article.result-images[data-vim-selected]::before { color: #684898; } #results { - margin: 2em 2em 20px 2em; + margin: 2rem 2rem 0 10rem; + display: grid; + grid-template-columns: 45rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: "corrections sidebar" "answers sidebar" "urls sidebar" "pagination sidebar"; +} +#results #answers *:first-child, +#results #sidebar *:first-child, +#results #urls *:first-child { + margin-top: 0; +} +#urls { padding: 0; - width: 50em; + grid-area: urls; } #suggestions .wrapper { display: flex; @@ -2465,11 +2494,6 @@ article.result-images[data-vim-selected]::before { display: inline-block; flex: 1 1 50%; } -#suggestions, -#answers, -#corrections { - max-width: 50em; -} #suggestions input, #answers input, #infoboxes input, @@ -2505,9 +2529,10 @@ article.result-images[data-vim-selected]::before { text-decoration: underline; } #corrections { + grid-area: corrections; display: flex; flex-flow: row wrap; - margin: 1em 0; + margin: 0 0 1em 0; } #corrections h4, #corrections input[type="submit"] { @@ -2524,7 +2549,7 @@ article.result-images[data-vim-selected]::before { color: #444; } #answers { - margin: 10px 8px 10px 8px; + grid-area: answers; border: 1px solid #ddd; padding: 0.9em; box-shadow: 0 0 5px #ccc; @@ -2542,12 +2567,7 @@ article.result-images[data-vim-selected]::before { min-width: 210px; } #sidebar { - position: absolute; - top: 100px; - left: 57em; - margin: 0 2px 5px 5px; - padding: 0 2px 2px; - max-width: 25em; + grid-area: sidebar; word-wrap: break-word; } #sidebar .infobox { @@ -2614,7 +2634,7 @@ article.result-images[data-vim-selected]::before { color: #222; } #pagination { - clear: both; + grid-area: pagination; } #pagination br { clear: both; @@ -2625,14 +2645,14 @@ article.result-images[data-vim-selected]::before { } #backToTop { border: 1px solid #ddd; - margin: 0 0 0 2em; + margin: 0; padding: 0; font-size: 1em; box-shadow: 0 0 5px #ccc; background: white; position: fixed; - bottom: 85px; - left: 50em; + bottom: 8rem; + left: 56.3rem; transition: opacity 0.5s; opacity: 0; } @@ -2641,17 +2661,13 @@ article.result-images[data-vim-selected]::before { margin: 0; padding: 0.6em; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { #main_preferences, #main_about, #main_stats { - margin: 0.5em; + margin: 2rem 0.5rem; width: auto; } - #suggestions, - #answers { - margin-top: 1em; - } #infoboxes { position: inherit; max-width: inherit; @@ -2665,9 +2681,6 @@ article.result-images[data-vim-selected]::before { margin: 0.5em 0.5em 0.5em 0; } #sidebar { - position: static; - max-width: 50em; - margin: 0 0 2px 0; padding: 0; float: none; border: none; @@ -2718,30 +2731,48 @@ article.result-images[data-vim-selected]::before { .image_result img { max-width: 98%; } + #backToTop { + display: none; + } + #pagination { + margin: 2rem 0 0 0 !important; + } + #main_results div#results { + margin: 2rem 0.5rem 0 0.5rem; + display: grid; + grid-template-columns: 45rem; + grid-template-rows: min-content min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: "corrections" "answers" "sidebar" "urls" "pagination"; + } + article[data-vim-selected]::before { + left: 0; + } } #main_results div#results.only_template_images { - flex-direction: column; - width: auto; - display: flex; -} -#main_results div#results.only_template_images #sidebar { - position: relative; - top: auto; - order: 2; + margin: 2rem 0.5rem 0 0.5rem; + display: grid; + grid-template-columns: 100%; + grid-template-rows: min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: "corrections" "urls" "answers" "sidebar" "pagination"; } #main_results div#results.only_template_images #urls { - position: relative; - order: 1; + width: inherit; + margin: 0; } #main_results div#results.only_template_images #backToTop { - right: 0.5em; left: auto; + right: 2rem; } #main_results div#results.only_template_images #pagination { - position: relative; - order: 3; + margin-right: 4rem; } @media screen and (max-width: 50em) { + #main_results div#results { + grid-template-columns: 100%; + margin: 2rem 0 0 0; + } article[data-vim-selected]::before { display: none; content: ""; @@ -2755,17 +2786,16 @@ article.result-images[data-vim-selected]::before { #sidebar { margin: 0 5px 2px 5px; } - #corrections { - margin: 1em 5px 1em 5px; + #corrections, + #answers { + margin: 0 5px 1em 5px; } #results { margin: 0; padding: 0; - width: initial; } - #backToTop { - left: 40em; - bottom: 35px; + #pagination { + margin: 2rem 1rem 0 1rem !important; } .result { padding: 8px 10px 6px 10px; diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css index 7a958006265bbf653fe3ec21497fa51ab450791f..343aeba4beaaf0ac06c6b7972a459f1ea062eff3 100644 GIT binary patch delta 1852 zcmbtUO>5jn7-rXrLt_XH`66*+%T`M3kll>pUGH|(5*m7Sjj7p!4Gr4WNSZ{_ETh@1 zjVdp(13mN-I+q?&O4?&Dg*o)&RC+2Y^w2}|D{{y+r_4y&NM6^WPz1Zu`~5ug%=_z? z)kj}df4sFMR+o-f`0v;C6F@UipaE{wZiy#XjcVB_jM^6m3^M9H@ebHL!RK37#FN%v z$Br2k1>({BmrhSLnw0;%I-J!53x~IHXrt{ou&9f}8Y6vZte}9`KYo7F>|3^tLl*)* zzxH*t4fro>^G9XLq=et^%*{0c3YOv{Y6J0f?T=|y>T#zvtw~IPihnu}rz%u9o6D8C zc9tC>i}t+u)c{((DaTL5w_9SWY5?)c?Z))+F0prF{=;W)o#_#O5QL_OuG08nd9iI%Lhiw~$ zqTyVw@b#^8V&HyQskW*3$-^f{s;-(f<41P1an$#%9q3YQo9d^=P#`S~)iUT2l!vOa z)bB(DCBq0R3_TJu6f&*+ZaB33ZMs$;j)3+rWh{!U2rl*rrKra+2_r4SHtJe*QCqaa zXozUpGN69>vu{axSt{*SR-#iB4SW`9`Zygrm_}?=>v`C>uND5hk(T)nxzk={Us=u| z(Urf@Qbv!01C=Auqk-$9D1%fVQj2$@eKEscRL`eWr;#PtCf|y*nM_#_$TQ;ChR;qH zp*a|CZ2wuZ<`BfEI}fMM7QqEC{Q2iLze8rYm#m&rr|2Vx!RAVRneyKfs_slEWOTK9Q}0^6yBlPK^y9H;LK31xFB;|Kq_;s%FP{Y*^a*8F$oTr+ zrO|hm0!nOUGQ~6rWJPp3vS(wh&K7YJ-u@`syNl2It9Lg7x?%4clqDZ**C`O1N_Q^ck4$AH(S1%`YYrs;s-Y?F9C2No*@7L delta 956 zcmaJ<&ubGw6edY&Yy-8{QbZ^Q(-c#aW;V$-?XFTSRP<2WL$Oj3*=8rnwAt)-f7sNe zrU%<1iWDD$iU;xH!HY6C{{b%|C|>;oid3qnp46Gm#s)+g9=w_N-n{So-h1{i`1W4# z^+WhTokQMw_5SE7~=uB$ze+grBKRq9Y zC*mM{ABoYM`44Svieu~a;+f+|pzC}X7N<(y!NOC@@B!-^jIhYYM5l4d?7R?zo zipq0=fI#mO(mB9>$Z$g}#+*N&As>l|um;ziM~P&tpqnNx*hH^d$(ZGoO4#x)uBOyd z4ct7N?l_?k*iJO;w}sT|ZeJ5I?=#9w@EjO-2VwfwOV~zzlS~MsCRcFLmc;x4NfhO{ z#fBZ=^IlnmY0>PSVLH>WyB+Fm5#iNs^-vVC!`Q*$`qc>g$!~(dshfOUJ9RNP%!*sp zk117a1)G0S<-(_I-QaRVcKtF4#+L0H~M54*(* zuBBAsiz*fLilbFqFvu#gjEb@<@kCZ4ge{`t1;vDq$)nvI1K$%_H&tv(8I~{tpOQV{ z#$DhA@NJ{B*YwuLKzT)n|3X^;+aOb$@ZQOmO;TYdr89Nl;gt diff --git a/searx/static/themes/simple/css/searx-rtl.min.css.map b/searx/static/themes/simple/css/searx-rtl.min.css.map index 8d4a1c8efd0c02c50ff4c4142a0b1db7212cb54a..39a9138de2f94c67e097417d32e73c97d6321b8b 100644 GIT binary patch delta 1420 zcma)5-Ahwp80VcW=0|D_EvDI&z-X^BH=Q~^>OE)YtZlB-m`iq(44tM^hn1;Nj35Fd zNO>UWq6`0mf)jP!MRXSy-9~iPO+j6C74*E%*;ggy&3oSSe*B)_$MZgW$hID_r>9-u zb9vYzTy{-1`yx7@5i22$Cxs9^37s9?kgu`B^q`$-aQloCnp}3sbsROj+fK1AzoPS1 zMW})&I37pP|jTJyu{4+T{{kT-JJ7mFqVgpJk^*Ms>Y`z&zK17;P1IpTOzK(^PZF^A|g>< zeJV1q@?}-1OKR0}SX~O~W^?aP+aZL~;JfZLU44@_7Kgll%bAc>$PG=Fipx?z{BIro ziUnov^*b08#_jN7z+<~I0d;|MYzSh37d3rxDdBAWW;~#9AJ+9Nu&uYi?BJel#V`Xy z$C!(dW76@ggg4~Oph6HFcFDgPOCio;a;6E)G%Z4c=M9(8FPucJED7}YInurG}Tg?p&E z!1ibz+}8z~`9_~^ENQmvhG;m88#`l8^IP}=D^T}Ml?lln ztqQAR8wpQ~aF%;f&774!Z4+*>>-M#FA6LuP7A%*m4aVc>ZA8PClIDmB9S0Oa-IEcC zb*rT}6syz1BC?8pW8dCT4$g`q#HB32n;2)-JU23C5Ks8ZBk+9|dm z%CSO_Ci`e-BqOE8MCr{hDn);-z9gE2_D2#3z7C%v^Y!@5lJc2lga+Pd8!SXyPy8KW R<#rZ!qnozA4QP)Y{{^o4h3x;v=dd~ zFxmrAHHK{5h(}bIuFUok4RW6)C$E1Rk zPz#>gr!P9cM5V;G@EkEr9=KwrD9B845Otg>7|II3Mb7t-9Lwwp5nIG^x$qAzTTBHgN?Ac4bk^tA5aHDs_KKP*a z!`s9urd=)~jeAqqag1BLuHz-~b+Xfi>`x_q2tb2HuRaA1dy!hXW5mc-JED7bi>U|W3nPB)cX>(I;x FegbD!8DIba diff --git a/searx/static/themes/simple/css/searx.css b/searx/static/themes/simple/css/searx.css index a39a72cbe..bd98e3424 100644 --- a/searx/static/themes/simple/css/searx.css +++ b/searx/static/themes/simple/css/searx.css @@ -1247,7 +1247,6 @@ div.selectable_url { border: 1px solid #888; padding: 4px; color: #444; - width: 100%; margin: 0.1em; overflow: hidden; height: 1.2em; @@ -1265,9 +1264,8 @@ div.selectable_url pre { } .dialog-error { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1315,9 +1313,8 @@ div.selectable_url pre { } .dialog-warning { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1365,9 +1362,8 @@ div.selectable_url pre { } .dialog-modal { position: relative; - width: 70%; padding: 1em 1em 1em 2.7em; - margin: 0 8% 1em 8%; + margin: 0 0 1em 0; border: 1px solid black; border-radius: 4px; text-align: left; @@ -1500,8 +1496,6 @@ html body .tabs > input:checked + label { border-bottom: 2px solid #084999; background: #3498DB; color: #FFF; - font-weight: bold; - letter-spacing: -0.1px; } html body .tabs > input:checked + label + section { display: block; @@ -1544,7 +1538,7 @@ select:focus { width: 40px; height: 10px; background: #dcdcdc; - margin: 8px auto; + margin: 8px 1rem; position: relative; border-radius: 50px; } @@ -1800,7 +1794,7 @@ td:hover .engine-tooltip, .autocomplete.open:empty { display: none; } -@media screen and (max-width: 50em) { +@media screen and (max-width: 45rem) { .autocomplete { bottom: 0; } @@ -1810,6 +1804,9 @@ td:hover .engine-tooltip, text-align: left; } } +#main_index { + margin-top: 16em; +} .index { text-align: center; } @@ -1827,6 +1824,7 @@ td:hover .engine-tooltip, margin: 0 auto; background: inherit; border: inherit; + padding: 0; } .index .search_filters { display: block; @@ -1836,10 +1834,18 @@ td:hover .engine-tooltip, padding: 6px 10px; border-bottom: initial !important; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { div.title h1 { font-size: 1em; } + #main_index { + margin-top: 6em; + } +} +@media screen and (max-width: 50em) { + #main_index { + margin-top: 0; + } } .column-reliability .engine-tooltip { right: 12rem; @@ -1937,7 +1943,7 @@ td:hover .engine-tooltip, #main_preferences th.name .engine-tooltip .engine-description { margin-top: 0.5rem; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { .preferences_back { clear: both; } @@ -1946,7 +1952,7 @@ td:hover .engine-tooltip, * searx, A privacy-respecting, hackable metasearch engine */ #search { - padding: 0 2em; + padding: 0 2em 0 10rem; margin: 0; background: #f7f7f7; border-bottom: 1px solid #d7d7d7; @@ -2011,7 +2017,7 @@ td:hover .engine-tooltip, padding-left: 8px; padding-right: 0 !important; border-right: none; - width: 40em; + width: 40rem; } #q::-ms-clear, #q::-webkit-search-cancel-button { @@ -2033,7 +2039,10 @@ td:hover .engine-tooltip, display: inline-block; vertical-align: middle; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { + #search { + padding: 0 0.5rem; + } #categories { font-size: 90%; clear: both; @@ -2096,7 +2105,7 @@ td:hover .engine-tooltip, } .category { display: block; - width: 90%; + width: 100%; } .category label { border-bottom: 0; @@ -2200,23 +2209,32 @@ main { padding: 0; margin: 0; } +body { + display: flex; + flex-direction: column; + height: 100vh; + margin: 0; +} main { width: 100%; + margin-bottom: 2rem; + flex: 1; } #main_preferences, #main_about, #main_stats { - margin: 3em; - width: auto; + margin: 2em auto; + width: 85em; } footer { - bottom: 0; - height: 3em; - margin: 1em 0; - padding: 1em 0; clear: both; + min-height: 4rem; + padding: 1rem 0; width: 100%; text-align: center; + background-color: #f7f7f7; + border-top: 1px solid #d7d7d7; + overflow: hidden; } footer p { font-size: 0.9em; @@ -2235,7 +2253,6 @@ footer p { input[type="submit"], #results button[type="submit"] { padding: 0.5rem; - margin: 2px 4px; display: inline-block; background: #3498DB; color: #FFF; @@ -2260,7 +2277,7 @@ article[data-vim-selected] { } article[data-vim-selected]::before { position: absolute; - left: 1em; + left: 8rem; padding: 2px; content: ">"; font-weight: bold; @@ -2452,9 +2469,21 @@ article.result-images[data-vim-selected]::before { color: #684898; } #results { - margin: 2em 2em 20px 2em; + margin: 2rem 2rem 0 10rem; + display: grid; + grid-template-columns: 45rem 25rem; + grid-template-rows: min-content min-content 1fr min-content; + gap: 0 5rem; + grid-template-areas: "corrections sidebar" "answers sidebar" "urls sidebar" "pagination sidebar"; +} +#results #answers *:first-child, +#results #sidebar *:first-child, +#results #urls *:first-child { + margin-top: 0; +} +#urls { padding: 0; - width: 50em; + grid-area: urls; } #suggestions .wrapper { display: flex; @@ -2465,11 +2494,6 @@ article.result-images[data-vim-selected]::before { display: inline-block; flex: 1 1 50%; } -#suggestions, -#answers, -#corrections { - max-width: 50em; -} #suggestions input, #answers input, #infoboxes input, @@ -2505,9 +2529,10 @@ article.result-images[data-vim-selected]::before { text-decoration: underline; } #corrections { + grid-area: corrections; display: flex; flex-flow: row wrap; - margin: 1em 0; + margin: 0 0 1em 0; } #corrections h4, #corrections input[type="submit"] { @@ -2524,7 +2549,7 @@ article.result-images[data-vim-selected]::before { color: #444; } #answers { - margin: 10px 8px 10px 8px; + grid-area: answers; border: 1px solid #ddd; padding: 0.9em; box-shadow: 0 0 5px #ccc; @@ -2542,12 +2567,7 @@ article.result-images[data-vim-selected]::before { min-width: 210px; } #sidebar { - position: absolute; - top: 100px; - left: 57em; - margin: 0 2px 5px 5px; - padding: 0 2px 2px; - max-width: 25em; + grid-area: sidebar; word-wrap: break-word; } #sidebar .infobox { @@ -2614,7 +2634,7 @@ article.result-images[data-vim-selected]::before { color: #222; } #pagination { - clear: both; + grid-area: pagination; } #pagination br { clear: both; @@ -2625,14 +2645,14 @@ article.result-images[data-vim-selected]::before { } #backToTop { border: 1px solid #ddd; - margin: 0 0 0 2em; + margin: 0; padding: 0; font-size: 1em; box-shadow: 0 0 5px #ccc; background: white; position: fixed; - bottom: 85px; - left: 50em; + bottom: 8rem; + left: 56.3rem; transition: opacity 0.5s; opacity: 0; } @@ -2641,17 +2661,13 @@ article.result-images[data-vim-selected]::before { margin: 0; padding: 0.6em; } -@media screen and (max-width: 75em) { +@media screen and (max-width: 80em) { #main_preferences, #main_about, #main_stats { - margin: 0.5em; + margin: 2rem 0.5rem; width: auto; } - #suggestions, - #answers { - margin-top: 1em; - } #infoboxes { position: inherit; max-width: inherit; @@ -2665,9 +2681,6 @@ article.result-images[data-vim-selected]::before { margin: 0.5em 0.5em 0.5em 0; } #sidebar { - position: static; - max-width: 50em; - margin: 0 0 2px 0; padding: 0; float: none; border: none; @@ -2718,30 +2731,48 @@ article.result-images[data-vim-selected]::before { .image_result img { max-width: 98%; } + #backToTop { + display: none; + } + #pagination { + margin: 2rem 0 0 0 !important; + } + #main_results div#results { + margin: 2rem 0.5rem 0 0.5rem; + display: grid; + grid-template-columns: 45rem; + grid-template-rows: min-content min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: "corrections" "answers" "sidebar" "urls" "pagination"; + } + article[data-vim-selected]::before { + left: 0; + } } #main_results div#results.only_template_images { - flex-direction: column; - width: auto; - display: flex; -} -#main_results div#results.only_template_images #sidebar { - position: relative; - top: auto; - order: 2; + margin: 2rem 0.5rem 0 0.5rem; + display: grid; + grid-template-columns: 100%; + grid-template-rows: min-content min-content 1fr min-content min-content; + gap: 0; + grid-template-areas: "corrections" "urls" "answers" "sidebar" "pagination"; } #main_results div#results.only_template_images #urls { - position: relative; - order: 1; + width: inherit; + margin: 0; } #main_results div#results.only_template_images #backToTop { - right: 0.5em; left: auto; + right: 2rem; } #main_results div#results.only_template_images #pagination { - position: relative; - order: 3; + margin-right: 4rem; } @media screen and (max-width: 50em) { + #main_results div#results { + grid-template-columns: 100%; + margin: 2rem 0 0 0; + } article[data-vim-selected]::before { display: none; content: ""; @@ -2755,17 +2786,16 @@ article.result-images[data-vim-selected]::before { #sidebar { margin: 0 5px 2px 5px; } - #corrections { - margin: 1em 5px 1em 5px; + #corrections, + #answers { + margin: 0 5px 1em 5px; } #results { margin: 0; padding: 0; - width: initial; } - #backToTop { - left: 40em; - bottom: 35px; + #pagination { + margin: 2rem 1rem 0 1rem !important; } .result { padding: 8px 10px 6px 10px; diff --git a/searx/static/themes/simple/css/searx.min.css b/searx/static/themes/simple/css/searx.min.css index 4c93b7ece257af0724977cf6a2fc3de79dc298f1..d9b3e0c7af1b5ea0a7b117b1fc13cd56e95ea7c3 100644 GIT binary patch delta 1852 zcmbtUO>f*p7}jpuR5VgW)eqXHO`Nz0QgyfEW;eTxL5PZLh$5mzN+c@pdTdW?dsgGw zZX(xNHL1jbOVM07fKcJc1!)ez4RJz6;?M*93JyJR>8Ufew{|w9LPC~y?f3h6=9!m& zUj65b>JPV;#Ol)V3jg(negbF)3N*lt+AZwf5VzD)qS2n${#HK*gV(M^hCloXzFR zTszB-kVSi5{Bi)T-jw4f;+rioRW*S4_;zFZc$e5aG5`M4%V&DT9|WQ4A?$h#8UWn$ zc!Dm@nmMd4VT=UurmSH)KH7#x!rQyXhc_jo)_@Unh;8P79ZVxOs`WhV+t&+!-bl;*humqevac*> zkm$-^Xepyd!GX$==+VG+QItWd52?jF(Y}~r&#UKCs?*34Y?E(A+DxV_2;>>@>%+fK z7oj;AZfyTvvgQ!PCp(X(&KAK1FZ|hko8KWb+)GwZsZ;ck!(elzzD)Tq2~~HdvD-YC z>LR@jxoDMs`PaMO3NpG@eP8cdy}KJ^gY@IEXhIUAL@yfU=7J z-lfrjfV7ni%36+VDgYBQJ0Qdf-zz0JDMz<#D7~lJ1QV4HtFlm|d@B^Hj#?TD8W#Dg zH~Tt-UE~mo;*@QWNCIyBPXgrnd2?dQSK^)#F6~eXsnN#^%%{&dh+gX^-);@o{cd-_y@;da zqR$qxf%d$JwS-H*T&JPHIDLLI*WRrur0O=H3kb#6VXrRCWU(eU-gu++qORN6bQg8o z)-?&qWlTzCTjE)oVwOl%;#84rD5^@TCI42aV8xVJQ5oJ82WW3;AkgKfXN+1jXVfSv z&j$hmy+=srAp0T14Y3$={(OdfBqG8Z+;AQzlCgqrnz&#Sy=o<6mQyNW%e%OmQcE>( z^K827ghF6D(XihZQfqsCO~ky<7&F0hV8R`OncFX62lY)cA&i<_!9`mV^M@o+l;ai~ zc8Je=Wf7)DvwMc=OvCO@sIx_cS9jDSQN#{o2S@AIBJ3x>2?D2X@^S6f#oP!hZdE^~ zRIOEP{za7wpR#p>%MIC$7irxhTn5Rq6`K@V;BYaTlkxyC3P`4(HqHcLWivhE7Av@x zQi(6BRM0DqR&Bu`tHd%Y%9_LzS&0y~h>8~#6Fwx5cXJGUPh{Oxu_W5!j%Y7{aXESbY9Bgl&PWvcH hm2p=p>#;?puso;F>4xjI$Z_ia;%1rP^z(Lq;5Pt+SET>| diff --git a/searx/static/themes/simple/css/searx.min.css.map b/searx/static/themes/simple/css/searx.min.css.map index ce8584074eb8c0305e22841050e9fd5bccab17da..31cd9625f9e9a63a03248d27df66163669e11ecc 100644 GIT binary patch delta 1335 zcma)5OH30{6wND9zJdmVI0B)hiI~1h>4#4fKX0Zp!}OD;mfFrF`9rE(iylq-eT@Z5z_CKHM$@(h0(Y;jjPLw zMsqUrAIOItX~2Bd?I897Pg(w>CMZTMs(+8blF8mrgm_`N&qLgh?|WJ|7t`RY|AH+z zV@B;)h`HJSsDa!v4d*H$^YD%)ThmNYX-eP;GhKsD*IHv4pbAf1NvFY#5UtHJatfVQ zm{L$`e(OphsF~kg`!;yq+W_lBZRWmv!bYNS+54b9E`}g!RZNPCN!#A7W}jT{6o-PZ z3qJUENf=)H2W>YauM&aD>X5CO!u((L>z`)3!Z7yb>8a+uQ>=zbtW<}GOh+^0t zdd4J;e@$7mcoY_q%J_QHEXe4L%v5Hf#|op87_}l@6a7>gg?qs+SUTU)i4x(Ayex7! zB}P;5*4|DM@NDcMD1p;t1SSK09Q6Ib3JIG(0$+|4adK%qQs-q=hR8N6{4 z>ez%W5rRdw+nBT_D-2FB34RVX!G_)fYx3QrcoK)tQWtF4>%p(&OTWxL<(SQiQ()5~ z@W$B$In5w(c&SacmN{F(f=kcBH&2JSJLa~olOozHRe>Z-ShJX_a7aDP^elCAJ~ymQ z<1uzF`RY({57D(EZqd@YR$`vc)iqRZA0ZEmX#Bxxpi?p|zG9hnRkmEEGh=}(&M(Am z`TtSj68W}^d60tiuMSd7tyAeyz}ON5HccH>FOgq%**-yS@1WJFPzl`r+Q tT+-KaCc=!tM_(sdf%itPo!_8@xIr0VKWhw(h0gXI+*);YSy&6L{sz?1dAI-o delta 974 zcmb7D&rcIU7|m=!paq&picmm`v3TedR-mm`6lZ_cbtp{(h+M?R5Dq}(mx75gCPt$q zB$^izXPs;Y!g$kF zh1!50hr`Fo3{v5daME??H8yA2beJ(F9wwt%S-I$MJrT&LQa&N1Zlmslf>r4!5e=eSyIxHeE>;`qaO%Kp+3?>`oJO^zJ;8F zVDg-1UH76Lmk3^WguL6w9#@l-UR`X3kXbySqxeSeVL3ih$;}z_qW3ett9iS6K_eU! zy^pZd`!29((pi(436tir*4KpXzAfV7Q=(f-aMUNy6CJtaOW#sf(hZP#xT$Ted&o1lbSSmA9~2(b!3UUm5^M1Kq& z=~b-8{TS5!*i1M27956Jy-nkb_>x{Gu6Om!_sVv+6dx~FbxO+~5X19m1l_($)L7G@^6n_cth@uqlSsoK3f$7N z*dK_bp93q?V3j%^5^{qMF$F9Bsr`#}r}2GZSrPx5UB@OGgV#Y{-~`!n4d| zKxq&@G7+p`#;*ZCg8f0S=E7y7bH-;48WU08H0Y!}q$Z1`C1G4