From 2cc6301c98caf561dda77c7929c3f5f455a69312 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Fri, 17 Sep 2021 17:28:58 +0200 Subject: [PATCH 1/2] [fix] Oscar theme: fix input field on Safari close #323 --- .../themes/oscar/src/less/logicodev-dark/oscar.less | 2 ++ .../themes/oscar/src/less/logicodev/oscar.less | 2 ++ .../static/themes/oscar/src/less/pointhi/oscar.less | 2 ++ searx/static/themes/oscar/src/less/safari.css | 13 +++++++++++++ 4 files changed, 19 insertions(+) create mode 100644 searx/static/themes/oscar/src/less/safari.css diff --git a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less index e0d61aac9..c68dcd9c9 100644 --- a/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev-dark/oscar.less @@ -19,6 +19,8 @@ @import "../logicodev/code.less"; @import "../logicodev/preferences.less"; +@import (inline) "../safari.css"; + /*Global*/ body { background:#1d1f21 none !important; diff --git a/searx/static/themes/oscar/src/less/logicodev/oscar.less b/searx/static/themes/oscar/src/less/logicodev/oscar.less index 7b2274ddc..187368f71 100644 --- a/searx/static/themes/oscar/src/less/logicodev/oscar.less +++ b/searx/static/themes/oscar/src/less/logicodev/oscar.less @@ -17,3 +17,5 @@ @import "cursor.less"; @import "code.less"; @import "preferences.less"; + +@import (inline) "../safari.css"; diff --git a/searx/static/themes/oscar/src/less/pointhi/oscar.less b/searx/static/themes/oscar/src/less/pointhi/oscar.less index 827b77ffc..e9851458d 100644 --- a/searx/static/themes/oscar/src/less/pointhi/oscar.less +++ b/searx/static/themes/oscar/src/less/pointhi/oscar.less @@ -18,3 +18,5 @@ @import "navbar.less"; @import "code.less"; @import "preferences.less"; + +@import (inline) "../safari.css"; diff --git a/searx/static/themes/oscar/src/less/safari.css b/searx/static/themes/oscar/src/less/safari.css new file mode 100644 index 000000000..02962db32 --- /dev/null +++ b/searx/static/themes/oscar/src/less/safari.css @@ -0,0 +1,13 @@ +/* Safari 9+ + Conditional/Hack CSS from https://browserstrangeness.github.io/css_hacks.html +*/ +@supports (-webkit-marquee-repetition:infinite) and (object-fit:fill) { + .twitter-typeahead .tt-input:focus { + z-index: 2; + } + + .input-group-btn:last-child > .btn, + .input-group-btn:last-child > .btn-group { + margin-left: inherit !important; + } +} From e8e81c7432778453e878ec47cff52519cb4341bd Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sun, 19 Sep 2021 22:01:19 +0200 Subject: [PATCH 2/2] [build] /static --- .../themes/oscar/css/logicodev-dark.css | 14 ++++++++++++++ .../themes/oscar/css/logicodev-dark.min.css | Bin 21569 -> 21787 bytes .../oscar/css/logicodev-dark.min.css.map | Bin 11531 -> 11602 bytes searx/static/themes/oscar/css/logicodev.css | 14 ++++++++++++++ .../static/themes/oscar/css/logicodev.min.css | Bin 17921 -> 18139 bytes .../themes/oscar/css/logicodev.min.css.map | Bin 10061 -> 10131 bytes searx/static/themes/oscar/css/pointhi.css | 14 ++++++++++++++ searx/static/themes/oscar/css/pointhi.min.css | Bin 13309 -> 13527 bytes .../themes/oscar/css/pointhi.min.css.map | Bin 8003 -> 8073 bytes 9 files changed, 42 insertions(+) diff --git a/searx/static/themes/oscar/css/logicodev-dark.css b/searx/static/themes/oscar/css/logicodev-dark.css index e9e750347..e3af8f9e0 100644 --- a/searx/static/themes/oscar/css/logicodev-dark.css +++ b/searx/static/themes/oscar/css/logicodev-dark.css @@ -1379,6 +1379,20 @@ th:hover .engine-tooltip, padding: 0.4rem 0; width: 1px; } +/* Safari 9+ + Conditional/Hack CSS from https://browserstrangeness.github.io/css_hacks.html +*/ +@supports (-webkit-marquee-repetition:infinite) and (object-fit:fill) { + .twitter-typeahead .tt-input:focus { + z-index: 2; + } + + .input-group-btn:last-child > .btn, + .input-group-btn:last-child > .btn-group { + margin-left: inherit !important; + } +} + /*Global*/ body { background: #1d1f21 none !important; diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css b/searx/static/themes/oscar/css/logicodev-dark.min.css index 99e664adad3b4c47c33332c2987d3ff97af5533c..62bba9028eb20715fee94e73c34c5bb680e0afcb 100644 GIT binary patch delta 233 zcmZvXJ&wXK6okbIxI*X>iI;*h1)|^-bWZX@9vIs=WAPIq1lQmKh-#(10Nf0-+ibDr zjJ}b+dEE!M$KdNaKhL`0ob~9Ely+RM1+-Cq8<@$nV+h2WLQEq@z*(Y9ousy0aRq7w zMI%~geU6;~>W+iT3I>oMz&Yn8C&LA?-(J@%Z)zLjk mClknb)F}mvMmjns>f|~(Cl@*Ccsn|~PF|}nxp|9PI2!;C .btn, + .input-group-btn:last-child > .btn-group { + margin-left: inherit !important; + } +} + diff --git a/searx/static/themes/oscar/css/logicodev.min.css b/searx/static/themes/oscar/css/logicodev.min.css index 679f9bb5202828ecee0b1a05b10660484089c971..c795583d8cb14bac19ae46d26acb8859b904ece2 100644 GIT binary patch delta 232 zcmZvXF^ diff --git a/searx/static/themes/oscar/css/logicodev.min.css.map b/searx/static/themes/oscar/css/logicodev.min.css.map index 37fe5e92e460d8a7bcd542e17d1990baa8b3ab15..eb6eceaa2d9026b3a2579d5b1a3e1703b381a6bb 100644 GIT binary patch delta 96 zcmX@>H`#we<>Uq?!Hvy-87EfqPtIZF .btn, + .input-group-btn:last-child > .btn-group { + margin-left: inherit !important; + } +} + diff --git a/searx/static/themes/oscar/css/pointhi.min.css b/searx/static/themes/oscar/css/pointhi.min.css index 06b31026cc3e373e52607bb5b162863eb3db3e04..9c0aa5eb0367f8b7b3b7f835a5490d178b919a29 100644 GIT binary patch delta 230 zcmZvXu?@m76hv1E9Z2~ppi6<6gU(5Qk`Kl<&RGGXh#^>nRiI%SBn&hZly`b3y?Ztf zx!xD&RTrGI9$hk}o{O!3cFOMqGkJClfmoA^sl^C*mMBvtQ(J7f1l5AP7OiJPhF$>n zgrj5CvZ|5{ATcgP#Fn8OPBB${$me7Bsj2ZcxHT0pxmF#hY(-bgEavo=_y>HqLlkYq WkmefEuw^fp$nO0{8H|_PB7Fg?YFRM= delta 11 Scmcbf`8R#TCF99!Otb+h9R>IR diff --git a/searx/static/themes/oscar/css/pointhi.min.css.map b/searx/static/themes/oscar/css/pointhi.min.css.map index 00cd936eec433ad0f6b012b7afa6ffb87ed219f6..52c6c2251543f30ce4c8d2c86e6a258ca152c8b1 100644 GIT binary patch delta 113 zcmX?X*J(eYe6lu^;6!KPjSIRNC;Kw-Og3i{n^-P3*@lUeqc|}wu_#k7d2<*Ovm|50 zmOl(*2Cio4IAonDuo$oef>Rbc$UaojrAOok3)vqhqj+tD}38P9~7=s8b3S LjdXNORH_94iK!q_ delta 98 zcmeCQKWsOle6k0V*v5`|j1$WRC$C`?gevJlkNoPXFECjdFdpB_~DZ$N(oQiAYIIuv{^;QjG0NP762$y9l`(r