MD Settings: fix overflow scrolling for <settings-dialog>

chrome/browser/resources/settings/settings_dialog.html

Index: chrome/browser/resources/settings/settings_dialog.html
diff --git a/chrome/browser/resources/settings/settings_dialog.html b/chrome/browser/resources/settings/settings_dialog.html
index d923118da9f71454e0513536e4343cbb4784bbdd..f3bd6110df5ec45c3e014b9cff33782d8d493530 100644
--- a/chrome/browser/resources/settings/settings_dialog.html
+++ b/chrome/browser/resources/settings/settings_dialog.html
@@ -8,61 +8,70 @@
   <template>
     <style include="paper-dialog-shared-styles"></style>
     <style>
-      .body-content {
-        display: flex;
-        flex-direction: column;
-        min-height: 120px;
+      :host {
+        border-radius: 2px;
       }
 
-      .dialog-content {
+      :host ::content > * {
+        /* Overrides paper-dialog-shared-styles. */
         -webkit-padding-end: 0;
         -webkit-padding-start: 0;
         margin-bottom: 0;
         margin-top: 0;
       }
 
-      .footer-container {
-        margin: 0;
-        padding: 0;
-      }
-
-      .top-row {
+      .title-container {
         align-items: center;
+        /* TODO(dbeam): should this be a --settings-separator-line? */
         border-bottom: 1px solid rgba(0, 0, 0, 0.14);
         display: flex;
         min-height: 52px;
       }
 
-      paper-icon-button {
+      :host ::content .title {
+        font-size: 114.28%; /* (16px / 14px) * 100 */
+      }
+
+      #close {
         height: 20px;
         margin: 16px;
         padding: 0;
         width: 20px;
       }
 
-      :host {
-        border-radius: 2px;
+      .body-container {
+        display: flex;
+        flex-direction: column;
         max-width: 800px;
         min-width: 512px;
+        /* TODO(dbeam): use <paper-dialog-scrollable> to get dividers? */
         overflow: auto;
       }
 
+      :host ::content .body {
+        margin: 12px 0;
+      }
+
+      :host ::content .body,
+      :host ::content .title {
+        -webkit-padding-end: 24px;
+        -webkit-padding-start: 24px;
+        flex: 1;
+      }
+
       :host ::content .body,
       :host ::content .footer,
       :host ::content paper-button {
         font-size: 92.86%; /* (13px / 14px) * 100 */
       }
 
-      :host ::content .body {
-        margin: 12px 0 24px 0;
-      }
-
       :host ::content .button-container {
         -webkit-padding-end: 16px;
         -webkit-padding-start: 16px;
         display: flex;
         justify-content: flex-end;
         margin-bottom: 12px;
+        margin-top: 12px;
       }
 
       :host ::content .button-container .cancel-button {
@@ -72,45 +81,22 @@
 
       :host ::content .footer {
         background-color: var(--paper-grey-200);
+        border-bottom-left-radius: inherit;
+        border-bottom-right-radius: inherit;
         margin: 0;
-        padding: 20px;
-      }
-
-      :host ::content .row {
-        align-items: center;
-        display: flex;
-        min-height: 40px;
-      }
-
-      :host ::content .row .start {
-        flex: 1;
-      }
-
-      :host ::content .title {
-        font-size: 114.28%; /* (16px / 14px) * 100 */
-      }
-
-      :host ::content .body,
-      :host ::content .title {
-        -webkit-padding-end: 24px;
-        -webkit-padding-start: 24px;
-        flex: 1;
+        padding: 12px 20px;
       }
     </style>
-    <div class="dialog-content">
-      <div class="top-row">
-        <content select=".title"></content>
-        <paper-icon-button icon="cr:clear" on-tap="cancel" id="close">
-        </paper-icon-button>
-      </div>
-      <div class="body-content">
-        <content select=".body"></content>
-        <content select=".button-container"></content>
-      </div>
+    <div class="title-container">
+      <content select=".title"></content>
+      <paper-icon-button icon="cr:clear" on-tap="cancel" id="close">
+      </paper-icon-button>
     </div>
-    <div class="footer-container">
-      <content select=".footer"></content>
+    <div class="body-container">
+      <content select=".body"></content>
     </div>
+    <content select=".button-container"></content>
+    <content select=".footer"></content>
   </template>
   <script src="settings_dialog.js"></script>
 </dom-module>