From fcea8fdbfd1c502fac597acfc7269fbdb933b738 Mon Sep 17 00:00:00 2001 From: Israel Yago Pereira Date: Tue, 26 Oct 2021 13:58:58 -0300 Subject: [PATCH 1/2] Fix broken layout --- searx/static/themes/etheme/css/etheme.css | 7 +-- searx/static/themes/etheme/css/etheme.min.css | Bin 23783 -> 23792 bytes .../themes/etheme/less/etheme/results.less | 1 + .../themes/etheme/less/etheme/search.less | 7 ++- searx/static/themes/simple/css/searx-rtl.css | 2 +- .../themes/simple/css/searx-rtl.min.css | Bin 28200 -> 28327 bytes searx/static/themes/simple/css/searx.css | 2 +- searx/static/themes/simple/css/searx.min.css | Bin 28165 -> 28314 bytes .../etheme/components/categories.html | 44 +++++++++--------- 9 files changed, 33 insertions(+), 30 deletions(-) diff --git a/searx/static/themes/etheme/css/etheme.css b/searx/static/themes/etheme/css/etheme.css index 98c5d0835..378f41ab1 100644 --- a/searx/static/themes/etheme/css/etheme.css +++ b/searx/static/themes/etheme/css/etheme.css @@ -754,17 +754,18 @@ input:checked + .slider:before { #search_form #categories { text-transform: capitalize; display: flex; - flex-wrap: wrap; + flex-wrap: nowrap; align-items: center; position: relative; flex: 100%; + gap: 16px; + height: 80%; } #search_form .search_categories label, #search_form #categories label { flex-basis: auto; font-size: 14px; font-weight: normal; - margin-right: 16px; cursor: pointer; } #search_form .search_categories input[type="checkbox"]:checked + label, @@ -835,7 +836,6 @@ input:checked + .slider:before { } #search_form #search_params #time_and_lang { display: flex; - margin-left: 32px; } #search_form #search_params #time_and_lang > * { width: auto; @@ -978,6 +978,7 @@ input:checked + .slider:before { .result .external-link { font-size: 14px; color: var(--color-success); + word-break: break-word; } .result .extra-info { color: var(--text-muted-normal-alpha); diff --git a/searx/static/themes/etheme/css/etheme.min.css b/searx/static/themes/etheme/css/etheme.min.css index 75342a247f9d8e78a3b4c54b2d88cc6505b732df..be2a65193fea6f9b43266721ee91ba9d50e053e7 100644 GIT binary patch delta 103 zcmaF9lkvk&#tp@mY * { width: auto; } } } diff --git a/searx/static/themes/simple/css/searx-rtl.css b/searx/static/themes/simple/css/searx-rtl.css index 6854472b1..4dee36c3d 100644 --- a/searx/static/themes/simple/css/searx-rtl.css +++ b/searx/static/themes/simple/css/searx-rtl.css @@ -1,4 +1,4 @@ -/*! searx | 21-10-2021 | https://github.com/searx/searx */ +/*! searx | 26-10-2021 | https://github.com/searx/searx */ /* * searx, A privacy-respecting, hackable metasearch engine * diff --git a/searx/static/themes/simple/css/searx-rtl.min.css b/searx/static/themes/simple/css/searx-rtl.min.css index 62c311355b8a4154a5c91e7243355d90a231d895..e4447b619530eb3b6e3c005df3ec87030d6732ff 100644 GIT binary patch delta 742 zcmZXR&r1|x7{_^MX?4|gbvMSsfmIa zjYHk3x<*mj?aT@W&Jm;B4T_SBbIx#?c(5Mrh5p{q(uercY6{+?ai(*(d=T)Tg(v<- zcHh6q!KI80Yk^*ttl6qYBJhzmxE+Zg4W0%&*hJ(p$0#59GuFkvMPDGu^380m1#{(M z-$93ibLnvRlw}u0iJBTI36e`)gX}o*W~k=o7d+R6oD7*|Q|M2xT55~9%SSOm;$e|4m7CKuXRuf`; zyt#o5^;y0!RV~vqs7aD}LiM~Wce9m&gs=WDq`))fG$aNSVdXM)XpS1xot5)c(}>AN z2D=bj9@<1OoDQP~ndq6oSWM6e*;xM+1(ms(s~oYGcYh}(0|x%YC;nO#Ir7Etq{ z?vQK~%xdx#IT63xJOf`)44$IHFhAgfrO}Q?C2CkYsmaASpt05lTsCY4uH|F%`t+flsu)Ju)1bCOH(<@i_j!p=#Fxnvj=RVaf4clNeaZ$>p5CeZR4_G z6&xbd2~!RE?S@F55&|``N@fVk&U2 zDo_Qe{VfvgLILNl0#%e0Hv{uX+z5_ILfVNXI2m-qht4WY?Ecm`ZRot1ipOGmVMzWA z-J!a86VfS|Cw7$}1=x`!7VV>)om%|Bql2UbPjo%1<| z^F80gIq?%&_?fKT`eBdaFltwnLrQFDe(e=ZH3ZvLlNFeySIbn_4XcodCNUw&!Elbc ztiWx9IjZ(5o>NSkWu}Uw&7Cc(=F+S){DMGh>c-$;+x#DW^It~MLU!XfG9?Pq3cg#Nl+E#7WUSw+!Y!!_AU+tpb^ zcZ-REXteL}>jg?&rzXbbASxS=bZ1>FlH;aH%MPpNW^9Msi841Vm)Ur}@d+L)CvmFh zV{h`U+TETiCM6&Es2_VaUFy*2jLUPpR5qE*60B5q=TtlmhXe_)mvE#%fMBy%$bHXS z#Fm&xLS5XCt?}&cn5A53JqTTJ3?DkRoTq@~tZW0m4Z z3RQ7?TEV%=epDxa5cHGp>N;PFDq7ZN^kDV>2_p8{A`yR1{Yyv^KW4(Xp6S3!rWe2L zU%>h4Ve!|rQQw)&@=C-hQk~BxqDoYWmn%v*olc8=+3n=LRSf7pv6w3oT*|G(X|m0; kTG+!>f-gu{a1}fpre(uf1rW~<$?w+2vydWA=MOdh2Lr51CjbBd delta 853 zcmZ{iTSydP9L4!Y+q7)0)pajr?Wl#-?6z)Otg9wkVnr8IK}rk0o%!4yoSm6wrqb44 zf-Vn1)aimj5D|2tr@jaZlIo%8F^K3U-H09{3c5fKLAzztORwkrF9*)=)CAf0oVb@P z5<@nl)^KPv6l*x*9>XY!qLVDc>oyO@Ny1f2P1Tk#Iv7L)tALv&L@8o1dxz$PA}Nc} zA!*Ps9A@QYEq^GPGMo&)k}ckdLsRw&o5_x9=#s|LOjmLcYrK4e@Qm=i#p9&Zq>7^I z>0}hGu0EffVe(MQ7~U%NJ0m7*v8bXNTMIi?e<%52*I5B^;=zY?SsX8o`yD+j8=6K< zn@PW)YBa?(2{-D4SkUR_cS|Qq5UCJx%~OsS)9d&T&uyV5qNr3e(qU#5q^# z6si>j49r=~$Gu$y+n5ho-zS7g0Iv0Z*#5<+sSe_0unu?pJ}A{Q`4fK!L1%Dm(rEf6 z&Ys;v_}CmOz#S|BowpNT=DnM?OI4gqvLPCskEfx7euoV^VaKAnJ!n|jVD}WZLiX6)R7YY59H(D_I+h#qe-djL+(L zJGD?D|FG`8fQ#t{1iCt!f1RS5n%0vt)AK~_ndB^-rDiBklg2`h@&~?u#Y_&l{#sPF zdHDXWl>%Zt^_bi9c*f-0Xd>R&*oY$uA1~{@S;XJ;ogQBC3HOT+~ diff --git a/searx/templates/etheme/components/categories.html b/searx/templates/etheme/components/categories.html index 4cdd6786c..1b46efa04 100644 --- a/searx/templates/etheme/components/categories.html +++ b/searx/templates/etheme/components/categories.html @@ -4,26 +4,28 @@ {%- endmacro -%} {% set main_categories = ["general", "images", "videos", "news"] %} - -
- {% for category in categories %} - {% if category in main_categories + selected_categories %} - {{ category_widget(category) }} - {% endif %} - {% endfor %} - -
- - - - - -
- {% for category in categories %} - {% if not (category in main_categories + ["map"] or category in selected_categories) %} - {{ category_widget(category) }} - {% endif %} - {% endfor %} +
+
+ {% for category in categories %} + {% if category in main_categories + selected_categories %} + {{ category_widget(category) }} + {% endif %} + {% endfor %} + +
+ + + + + +
+ {% for category in categories %} + {% if not (category in main_categories + ["map"] or category in selected_categories) %} + {{ category_widget(category) }} + {% endif %} + {% endfor %} +
-
+ +
\ No newline at end of file -- GitLab From 9a63fbc2f016380404e11a13d8f59e85eae4543b Mon Sep 17 00:00:00 2001 From: Israel Yago Pereira Date: Thu, 28 Oct 2021 09:48:53 -0300 Subject: [PATCH 2/2] Fix broken layout when menu is open --- searx/static/themes/etheme/less/etheme/search.less | 2 +- searx/templates/etheme/components/categories.html | 6 ++++++ searx/templates/etheme/components/search_full.html | 5 ----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/searx/static/themes/etheme/less/etheme/search.less b/searx/static/themes/etheme/less/etheme/search.less index 13635adc0..89c0de70e 100644 --- a/searx/static/themes/etheme/less/etheme/search.less +++ b/searx/static/themes/etheme/less/etheme/search.less @@ -115,7 +115,7 @@ justify-content: space-between; font-size: @fontsize_small; padding-bottom: @spacing_large; - padding-top: @spacing_large; + padding-top: @spacing_x-large; padding-left: @spacing_x-large; padding-right: @spacing_x-large; diff --git a/searx/templates/etheme/components/categories.html b/searx/templates/etheme/components/categories.html index 1b46efa04..7c2f65fbd 100644 --- a/searx/templates/etheme/components/categories.html +++ b/searx/templates/etheme/components/categories.html @@ -26,6 +26,12 @@ {% endfor %}
+ + + {% set flat_lang_selector = True %} + {% include 'etheme/components/languages.html' %} + {% include 'etheme/components/time-range.html' %} + \ No newline at end of file diff --git a/searx/templates/etheme/components/search_full.html b/searx/templates/etheme/components/search_full.html index a9e8df870..aa4e85904 100644 --- a/searx/templates/etheme/components/search_full.html +++ b/searx/templates/etheme/components/search_full.html @@ -3,10 +3,5 @@ {% call search_bar(q, true, rtl) %}
{% include 'etheme/components/categories.html' %} - - {% set flat_lang_selector = True %} - {% include 'etheme/components/languages.html' %} - {% include 'etheme/components/time-range.html' %} -
{% endcall %} -- GitLab