From ccbee6d2be579cb9f6d96b6be264eb3ac33714af Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Sun, 10 Jan 2021 13:23:59 +0100 Subject: [PATCH] Remove unnecessary `dir`-dependent CSS rules, and simplify som findbar-button rules (PR 11077 follow-up) With the updated default viewer UI, some `dir`-dependent CSS rules are now redundant since *identical* rules are being specified for both LTR and RTL mode; after PR 12807 landed I've found even more of these cases. Note in particular that the findbar-button rules can be simplified quite a bit, since there's a fair amount of unnecessary duplication in the CSS. --- web/viewer.css | 68 +++++++++----------------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/web/viewer.css b/web/viewer.css index 04f3888bd..b47a33378 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -367,15 +367,6 @@ html[dir="rtl"] #sidebarResizer { position: relative; height: 32px; background-color: var(--toolbar-bg-color); -} -html[dir="ltr"] #toolbarContainer, -.findbar, -.secondaryToolbar { - box-shadow: 0 1px 0 var(--toolbar-border-color); -} -html[dir="rtl"] #toolbarContainer, -.findbar, -.secondaryToolbar { box-shadow: 0 1px 0 var(--toolbar-border-color); } @@ -494,58 +485,42 @@ html[dir="rtl"] .findbar { right: 64px; } +.findbar .splitToolbarButton { + margin-top: 3px; +} html[dir="ltr"] .findbar .splitToolbarButton { margin-left: 0px; - margin-top: 3px; + margin-right: 5px; } - html[dir="rtl"] .findbar .splitToolbarButton { + margin-left: 5px; margin-right: 0px; - margin-top: 3px; } -.findbar .splitToolbarButton .findNext { - width: 29px; -} - -html[dir="ltr"] .findbar .splitToolbarButton .findNext { - border-right: 1px solid var(--field-border-color); -} - -html[dir="rtl"] .findbar .splitToolbarButton .findNext { - border-left: 1px solid var(--field-border-color); -} - -.findbar .splitToolbarButton .toolbarButton { +.findbar .splitToolbarButton > .toolbarButton { background-color: var(--findbar-nextprevious-btn-bg-color); - border-radius: 0px; + border-radius: 0; height: 26px; border-top: 1px solid var(--field-border-color); border-bottom: 1px solid var(--field-border-color); } -.findbar .splitToolbarButton .toolbarButton::before { +.findbar .splitToolbarButton > .toolbarButton::before { top: 5px; } -html[dir="ltr"] .findbar .splitToolbarButton > .findPrevious { - border-radius: 0; +.findbar .splitToolbarButton > .findNext { + width: 29px; } html[dir="ltr"] .findbar .splitToolbarButton > .findNext { - border-bottom-left-radius: 0; border-bottom-right-radius: 2px; - border-top-left-radius: 0; border-top-right-radius: 2px; -} - -html[dir="rtl"] .findbar .splitToolbarButton > .findPrevious { - border-radius: 0; + border-right: 1px solid var(--field-border-color); } html[dir="rtl"] .findbar .splitToolbarButton > .findNext { border-bottom-left-radius: 2px; - border-bottom-right-radius: 0; border-top-left-radius: 2px; - border-top-right-radius: 0; + border-left: 1px solid var(--field-border-color); } .findbar input[type="checkbox"] { @@ -565,7 +540,6 @@ html[dir="ltr"] #findInput { border-top-right-radius: 0; border-bottom-right-radius: 0; } - html[dir="rtl"] #findInput { border-top-left-radius: 0; border-bottom-left-radius: 0; @@ -737,11 +711,9 @@ html[dir="rtl"] .findbar * { display: inline-block; } html[dir="ltr"] .splitToolbarButton > .toolbarButton { - border-radius: 2px; float: left; } html[dir="rtl"] .splitToolbarButton > .toolbarButton { - border-radius: 2px; float: right; } @@ -792,12 +764,10 @@ html[dir="rtl"] .splitToolbarButton > .toolbarButton { } html[dir="ltr"] .splitToolbarButton > .toolbarButton:first-child, html[dir="rtl"] .splitToolbarButton > .toolbarButton:last-child { - position: relative; margin: 0; } html[dir="ltr"] .splitToolbarButton > .toolbarButton:last-child, html[dir="rtl"] .splitToolbarButton > .toolbarButton:first-child { - position: relative; margin: 0; } .splitToolbarButtonSeparator { @@ -932,20 +902,6 @@ html[dir="rtl"] .dropdownToolbarButton > select { height: 1px; } -html[dir="ltr"] #findPrevious { - margin-left: 0; -} -html[dir="ltr"] #findNext { - margin-right: 3px; -} - -html[dir="rtl"] #findPrevious { - margin-right: 0; -} -html[dir="rtl"] #findNext { - margin-left: 3px; -} - .toolbarButton::before, .secondaryToolbarButton::before, .dropdownToolbarButton::after,