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 | 3 |
| 4 <!-- Common css variables for Material Design settings. --> | 4 <!-- Common css variables for Material Design settings. --> |
| 5 <style is="custom-style"> | 5 <style is="custom-style"> |
| 6 /* We keep our vars in sort order, though some vars must be defined prior to | 6 /* We keep our vars in sort order, though some vars must be defined prior to |
| 7 * others. The --settings-* vars are defined explicitly prior to the --paper-* | 7 * others. The --settings-* vars are defined explicitly prior to the --paper-* |
| 8 * and --iron-* vars. | 8 * and --iron-* vars. |
| 9 */ | 9 */ |
| 10 :root { | 10 :root { |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 -webkit-padding-start: calc( | 25 -webkit-padding-start: calc( |
| 26 var(--settings-box-row-padding) + var(--settings-indent-width)); | 26 var(--settings-box-row-padding) + var(--settings-indent-width)); |
| 27 padding-bottom: 0; | 27 padding-bottom: 0; |
| 28 padding-top: 0; | 28 padding-top: 0; |
| 29 } | 29 } |
| 30 | 30 |
| 31 --settings-nav-grey: rgb(90, 90, 90); | 31 --settings-nav-grey: rgb(90, 90, 90); |
| 32 | 32 |
| 33 --settings-page-vertical-margin: 21px; | 33 --settings-page-vertical-margin: 21px; |
| 34 | 34 |
| 35 /* TODO (scottchen): re-implement with paddings instead; */ | |
| 35 /* These are used for row items such as radio buttons, check boxes, list | 36 /* These are used for row items such as radio buttons, check boxes, list |
| 36 * items etc. */ | 37 * items etc. */ |
| 37 --settings-row-min-height: 44px; | 38 --settings-row-min-height: 45px; |
| 38 --settings-row-two-line-min-height: 56px; | 39 --settings-row-two-line-min-height: 64px; |
| 39 | 40 |
| 41 /* TODO (scottchen): re-implement with paddings instead; */ | |
| 40 /* These are used for the settings-box containers, which may contain one or | 42 /* These are used for the settings-box containers, which may contain one or |
| 41 * more "row items". */ | 43 * more "row items". */ |
| 42 --settings-box-min-height: 48px; | 44 --settings-box-min-height: 45px; |
|
dschuyler
2017/02/07 21:22:41
I'm a bit concerned that changing from an even to
scottchen
2017/02/08 00:23:23
Just checked on Mac and Goobuntu, on both machines
| |
| 43 --settings-box-two-line-min-height: 64px; | 45 --settings-box-two-line-min-height: 64px; |
| 44 --settings-box-three-line-min-height: 84px; | 46 --settings-box-three-line-min-height: 84px; |
| 45 | 47 |
| 46 --settings-text-elide: { | 48 --settings-text-elide: { |
| 47 overflow: hidden; | 49 overflow: hidden; |
| 48 text-overflow: ellipsis; | 50 text-overflow: ellipsis; |
| 49 white-space: nowrap; | 51 white-space: nowrap; |
| 50 }; | 52 }; |
| 51 | 53 |
| 52 --settings-secondary: { | 54 --settings-secondary: { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 78 --settings-toggle-color: var(--google-blue-500); | 80 --settings-toggle-color: var(--google-blue-500); |
| 79 | 81 |
| 80 --checkbox-margin-start: 2px; | 82 --checkbox-margin-start: 2px; |
| 81 --checkbox-size: 16px; | 83 --checkbox-size: 16px; |
| 82 --checkbox-spacing: 18px; | 84 --checkbox-spacing: 18px; |
| 83 --iron-icon-fill-color: var(--paper-grey-600); | 85 --iron-icon-fill-color: var(--paper-grey-600); |
| 84 --iron-icon-height: var(--cr-icon-size); | 86 --iron-icon-height: var(--cr-icon-size); |
| 85 --iron-icon-width: var(--cr-icon-size); | 87 --iron-icon-width: var(--cr-icon-size); |
| 86 --paper-checkbox-label-color: inherit; | 88 --paper-checkbox-label-color: inherit; |
| 87 --paper-dialog-color: inherit; | 89 --paper-dialog-color: inherit; |
| 90 | |
| 91 --cr-icon-ripple-size: 40px; | |
| 88 --paper-icon-button: { | 92 --paper-icon-button: { |
| 89 height: var(--cr-icon-ripple-size); | 93 /** |
| 90 width: var(--cr-icon-ripple-size); | 94 * This makes the icons 20px (in combination with "--cr-icon-ripple-size: |
| 95 * 40px"), since paper-icon-button>iron-icon width and height are | |
| 96 * hardcoded to 100%. | |
| 97 */ | |
| 98 padding: 10px; | |
| 91 }; | 99 }; |
| 92 --paper-input-container-focus-color: var(--google-blue-500); | 100 --paper-input-container-focus-color: var(--google-blue-500); |
| 93 --paper-input-container-input: { | 101 --paper-input-container-input: { |
| 94 color: inherit; | 102 color: inherit; |
| 95 font-size: inherit; | 103 font-size: inherit; |
| 96 font-weight: inherit; | 104 font-weight: inherit; |
| 97 vertical-align: baseline; | 105 vertical-align: baseline; |
| 98 }; | 106 }; |
| 99 --paper-input-max-width: 264px; | 107 --paper-input-max-width: 264px; |
| 100 --paper-item: { | 108 --paper-item: { |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 117 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); | 125 --paper-toggle-button-unchecked-button: var(--settings-toggle-button-size); |
| 118 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); | 126 --paper-toggle-button-unchecked-ink: var(--settings-toggle-ink-size); |
| 119 | 127 |
| 120 --settings-input-underline: { | 128 --settings-input-underline: { |
| 121 border-color: var(--paper-grey-300); | 129 border-color: var(--paper-grey-300); |
| 122 } | 130 } |
| 123 | 131 |
| 124 --paper-input-container-underline: var(--settings-input-underline); | 132 --paper-input-container-underline: var(--settings-input-underline); |
| 125 } | 133 } |
| 126 </style> | 134 </style> |
| OLD | NEW |