Consolidate some Settings styles

chrome/browser/resources/settings/settings_page_css.html

Index: chrome/browser/resources/settings/settings_page_css.html
diff --git a/chrome/browser/resources/settings/settings_page_css.html b/chrome/browser/resources/settings/settings_page_css.html
index ccd59f501fdb940cc1e413773f85d25b1e822019..160470e9e9f1bcacf62a9875a117486ccd5ca325 100644
--- a/chrome/browser/resources/settings/settings_page_css.html
+++ b/chrome/browser/resources/settings/settings_page_css.html
@@ -1,8 +1,9 @@
+<link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="/settings_page/main_page_behavior.html">
 
 <dom-module id="settings-page-styles">
   <template>
-    <style include="main-page-styles">
+    <style>
       :host {
         box-sizing: border-box;
         display: block;
@@ -18,13 +19,24 @@
         height: inherit;
       }
 
-      :host > div > * {
+      :host > div > :not(.expanded) {
         /* The margin and padding here are doing two things: make the total
          * separation 24px; and make scrollIntoView align the section header
          * with the top item in the side nav menu. Both things are desired
          * by Alan (bettes@). */
         margin-bottom: 3px;
       }
+
+      .expanded {
+        min-height: 100%;
+      }
+
+      .expanding,
+      .collapsing {
+        /* Must be lower than the paper-header-panel's z-index.
+         * See settings_ui.html. */
+        z-index: 1;
+      }
     </style>
   </template>
 </dom-module>