[MD settings] sort settings css vars

chrome/browser/resources/settings/settings_vars_css.html

Index: chrome/browser/resources/settings/settings_vars_css.html
diff --git a/chrome/browser/resources/settings/settings_vars_css.html b/chrome/browser/resources/settings/settings_vars_css.html
index 36205145b6cac85134d2d6cf53479318cb89a350..fdde96ba3af2e7470b2d38ee4ef0dfcbb218dac5 100644
--- a/chrome/browser/resources/settings/settings_vars_css.html
+++ b/chrome/browser/resources/settings/settings_vars_css.html
@@ -3,52 +3,17 @@
 
 <!-- Common css variables for Material Design settings. -->
 <style is="custom-style">
+  /* We keep our vars in sort order, though some vars must be defined prior to
+   * others. The --settings-* vars are defined explicitly prior to the --paper-*
+   * and --iron-* vars.
+   */
   :root {
-    --checkbox-margin-start: 2px;
-    --checkbox-size: 16px;
-    --checkbox-spacing: 18px;
-    --iron-icon-fill-color: var(--paper-grey-600);
-    --iron-icon-height: 20px;
-    --iron-icon-spacing: 16px;
-    --iron-icon-width: 20px;
-    --paper-checkbox-label-color: inherit;
-    --paper-dialog-color: inherit;
-    --paper-icon-button: {
-      width: 36px;
-      height: 36px;
-    };
-    --paper-input-max-width: 264px;
-    --paper-item: {
-      font-size: inherit;
-    };
-    --paper-radio-button-label-color: inherit;
-    --paper-radio-group-item-padding: 0;
-
-    --settings-toggle-bar-size: {
-      height: 12px;
-      width: 28px;
-    };
-    --settings-toggle-button-size: {
-      height: 16px;
-      width: 16px;
-    };
-    --settings-toggle-color: var(--google-blue-500);
-    --paper-toggle-button-checked-bar-color: var(--settings-toggle-color);
-    --paper-toggle-button-checked-button-color: var(--settings-toggle-color);
-    --paper-toggle-button-checked-bar: var(--settings-toggle-bar-size);
-    --paper-toggle-button-checked-button: var(--settings-toggle-button-size);
-    --paper-toggle-button-unchecked-bar: var(--settings-toggle-bar-size);
-    --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size);
+    /* Some colors use non-MD colors.  These custom colors are specified by
+     * UX design (bettes@). */
 
     --settings-actionable: var(--cr-actionable);
 
-    /* Custom grey for Alan (bettes@). */
     --settings-background-color: rgb(241, 241, 241);
-    --settings-secondary: {
-      color: var(--paper-grey-600);
-      font-weight: 400;
-      margin-top: 4px;
-    };
     --settings-disabled-opacity: .65;
     --settings-error-color: var(--paper-red-700);
 
@@ -59,18 +24,59 @@
       padding-top: 0;
     }
 
-    /* Some colors use non-MD colors.  These custom colors are specified by
-     * UX design (bettes@). */
     --settings-nav-grey: rgb(90, 90, 90);
 
     --settings-page-vertical-margin: 21px;
 
     --settings-row-min-height: 44px;
     --settings-row-two-line-min-height: 56px;
+    --settings-secondary: {
+      color: var(--paper-grey-600);
+      font-weight: 400;
+      margin-top: 4px;
+    };
     --settings-separator-line: var(--cr-separator-line);
 
     --settings-title-bar-background-color: var(--google-blue-700);
     --settings-title-bar-color: rgb(255, 255, 255);
     --settings-title-search-color: rgb(192, 199, 205);
+    --settings-toggle-bar-size: {
+      height: 12px;
+      width: 28px;
+    };
+    --settings-toggle-button-size: {
+      height: 16px;
+      width: 16px;
+    };
+    --settings-toggle-color: var(--google-blue-500);
+  }
+
+  :root {
+    --checkbox-margin-start: 2px;
+    --checkbox-size: 16px;
+    --checkbox-spacing: 18px;
+    --iron-icon-fill-color: var(--paper-grey-600);
+    --iron-icon-height: 20px;
+    --iron-icon-spacing: 16px;
+    --iron-icon-width: 20px;
+    --paper-checkbox-label-color: inherit;
+    --paper-dialog-color: inherit;
+    --paper-icon-button: {
+      width: 36px;
+      height: 36px;

[stevenjb, 2016/09/07 15:45:01]

sort height width
Also, should these be aligned with --, same throughout? I don't feel strongly
either way.

[dschuyler, 2016/09/07 18:25:29]

Done.
I agree that it looks odd with the --, but I 
think the two space indent with the braces
is correct.

+    };
+    --paper-input-max-width: 264px;
+    --paper-item: {
+      font-size: inherit;
+    };
+    --paper-radio-button-label-color: inherit;
+    --paper-radio-group-item-padding: 0;
+
+    --paper-toggle-button-checked-bar: var(--settings-toggle-bar-size);
+    --paper-toggle-button-checked-bar-color: var(--settings-toggle-color);
+    --paper-toggle-button-checked-button: var(--settings-toggle-button-size);
+    --paper-toggle-button-checked-button-color: var(--settings-toggle-color);
+    --paper-toggle-button-unchecked-bar: var(--settings-toggle-bar-size);
+    --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size);
   }
 </style>