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"> |
| 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 */ |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 padding-top: 0; | 30 padding-top: 0; |
| 31 } | 31 } |
| 32 | 32 |
| 33 --settings-nav-grey: rgb(90, 90, 90); | 33 --settings-nav-grey: rgb(90, 90, 90); |
| 34 | 34 |
| 35 --settings-page-vertical-margin: 21px; | 35 --settings-page-vertical-margin: 21px; |
| 36 | 36 |
| 37 /* TODO (scottchen): re-implement with paddings instead; */ | 37 /* TODO (scottchen): re-implement with paddings instead; */ |
| 38 /* These are used for row items such as radio buttons, check boxes, list | 38 /* These are used for row items such as radio buttons, check boxes, list |
| 39 * items etc. */ | 39 * items etc. */ |
| 40 --settings-row-min-height: 45px; | 40 --settings-row-min-height: 48px; |
| 41 --settings-row-two-line-min-height: 64px; | 41 --settings-row-two-line-min-height: 64px; |
| 42 | 42 |
| 43 /* TODO (scottchen): re-implement with paddings instead; */ | 43 /* TODO (scottchen): re-implement with paddings instead; */ |
| 44 /* These are used for the settings-box containers, which may contain one or | 44 /* These are used for the settings-box containers, which may contain one or |
| 45 * more "row items". */ | 45 * more "row items". */ |
| 46 --settings-box-min-height: 45px; | 46 --settings-box-min-height: 48px; |
|
dpapad
2017/06/27 01:19:32
Nit: Does the following work?
--settings-box-min-
dschuyler
2017/06/27 21:47:04
I'm going to look into combining lines 37 to 48 in
| |
| 47 --settings-box-two-line-min-height: 64px; | 47 --settings-box-two-line-min-height: 64px; |
| 48 --settings-box-three-line-min-height: 84px; | 48 --settings-box-three-line-min-height: 84px; |
| 49 | 49 |
| 50 --settings-text-elide: { | 50 --settings-text-elide: { |
| 51 overflow: hidden; | 51 overflow: hidden; |
| 52 text-overflow: ellipsis; | 52 text-overflow: ellipsis; |
| 53 white-space: nowrap; | 53 white-space: nowrap; |
| 54 }; | 54 }; |
| 55 | 55 |
| 56 --settings-secondary: { | 56 --settings-secondary: { |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 143 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); | 143 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); |
| 144 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); | 144 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); |
| 145 | 145 |
| 146 --settings-input-underline: { | 146 --settings-input-underline: { |
| 147 border-color: var(--paper-grey-300); | 147 border-color: var(--paper-grey-300); |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 --paper-input-container-underline: var(--settings-input-underline); | 150 --paper-input-container-underline: var(--settings-input-underline); |
| 151 } | 151 } |
| 152 </style> | 152 </style> |
| OLD | NEW |