Bug 1382033 - [Photon] Update styling of view button in history sidebar on macOS. r=dao draft
authorNihanth Subramanya <nhnt11@gmail.com>
Wed, 19 Jul 2017 04:47:23 +0530
changeset 653702 b3f8476ac72047e16c50b6d71eccc85f6a00a659
parent 653538 31465a03c03d1eec31cd4dd5d6b803724dcb29cd
child 728388 6e8df0984e535b33c3a5265d969e8ffd0879c86a
push id76380
push usernhnt11@gmail.com
push dateSun, 27 Aug 2017 00:41:36 +0000
reviewersdao
bugs1382033
milestone57.0a1
Bug 1382033 - [Photon] Update styling of view button in history sidebar on macOS. r=dao MozReview-Commit-ID: BXZKzgI4X0k
browser/themes/osx/places/places.css
toolkit/themes/osx/global/icons/menulist-dropmarker.png
toolkit/themes/osx/global/jar.mn
--- a/browser/themes/osx/places/places.css
+++ b/browser/themes/osx/places/places.css
@@ -1,31 +1,30 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-%include ../shared.inc
-
 /* Sidebars */
 
 #bookmarksPanel,
 #history-panel,
 #sidebar-search-container,
 #tabs-panel {
   -moz-appearance: none !important;
   background-color: transparent !important;
   border-top: none !important;
 }
 
 .sidebar-placesTree,
 .sidebar-placesTreechildren::-moz-tree-row {
   padding-bottom: 1px;
   margin: 0;
   height: 24px;
-  font-size: 12px;
+  /* Default font size is 11px on mac, so this is 12px */
+  font-size: 1.0909rem;
 }
 
 .sidebar-placesTree {
   -moz-appearance: -moz-mac-source-list;
 }
 
 .sidebar-placesTreechildren::-moz-tree-separator {
   border-top: 1px solid #505d6d;
@@ -115,60 +114,41 @@
 
   .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected, focus) {
     list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl")
   }
 }
 
 #viewButton {
   -moz-appearance: none;
-  padding-bottom: 1px;
-  padding-inline-start: 5px;
-  padding-inline-end: 0px;
-  margin: 0;
-  margin-inline-start: 4px;
-  min-width: 0px;
-  min-height: 0px;
-  border: 1px solid #a2a9b1;
-  border-radius: 10px;
-  background-image: linear-gradient(hsla(0,0%,100%,.75),hsla(0,0%,100%,.1));
-  box-shadow: inset 0 0 1px hsla(0,0%,100%,.85),
-                    0 1px hsla(0,0%,100%,.35);
-}
-
-#viewButton:hover:active,
-#viewButton[open=true] {
-  background-image: linear-gradient(hsla(0,0%,100%,.1),hsla(0,0%,100%,.75));
-  box-shadow: @roundButtonPressedShadow@;
-  color: -moz-dialogText;
-}
-
-#viewButton:-moz-window-inactive {
-  border-color: #b6b6b6;
-  background-image: linear-gradient(hsla(0,0%,100%,.3),hsla(0,0%,100%,0));
-}
-
-#viewButton .button-menu-dropmarker {
-  display: -moz-box;
-  list-style-image: url("chrome://global/skin/icons/menulist-dropmarker.png");
+  border-radius: 4px;
+  padding: 2px 4px;
+  margin: 4px 0;
+  margin-inline-end: 4px;
+  /* Default font size is 11px on mac, so this is 12px */
+  font-size: 1.0909rem;
 }
 
 #viewButton:focus {
-  box-shadow: 0 1px 0 hsla(0, 0%, 0%, .15),
-              0 0 0 1px hsla(210, 100%, 60%, .45) inset,
-              0 0 0 2px hsla(210, 100%, 60%, .45);
-  border-color: hsla(210, 100%, 60%, 1);
+  box-shadow: var(--focus-ring-box-shadow);
+}
+
+#viewButton:hover {
+  background: hsla(240, 5%, 5%, 0.1);
 }
 
-#sidebar-search-container {
-  padding: 4px;
+#viewButton[open] {
+  background: hsla(240, 5%, 5%, 0.15);
 }
 
-#search-box {
-  margin: 0;
+#viewButton > .button-box > .button-menu-dropmarker {
+  display: -moz-box;
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
+  width: 12px;
+  height: 12px;
 }
 
 /* Trees */
 
 %include ../../shared/places/tree-icons.inc.css
 
 treechildren:-moz-tree-image(selected,focus) {
   fill: HighlightText;
deleted file mode 100644
index 689a1fe877ce6fa85724b360316d8be4d3595c80..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/osx/global/jar.mn
+++ b/toolkit/themes/osx/global/jar.mn
@@ -71,17 +71,16 @@ toolkit.jar:
   skin/classic/global/dirListing/up.png                              (dirListing/up.png)
   skin/classic/global/icons/autocomplete-dropmarker.png              (icons/autocomplete-dropmarker.png)
   skin/classic/global/icons/autocomplete-search.svg                  (icons/autocomplete-search.svg)
   skin/classic/global/icons/autoscroll.png                           (icons/autoscroll.png)
   skin/classic/global/icons/blacklist_favicon.png                    (icons/blacklist_favicon.png)
   skin/classic/global/icons/blacklist_64.png                         (icons/blacklist_64.png)
   skin/classic/global/icons/glyph-dropdown.png                       (icons/glyph-dropdown.png)
   skin/classic/global/icons/glyph-dropdown@2x.png                    (icons/glyph-dropdown@2x.png)
-  skin/classic/global/icons/menulist-dropmarker.png                  (icons/menulist-dropmarker.png)
   skin/classic/global/icons/notfound.png                             (icons/notfound.png)
   skin/classic/global/icons/panebutton-active.png                    (icons/panebutton-active.png)
   skin/classic/global/icons/panebutton-inactive.png                  (icons/panebutton-inactive.png)
   skin/classic/global/icons/panel-dropmarker.png                     (icons/panel-dropmarker.png)
   skin/classic/global/icons/resizer.png                              (icons/resizer.png)
   skin/classic/global/icons/resizer@2x.png                           (icons/resizer@2x.png)
   skin/classic/global/icons/resizer-rtl.png                          (icons/resizer-rtl.png)
   skin/classic/global/icons/resizer-rtl@2x.png                       (icons/resizer-rtl@2x.png)