Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html"> |
| 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html "> |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/default-th eme.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/default-th eme.html"> |
| 4 | 4 |
| 5 <!-- Common css variables for Material Design settings. --> | 5 <!-- Common css variables for Material Design settings. --> |
| 6 <style is="custom-style"> | 6 <style is="custom-style"> |
|
hcarmona
2017/05/15 18:24:11
Is there a name conflict between this and https://
dschuyler
2017/05/15 19:04:15
I believe this is okay since it's saying it "is a"
hcarmona
2017/05/15 19:06:07
Acknowledged.
| |
| 7 /* We keep our vars in sort order, though some vars must be defined prior to | 7 /* We keep our vars in sort order, though some vars must be defined prior to |
| 8 * others. The --settings-* vars are defined explicitly prior to the --paper-* | 8 * others. The --settings-* vars are defined explicitly prior to the --paper-* |
| 9 * and --iron-* vars. | 9 * and --iron-* vars. |
| 10 */ | 10 */ |
| 11 :root { | 11 :root { |
| 12 /* Some colors use non-MD colors. These custom colors are specified by | 12 /* Some colors use non-MD colors. These custom colors are specified by |
| 13 * UX design (bettes@). */ | 13 * UX design (bettes@). */ |
| 14 | 14 |
| 15 --settings-actionable: var(--cr-actionable); | 15 --settings-actionable: var(--cr-actionable); |
| 16 --settings-button-edge-spacing: 12px; | 16 --settings-button-edge-spacing: 12px; |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 | 83 |
| 84 --checkbox-margin-start: 2px; | 84 --checkbox-margin-start: 2px; |
| 85 --checkbox-size: 16px; | 85 --checkbox-size: 16px; |
| 86 --settings-control-spacing: var(--cr-control-spacing); | 86 --settings-control-spacing: var(--cr-control-spacing); |
| 87 --iron-icon-fill-color: var(--paper-grey-600); | 87 --iron-icon-fill-color: var(--paper-grey-600); |
| 88 --iron-icon-height: var(--cr-icon-size); | 88 --iron-icon-height: var(--cr-icon-size); |
| 89 --iron-icon-width: var(--cr-icon-size); | 89 --iron-icon-width: var(--cr-icon-size); |
| 90 --paper-checkbox-label-color: inherit; | 90 --paper-checkbox-label-color: inherit; |
| 91 --paper-dialog-color: inherit; | 91 --paper-dialog-color: inherit; |
| 92 | 92 |
| 93 --cr-icon-ripple-size: 40px; | |
| 94 --paper-icon-button: { | 93 --paper-icon-button: { |
| 95 /** | 94 /** |
| 96 * This makes the icons 20px (in combination with "--cr-icon-ripple-size: | 95 * This makes the icons 20px (in combination with --cr-icon-ripple-size), |
| 97 * 40px"), since paper-icon-button>iron-icon width and height are | 96 * since paper-icon-button>iron-icon width and height are hard-coded to |
| 98 * hardcoded to 100%. | 97 * 100%. |
| 99 */ | 98 */ |
| 100 padding: 10px; | 99 padding: var(--cr-icon-ripple-padding); |
| 101 }; | 100 }; |
| 102 --paper-input-container-focus-color: var(--google-blue-500); | 101 --paper-input-container-focus-color: var(--google-blue-500); |
| 103 --paper-input-container-input: { | 102 --paper-input-container-input: { |
| 104 color: inherit; | 103 color: inherit; |
| 105 font-size: inherit; | 104 font-size: inherit; |
| 106 font-weight: inherit; | 105 font-weight: inherit; |
| 107 line-height: 154%; | 106 line-height: 154%; |
| 108 vertical-align: baseline; | 107 vertical-align: baseline; |
| 109 }; | 108 }; |
| 110 --paper-input-container-label: { | 109 --paper-input-container-label: { |
| (...skipping 28 matching lines...) Expand all Loading... | |
| 139 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); | 138 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); |
| 140 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); | 139 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); |
| 141 | 140 |
| 142 --settings-input-underline: { | 141 --settings-input-underline: { |
| 143 border-color: var(--paper-grey-300); | 142 border-color: var(--paper-grey-300); |
| 144 }; | 143 }; |
| 145 | 144 |
| 146 --paper-input-container-underline: var(--settings-input-underline); | 145 --paper-input-container-underline: var(--settings-input-underline); |
| 147 } | 146 } |
| 148 </style> | 147 </style> |
| OLD | NEW |