Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <!-- Common styles for Material Design settings. --> | 1 <!-- Common styles for Material Design settings. --> |
| 2 <dom-module id="settings-shared"> | 2 <dom-module id="settings-shared"> |
| 3 <template> | 3 <template> |
| 4 <style> | 4 <style> |
| 5 :root { | 5 :root { |
| 6 --checkbox-margin-start: 2px; | 6 --checkbox-margin-start: 2px; |
| 7 --checkbox-size: 16px; | 7 --checkbox-size: 16px; |
| 8 --checkbox-spacing: 18px; | 8 --checkbox-spacing: 18px; |
| 9 --iron-icon-fill-color: var(--paper-grey-600); | 9 --iron-icon-fill-color: var(--paper-grey-600); |
| 10 --iron-icon-height: 20px; | 10 --iron-icon-height: 20px; |
| 11 --iron-icon-spacing: 16px; | |
| 11 --iron-icon-width: 20px; | 12 --iron-icon-width: 20px; |
| 12 --paper-icon-button: { | 13 --paper-icon-button: { |
| 13 width: 36px; | 14 width: 36px; |
| 14 height: 36px; | 15 height: 36px; |
| 15 }; | 16 }; |
| 16 --paper-input-max-width: 264px; | 17 --paper-input-max-width: 264px; |
| 18 --paper-item: { | |
| 19 font-size: inherit; | |
|
Dan Beam
2016/04/12 04:28:14
probably fixes a lot of issues for us...
| |
| 20 }; | |
| 21 | |
| 17 --settings-background-color: var(--paper-blue-grey-50); | 22 --settings-background-color: var(--paper-blue-grey-50); |
| 18 --settings-secondary: { | 23 --settings-secondary: { |
| 19 color: var(--paper-grey-600); | 24 color: var(--paper-grey-600); |
| 20 font-weight: 400; | 25 font-weight: 400; |
| 21 }; | 26 }; |
| 22 --settings-error-color: var(--paper-red-700); | 27 --settings-error-color: var(--paper-red-700); |
| 23 --settings-hover-color: var(--google-grey-300); | 28 --settings-hover-color: var(--google-grey-300); |
| 24 | 29 |
| 25 /* Some colors use non-MD colors. These custom colors are specified by | 30 /* Some colors use non-MD colors. These custom colors are specified by |
| 26 * UX design (bettes@). */ | 31 * UX design (bettes@). */ |
| 27 --settings-nav-grey: rgb(90, 90, 90); | 32 --settings-nav-grey: rgb(90, 90, 90); |
| 33 | |
| 34 --settings-row-min-height: 40px; | |
| 35 | |
| 28 --settings-title-bar-background-color: rgb(52, 73, 94); | 36 --settings-title-bar-background-color: rgb(52, 73, 94); |
| 29 --settings-title-bar-color: rgb(255, 255, 255); | 37 --settings-title-bar-color: rgb(255, 255, 255); |
| 30 } | 38 } |
| 31 | 39 |
| 32 h2 { | 40 h2 { |
| 33 @apply(--layout-center); | 41 @apply(--layout-center); |
| 34 color: var(--paper-grey-500); | 42 color: var(--paper-grey-500); |
| 35 display: flex; | 43 display: flex; |
| 36 font-size: 100%; | 44 font-size: 100%; |
| 37 font-weight: 500; | 45 font-weight: 500; |
| 38 margin: 0; | 46 margin: 0; |
| 39 min-height: 40px; | 47 min-height: var(--settings-row-min-height); |
| 40 } | 48 } |
| 41 | 49 |
| 42 iron-icon[icon=check], | 50 iron-icon[icon=check], |
| 43 iron-icon[icon=done] { | 51 iron-icon[icon=done] { |
| 44 --iron-icon-fill-color: var(--google-green-500); | 52 --iron-icon-fill-color: var(--google-green-500); |
| 45 } | 53 } |
| 46 | 54 |
| 47 paper-button { | 55 paper-button { |
| 48 margin: 0; | 56 margin: 0; |
| 49 min-width: auto; | 57 min-width: auto; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 137 } | 145 } |
| 138 | 146 |
| 139 .list-frame .secondary, | 147 .list-frame .secondary, |
| 140 .list-item .secondary { | 148 .list-item .secondary { |
| 141 @apply(--settings-secondary); | 149 @apply(--settings-secondary); |
| 142 } | 150 } |
| 143 | 151 |
| 144 .list-item { | 152 .list-item { |
| 145 @apply(--layout-center); | 153 @apply(--layout-center); |
| 146 display: flex; | 154 display: flex; |
| 147 min-height: 40px; | 155 min-height: var(--settings-row-min-height); |
| 148 padding: 0; | 156 padding: 0; |
| 149 } | 157 } |
| 150 | 158 |
| 151 .list-item.underbar { | 159 .list-item.underbar { |
| 152 border-bottom: 1px solid var(--paper-grey-300); | 160 border-bottom: 1px solid var(--paper-grey-300); |
| 153 } | 161 } |
| 154 | 162 |
| 155 .list-item.selected { | 163 .list-item.selected { |
| 156 font-weight: 500; | 164 font-weight: 500; |
| 157 } | 165 } |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 181 .list-item.list-button { | 189 .list-item.list-button { |
| 182 @apply(--layout-center); | 190 @apply(--layout-center); |
| 183 color: rgb(66, 133, 244); | 191 color: rgb(66, 133, 244); |
| 184 font-weight: 500; | 192 font-weight: 500; |
| 185 } | 193 } |
| 186 | 194 |
| 187 .settings-box { | 195 .settings-box { |
| 188 @apply(--layout-center); | 196 @apply(--layout-center); |
| 189 border-top: 1px solid var(--paper-grey-300); | 197 border-top: 1px solid var(--paper-grey-300); |
| 190 display: flex; | 198 display: flex; |
| 191 min-height: 40px; | 199 min-height: var(--settings-row-min-height); |
| 192 padding: 0 20px; | 200 padding: 0 20px; |
| 193 } | 201 } |
| 194 | 202 |
| 195 .settings-box.first { | 203 .settings-box.first { |
| 196 border-top: none; | 204 border-top: none; |
| 197 } | 205 } |
| 198 | 206 |
| 199 .settings-box.block { | 207 .settings-box.block { |
| 200 display: block; | 208 display: block; |
| 201 } | 209 } |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 232 .settings-box .secondary-action { | 240 .settings-box .secondary-action { |
| 233 -webkit-border-start: 1px solid var(--paper-grey-300); | 241 -webkit-border-start: 1px solid var(--paper-grey-300); |
| 234 -webkit-padding-start: 20px; | 242 -webkit-padding-start: 20px; |
| 235 } | 243 } |
| 236 | 244 |
| 237 .settings-box paper-item iron-icon { | 245 .settings-box paper-item iron-icon { |
| 238 /* Same padding as paper-icon-button. */ | 246 /* Same padding as paper-icon-button. */ |
| 239 padding: 8px; | 247 padding: 8px; |
| 240 } | 248 } |
| 241 | 249 |
| 242 .vertical-list > div:first-of-type { | 250 .vertical-list > *:not(:first-of-type) { |
|
Dan Beam
2016/04/12 04:28:14
div was too restrictive
| |
| 243 border-top: none; | |
| 244 } | |
| 245 | |
| 246 .vertical-list > div { | |
| 247 border-top: 1px solid var(--paper-grey-300); | 251 border-top: 1px solid var(--paper-grey-300); |
| 248 } | 252 } |
| 249 | 253 |
| 250 .settings-checkbox-spacer { | 254 .settings-checkbox-spacer { |
| 251 -webkit-margin-start: calc( | 255 -webkit-margin-start: calc( |
| 252 var(--checkbox-margin-start) + | 256 var(--checkbox-margin-start) + |
| 253 var(--checkbox-size) + | 257 var(--checkbox-size) + |
| 254 var(--checkbox-spacing)); | 258 var(--checkbox-spacing)); |
| 255 } | 259 } |
| 256 </style> | 260 </style> |
| 257 </template> | 261 </template> |
| 258 </dom-module> | 262 </dom-module> |
| OLD | NEW |