[MD settings] touch up sub-page titles and icons

This CL adjusts the back-arrow and title of settings
sup-pages.  It also removes the stroke style from
icons used in settings.

BUG=597860, 597884

Review URL: https://codereview.chromium.org/1838533002

Cr-Commit-Position: refs/heads/master@{#383349}

7 files changed, 20 insertions, 25 deletions

diff --git a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
index f0e7c4e..4797368 100644
--- a/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
+++ b/chrome/browser/resources/settings/controls/settings_dropdown_menu.html
@@ -17,7 +17,6 @@
 
       paper-dropdown-menu {
         --iron-icon-fill-color: var(--paper-grey-800);
-        --iron-icon-stroke-color: var(--paper-grey-800);
         --paper-font-subhead: {
           font-size: inherit;
         };
diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html b/chrome/browser/resources/settings/settings_menu/settings_menu.html
index ab6385a..aed6dfd 100644
--- a/chrome/browser/resources/settings/settings_menu/settings_menu.html
+++ b/chrome/browser/resources/settings/settings_menu/settings_menu.html
@@ -19,7 +19,6 @@
     <style include="settings-shared">
       iron-icon {
         --iron-icon-fill-color: var(--settings-side-nav-color);
-        --iron-icon-stroke-color: var(--settings-side-nav-color);
         -webkit-margin-end: 16px;
       }
 
diff --git a/chrome/browser/resources/settings/settings_page/settings_subheader.css b/chrome/browser/resources/settings/settings_page/settings_subheader.css
deleted file mode 100644
index 331762b..0000000
--- a/chrome/browser/resources/settings/settings_page/settings_subheader.css
+++ /dev/null
@@ -1,13 +0,0 @@
-/* Copyright 2015 The Chromium Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can be
- * found in the LICENSE file. */
-
-:host {
-  @apply(--layout-center);
-  @apply(--layout-horizontal);
-  margin-bottom: 16px;
-}
-
-h2 {
-  @apply(--paper-font-subhead);
-}
diff --git a/chrome/browser/resources/settings/settings_page/settings_subheader.html b/chrome/browser/resources/settings/settings_page/settings_subheader.html
index 93c13b1..0f5bf068 100644
--- a/chrome/browser/resources/settings/settings_page/settings_subheader.html
+++ b/chrome/browser/resources/settings/settings_page/settings_subheader.html
@@ -3,11 +3,27 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html">
 
 <dom-module id="settings-subheader">
-  <link rel="import" type="css" href="settings_subheader.css">
   <template>
-    <paper-icon-button icon="arrow-back" on-tap="onTapBack_">
-    </paper-icon-button>
-    <h2>[[pageTitle]]</h2>
+    <style include="settings-shared">
+      :root {
+        --iron-icon-fill-color: var(--settings-side-nav-color);
+        --paper-icon-button: {
+          width: 36px;
+          height: 36px;
+          margin: 0 12px 0 -8px;
+        }
+      }
+
+      h2 {
+        color: var(--settings-side-nav-color);
+        font-size: 107.6923%; /* go to 14px from 13px */
+      }
+    </style>
+    <div class="settings-box first">
+      <paper-icon-button icon="arrow-back" on-tap="onTapBack_">
+      </paper-icon-button>
+      <h2>[[pageTitle]]</h2>
+    </div>
   </template>
   <script src="settings_subheader.js"></script>
 </dom-module>
diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
index 262dfc3..7722761 100644
--- a/chrome/browser/resources/settings/settings_resources.grd
+++ b/chrome/browser/resources/settings/settings_resources.grd
@@ -123,9 +123,6 @@
       <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_JS"
                  file="settings_page/settings_section.js"
                  type="chrome_html" />
-      <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_CSS"
-                 file="settings_page/settings_subheader.css"
-                 type="chrome_html" />
       <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_HTML"
                  file="settings_page/settings_subheader.html"
                  type="chrome_html" />
diff --git a/chrome/browser/resources/settings/settings_shared_css.html b/chrome/browser/resources/settings/settings_shared_css.html
index 8baacda..4c5cfc7 100644
--- a/chrome/browser/resources/settings/settings_shared_css.html
+++ b/chrome/browser/resources/settings/settings_shared_css.html
@@ -8,7 +8,6 @@
         --checkbox-spacing: 18px;
         --iron-icon-fill-color: var(--paper-grey-500);
         --iron-icon-height: 20px;
-        --iron-icon-stroke-color: var(--paper-grey-500);
         --iron-icon-width: 20px;
         --paper-icon-button: {
           width: 36px;
@@ -40,7 +39,6 @@
       iron-icon[icon=check],
       iron-icon[icon=done] {
        --iron-icon-fill-color: var(--google-green-500);
-       --iron-icon-stroke-color: var(--google-green-500);
       }
 
       paper-button {
diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.html b/chrome/browser/resources/settings/settings_ui/settings_ui.html
index 9a8d8d8..e7fb648 100644
--- a/chrome/browser/resources/settings/settings_ui/settings_ui.html
+++ b/chrome/browser/resources/settings/settings_ui/settings_ui.html
@@ -26,7 +26,6 @@
 
       iron-icon {
        --iron-icon-fill-color: var(--settings-title-bar-color);
-       --iron-icon-stroke-color: var(--settings-title-bar-color);
       }
 
       paper-toolbar {