Merge pull request #12250 from Snuffleupagus/dropdownToolbarButton-ad…

…justWidth Update the zoom dropdown width calculation to work better in locales with long zoom-strings (PR 11077 follow-up)
mozilla · Aug 20, 2020 · 164be97 · 164be97
2 parents 965d20d + 2683f44
commit 164be97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/web/toolbar.js b/web/toolbar.js
@@ -271,7 +271,7 @@ class Toolbar {
       }
     }
     const overflow = SCALE_SELECT_WIDTH - SCALE_SELECT_CONTAINER_WIDTH;
-    maxWidth += 1.5 * overflow;
+    maxWidth += 2 * overflow;
 
     if (maxWidth > SCALE_SELECT_CONTAINER_WIDTH) {
       items.scaleSelect.style.width = `${maxWidth + overflow}px`;

diff --git a/web/viewer.css b/web/viewer.css
@@ -352,7 +352,7 @@ html[dir='rtl'] #outerContainer.sidebarOpen #viewerContainer:not(.pdfPresentatio
   background-color: var(--sidebar-bg-color);
 }
 html[dir='ltr'] #toolbarSidebar {
-  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25), 
+  box-shadow: inset -1px 0 0 rgba(0, 0, 0, 0.25),
     0 1px 0 rgba(0, 0, 0, 0.15),
     0 0 1px rgba(0, 0, 0, 0.1);
 }
@@ -869,10 +869,10 @@ html[dir='rtl'] #toolbarViewerLeft > .toolbarButton:first-child {
   max-width: 16px;
 }
 html[dir='ltr'] .dropdownToolbarButton::after {
-  right: 8px;
+  right: 7px;
 }
 html[dir='rtl'] .dropdownToolbarButton::after {
-  left: 8px;
+  left: 7px;
 }
 
 .dropdownToolbarButton > select {
@@ -881,11 +881,16 @@ html[dir='rtl'] .dropdownToolbarButton::after {
   font-size: 12px;
   color: var(--main-color);
   margin: 0;
-  padding: 1px 5px 2px;
+  padding: 1px 0 2px;
   border: none;
   background-color: var(--dropdown-btn-bg-color);
 }
-
+html[dir='ltr'] .dropdownToolbarButton > select {
+  padding-left: 4px;
+}
+html[dir='rtl'] .dropdownToolbarButton > select {
+  padding-right: 4px;
+}
 .dropdownToolbarButton > select:hover {
   background-color: var(--button-hover-color);
 }