[MD settings] align mouse and touchpad page

chrome/browser/resources/settings/device_page/pointers.html

Index: chrome/browser/resources/settings/device_page/pointers.html
diff --git a/chrome/browser/resources/settings/device_page/pointers.html b/chrome/browser/resources/settings/device_page/pointers.html
index 6c7eaa1026f001b3fc7e782f652df978f9d3174a..ef0c1212ce6fc7adc0cb6fa85114d9cc5f381ed7 100644
--- a/chrome/browser/resources/settings/device_page/pointers.html
+++ b/chrome/browser/resources/settings/device_page/pointers.html
@@ -13,81 +13,83 @@
         -webkit-padding-start: var(--settings-box-row-padding);
       }
 
-      /* Indent layout elements under .subsection, using margin instead of
-       * padding so the borders line up. */
-      .subsection > .settings-box {
-        margin: 0 var(--settings-box-row-indent);
-        padding: 0;
+      .subsection {
+        -webkit-padding-end: var(--settings-box-row-padding);
+        -webkit-padding-start: var(--settings-box-row-indent);
       }
 
-      .subsection > .list-frame {
-        -webkit-margin-start: var(--settings-indent-width);
+      .subsection > .settings-box  {
+        padding-left: 0;
+        padding-right: 0;
       }
     </style>
-    <div id="mouse" hidden$="[[!hasMouse]]"
-        class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]">
+    <div id="mouse" hidden$="[[!hasMouse]]">
       <!-- Subsection title only appears if both mouse and touchpad exist. -->
       <h2 hidden$="[[!hasTouchpad]]">$i18n{mouseTitle}</h2>
-      <div class="settings-box first">
-        <!-- Do not change the mouse button pref before the mouse is released.
-             See crbug.com/686949 -->
-        <settings-toggle-button id="mouseSwapButton" class="start"
-            pref="{{prefs.settings.mouse.primary_right}}"
-            label="$i18n{mouseSwapButtons}"
-            on-settings-boolean-control-change="onMouseSwapButtonsChange_"
-            on-down="onMouseSwapButtonsDown_" on-up="onMouseSwapButtonsUp_"
-            no-set-pref>
-        </settings-toggle-button>
-      </div>
-      <div class="settings-box">
-        <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div>
-        <settings-slider pref="{{prefs.settings.mouse.sensitivity2}}"
-            tick-values="[[sensitivityValues_]]"
-            aria-labelledby="mouseSpeedLabel"
-            label-min="$i18n{pointerSlow}"
-            label-max="$i18n{pointerFast}">
-        </settings-slider>
-      </div>
-    </div>
-    <div id="touchpad" hidden$="[[!hasTouchpad]]"
-        class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]">
-      <!-- Subsection title only appears if both mouse and touchpad exist. -->
-      <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2>
-      <div class="settings-box block first">
-        <settings-toggle-button id="enableTapToClick"
-            pref="{{prefs.settings.touchpad.enable_tap_to_click}}"
-            label="$i18n{touchpadTapToClickEnabledLabel}">
-        </settings-toggle-button>
-        <settings-toggle-button id="enableTapDragging"
-            pref="{{prefs.settings.touchpad.enable_tap_dragging}}"
-            label="$i18n{tapDraggingLabel}">
-        </settings-toggle-button>
-      </div>
-      <div class="settings-box">
-        <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div>
-          <settings-slider id="touchpadSensitivity"
-              pref="{{prefs.settings.touchpad.sensitivity2}}"
+      <div class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]">

[dschuyler, 2017/04/18 19:40:59]

Lines 30 to 48 should be indented without other changes.

+        <div class="settings-box first">
+          <!-- Do not change the mouse button pref before the mouse is released.
+               See crbug.com/686949 -->
+          <settings-toggle-button id="mouseSwapButton" class="start"
+              pref="{{prefs.settings.mouse.primary_right}}"
+              label="$i18n{mouseSwapButtons}"
+              on-settings-boolean-control-change="onMouseSwapButtonsChange_"
+              on-down="onMouseSwapButtonsDown_" on-up="onMouseSwapButtonsUp_"
+              no-set-pref>
+          </settings-toggle-button>
+        </div>
+        <div class="settings-box">
+          <div class="start" id="mouseSpeedLabel">$i18n{mouseSpeed}</div>
+          <settings-slider pref="{{prefs.settings.mouse.sensitivity2}}"
               tick-values="[[sensitivityValues_]]"
-              aria-labelledby="touchpadSpeedLabel"
+              aria-labelledby="mouseSpeedLabel"
               label-min="$i18n{pointerSlow}"
               label-max="$i18n{pointerFast}">
           </settings-slider>
+        </div>
       </div>
-      <div class="settings-box">$i18n{scrollLabel}</div>
-      <div class="list-frame">
-        <settings-radio-group pref="{{prefs.settings.touchpad.natural_scroll}}">
-          <paper-radio-button name="false">
-            $i18n{traditionalScrollLabel}
-          </paper-radio-button>
-          <paper-radio-button name="true">
-            $i18n{naturalScrollLabel}
-            <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank"
-                on-tap="onLearnMoreLinkActivated_"
-                on-keydown="onLearnMoreLinkActivated_">
-              $i18n{naturalScrollLearnMore}
-            </a>
-          </paper-radio-button>
-        </settings-radio-group>
+    </div>
+    <div id="touchpad" hidden$="[[!hasTouchpad]]">
+      <!-- Subsection title only appears if both mouse and touchpad exist. -->
+      <h2 hidden$="[[!hasMouse]]">$i18n{touchpadTitle}</h2>
+      <div class$="[[getSubsectionClass_(hasMouse, hasTouchpad)]]">

[dschuyler, 2017/04/18 19:40:59]

Lines 56 to 92 should be indented without other changes.

+        <div class="settings-box block first">
+          <settings-toggle-button id="enableTapToClick"
+              pref="{{prefs.settings.touchpad.enable_tap_to_click}}"
+              label="$i18n{touchpadTapToClickEnabledLabel}">
+          </settings-toggle-button>
+          <settings-toggle-button id="enableTapDragging"
+              pref="{{prefs.settings.touchpad.enable_tap_dragging}}"
+              label="$i18n{tapDraggingLabel}">
+          </settings-toggle-button>
+        </div>
+        <div class="settings-box">
+          <div class="start" id="touchpadSpeedLabel">$i18n{touchpadSpeed}</div>
+            <settings-slider id="touchpadSensitivity"
+                pref="{{prefs.settings.touchpad.sensitivity2}}"
+                tick-values="[[sensitivityValues_]]"
+                aria-labelledby="touchpadSpeedLabel"
+                label-min="$i18n{pointerSlow}"
+                label-max="$i18n{pointerFast}">
+            </settings-slider>
+        </div>
+        <div class="settings-box">$i18n{scrollLabel}</div>
+        <div class="list-frame">
+          <settings-radio-group
+              pref="{{prefs.settings.touchpad.natural_scroll}}">
+            <paper-radio-button name="false">
+              $i18n{traditionalScrollLabel}
+            </paper-radio-button>
+            <paper-radio-button name="true">
+              $i18n{naturalScrollLabel}
+              <a href="$i18n{naturalScrollLearnMoreLink}" target="_blank"
+                  on-tap="onLearnMoreLinkActivated_"
+                  on-keydown="onLearnMoreLinkActivated_">
+                $i18n{naturalScrollLearnMore}
+              </a>
+            </paper-radio-button>
+          </settings-radio-group>
+        </div>
       </div>
     </div>
   </template>