[MD settings] drawer menu icon into title bar; icon colors

chrome/browser/resources/settings/settings_ui/settings_ui.html

Index: chrome/browser/resources/settings/settings_ui/settings_ui.html
diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
index e7fb6486d562dd545f45365865d28c8fe160349f..c2c532b7f94960a2d2cf2826938cbf0e757e1f3f 100644
--- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
+++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
@@ -1,8 +1,9 @@
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-drawer-panel/paper-drawer-panel.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/paper-header-panel.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/typography.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toolbar/paper-toolbar.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
@@ -24,52 +25,94 @@
         background-color: var(--settings-background-color);
       }
 
-      iron-icon {
-       --iron-icon-fill-color: var(--settings-title-bar-color);
-      }
-
-      paper-toolbar {
-        @apply(--shadow-elevation-4dp);
-        --paper-toolbar-title: {
-          font-size: 123.08%;
+      :root {

[tommycli, 2016/04/13 20:39:29]

Do these changes apply only to the paper-header-panels? Can they be under
paper-header-panel instead of :root then? So that these variables are only
defined for that scope?

[dschuyler, 2016/04/13 22:19:50]

Done.

+        --iron-icon-fill-color: var(--settings-title-bar-color);
+        --paper-toolbar-height: 56px;
+        --paper-toolbar-sm-height: 56px;
+        --paper-toolbar-content: {
+          font-size: 123.08%; /* go to 16px from 13px */
+        }
+        --paper-toolbar: {
+          background-color: var(--settings-title-bar-background-color);
         };
-        background-color: var(--settings-title-bar-background-color);
-        min-height: 56px;
-        position: relative;
-        z-index: 10;
       }
 
       paper-drawer-panel {
         @apply(--layout-center);
         --paper-drawer-panel-left-drawer-container: {
           background-color: var(--settings-background-color);
-          margin-top: 8px;
         };
         --paper-drawer-panel-right-drawer-container: {
           background-color: var(--settings-background-color);
-          margin-top: 8px;
         };
         position: relative;
       }
 
-      settings-main paper-icon-button {
-        z-index: 10;
+      paper-input {
+        @apply(--layout-center);
+        --paper-input-container: {
+          padding-top: 0;
+        };
+        --paper-input-container-color: var(--settings-title-search-color);
+        --paper-input-container-focus-color: var(--settings-title-search-color);
+        --paper-input-container-input: {
+          font-size: 81.25%; /* go to 13px from 16px */
+          line-height: 16px !important;

[Dan Beam, 2016/04/13 22:51:14]

don't use !important if at all possible

[dschuyler, 2016/04/14 21:27:22]

Done.

+        };
+        --paper-input-container-input-color: var(--settings-title-bar-color);
+        --paper-input-container-label: {
+          font-size: 81.25%; /* go to 13px from 16px */
+        };
+        --paper-input-max-width: 200px;
+      }
+
+      /* Prevent paper-toolbar from setting the margin-right to 24px. */
+      paper-toolbar.toolbar > paper-icon-button[icon=menu][paper-drawer-toggle] {
+        margin-right: 0;

[tommycli, 2016/04/13 20:39:29]

Are there RTL issues here?

[dschuyler, 2016/04/13 22:19:50]

This is undoing a specific entry (margin-right) within
the paper-toolbar. I think there is an RTL issue, but it's
lower level (in polymer) than this code.

[tommycli, 2016/04/13 22:35:28]

Okay cool. I see that now. Maybe just add a TODO or Polymer bug to verify that
either: a) it is indeed always on the right in both regular and RTL environments
or b) it's a Polymer RTL bug and we need to address it.

[Dan Beam, 2016/04/13 22:51:14]

use -webkit-margin-start/end in a more specific way or
:host-context([dir='rtl']) and make this mirror (also run the code with
LANGUAGE=ar or something from command line to actually see settings in RTL)

[dschuyler, 2016/04/14 21:27:22]

Acknowledged.

[dschuyler, 2016/04/14 21:27:22]

Done.

+      }
+
+      .heading {
+        margin-left: 8px;

[tommycli, 2016/04/13 20:39:29]

RTL?

[dschuyler, 2016/04/13 22:19:50]

Done.

+      }
+
+      paper-icon-button[suffix] {
+        --iron-icon-fill-color: var(--settings-title-search-color);
+        line-height: 16px !important;
+        height: 32px; /* After padding, the icon size is 16px. */
+        width: 32px;
       }
     </style>
     <settings-router current-route="{{currentRoute}}"
         current-route-titles="{{currentRouteTitles}}">
     </settings-router>
-    <paper-toolbar>
-      <div class="title" i18n-content="settings"></div>
-      <!-- TODO(dschuyler): implement internal search. -->
-      <iron-icon icon="md-settings-icons:search"></iron-icon>
-    </paper-toolbar>
-    <paper-drawer-panel drawer-width="256px" id="panel">
-      <settings-menu drawer class="flex" current-route="{{currentRoute}}">
-      </settings-menu>
-      <settings-main main prefs="{{prefs}}" current-route="{{currentRoute}}">
-        <paper-icon-button icon="menu" paper-drawer-toggle></paper-icon-button>
-      </settings-main>
+    <paper-drawer-panel drawer-width="256px" id="panel"
+        on-paper-responsive-change="onNarrow_">
+      <paper-header-panel drawer>
+        <paper-toolbar class="toolbar">
+          <div class="heading flex">$i18n{settings}</div>
+        </paper-toolbar>
+        <settings-menu current-route="{{currentRoute}}">
+        </settings-menu>
+      </paper-header-panel>
+      <paper-header-panel main>
+        <paper-toolbar class="toolbar">
+          <paper-icon-button icon="menu" paper-drawer-toggle>
+          </paper-icon-button>
+          <div class="heading flex">[[mainTitle_]]</div>
+          <paper-icon-button icon="md-settings-icons:search"
+              on-tap="toggleSearch_"></paper-icon-button>
+          <template is="dom-if" if="[[showSearch_]]">
+            <paper-input label="$i18n{internalSearch}" no-label-float>
+              <!-- TODO(dschuyler): implement internal search. -->
+              <paper-icon-button suffix
+                  icon="md-settings-icons:cancel">
+              </paper-icon-button>
+            </paper-input>
+          </template>
+        </paper-toolbar>
+        <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}">
+        </paper-icon-button>
+      </paper-header-panel>
     </paper-drawer-panel>
   </template>
   <script src="settings_ui.js"></script>