[CrOS SplitSettings] Change OS settings toolbar color theme.

Bug: 950007 Change-Id: Ifae6ffabef420b5a6d9b7968649d3c8f1cd67a84 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1582330 Commit-Queue: Regan Hsu <hsuregan@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Reviewed-by: Dan Beam <dbeam@chromium.org> Cr-Commit-Position: refs/heads/master@{#655372}
Denger-Network · Apr 30, 2019 · b5a5fbb · b5a5fbb
1 parent 94f5141
commit b5a5fbb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/chrome/browser/resources/settings/chromeos/os_settings.html b/chrome/browser/resources/settings/chromeos/os_settings.html
@@ -17,7 +17,8 @@
     }
 
     html.loading::before {
-      background-color: var(--md-toolbar-color);
+      /* TODO(hsuregan): update for dark mode when needed. */
+      background-color: white;
       border-bottom: var(--md-toolbar-border);
       box-sizing: border-box;
       content: '';

diff --git a/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html b/chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html
@@ -35,14 +35,13 @@
 
       cr-toolbar {
         @apply --layout-center;
+        /* TODO(hsuregan): update for dark mode when needed. */
+        background-color: white;
+        color: var(--cr-secondary-text-color);
         min-height: 56px;
         z-index: 2;
       }
 
-      :host-context(html:not([dark])) cr-toolbar {
-        --iron-icon-fill-color: white;
-      }
-
       #container {
         flex: 1;
         overflow: overlay;

diff --git a/ui/webui/resources/cr_elements/cr_icons_css.html b/ui/webui/resources/cr_elements/cr_icons_css.html
@@ -135,17 +135,6 @@
       }
       /* Open in new is the same for light and dark mode. */
 
-      :-webkit-any(paper-icon-button-light,
-                   cr-icon-button,
-                   .cr-icon).icon-toolbar-menu {
-        background-image: url(../images/icon_toolbar_menu.svg);
-      }
-      :host-context([dark]) :-webkit-any(paper-icon-button-light,
-                                         cr-icon-button,
-                                         .cr-icon).icon-toolbar-menu {
-        background-image: url(../images/dark/icon_toolbar_menu.svg);
-      }
-
       :-webkit-any(paper-icon-button-light,
                    cr-icon-button,
                    .cr-icon).icon-more-vert {

diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.html
@@ -144,6 +144,17 @@
         padding: 0;
         width: 20px;
       }
+
+      #menuButton {
+        -webkit-mask-image: url(../../images/icon_toolbar_menu.svg);
+        -webkit-mask-position: center;
+        -webkit-mask-repeat: no-repeat;
+        background: currentColor;
+      }
+
+      :host-context([dark]) #menuButton {
+        -webkit-mask-image: url(../../images/dark/icon_toolbar_menu.svg);
+      }
     </style>
     <div id="leftContent">
       <div id="leftSpacer">