Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> |
| 2 <link rel="import" href="settings_vars_css.html"> | 2 <link rel="import" href="settings_vars_css.html"> |
| 3 | 3 |
| 4 <!-- Common styles for Material Design settings. --> | 4 <!-- Common styles for Material Design settings. --> |
| 5 <dom-module id="settings-shared"> | 5 <dom-module id="settings-shared"> |
| 6 <template> | 6 <template> |
| 7 <style include="cr-shared-style"> | 7 <style include="cr-shared-style"> |
| 8 /* Use <h2> as the "sub-header" mentioned in the UX design docs. */ | 8 /* Use <h2> as the "sub-header" mentioned in the UX design docs. */ |
| 9 h2 { | 9 h2 { |
| 10 align-items: center; | 10 align-items: center; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 }; | 43 }; |
| 44 flex-shrink: 0; | 44 flex-shrink: 0; |
| 45 height: 36px; | 45 height: 36px; |
| 46 margin: 0; | 46 margin: 0; |
| 47 } | 47 } |
| 48 | 48 |
| 49 paper-button[toggles][active] { | 49 paper-button[toggles][active] { |
| 50 background-color: var(--paper-grey-300); | 50 background-color: var(--paper-grey-300); |
| 51 } | 51 } |
| 52 | 52 |
| 53 .settings-box paper-button { | 53 /* If a button is at the end of the row, shift it to overlap the end of |
| 54 * the row. */ | |
| 55 .settings-box paper-button:last-of-type { | |
|
hcarmona
2017/05/25 23:42:58
This will also affect a button that is by itself.
dschuyler
2017/05/26 00:07:03
If the button is entirely by itself or if it has s
| |
| 54 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1); | 56 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1); |
| 57 } | |
| 58 | |
| 59 /* Space out multiple buttons in the same row. */ | |
| 60 .settings-box paper-button + paper-button { | |
| 61 -webkit-margin-start: 16px; | |
| 62 } | |
| 63 | |
| 64 /* Adjust the margin between the separator and the first button. */ | |
| 65 .settings-box .separator + paper-button { | |
| 55 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1); | 66 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1); |
| 56 } | 67 } |
| 57 | 68 |
| 58 /* There are two settings button styles, .primary-button and normal | 69 /* There are two settings button styles, .primary-button and normal |
| 59 * buttons. The primary is the action button (e.g. "edit", "delete") | 70 * buttons. The primary is the action button (e.g. "edit", "delete") |
| 60 * while the normal (secondary-button) is often a "Cancel" button. */ | 71 * while the normal (secondary-button) is often a "Cancel" button. */ |
| 61 .primary-button { | 72 .primary-button { |
| 62 --paper-button: { | 73 --paper-button: { |
| 63 -webkit-padding-end: var(--settings-button-edge-spacing); | 74 -webkit-padding-end: var(--settings-button-edge-spacing); |
| 64 -webkit-padding-start: var(--settings-button-edge-spacing); | 75 -webkit-padding-start: var(--settings-button-edge-spacing); |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 383 transform: rotate(-135deg); | 394 transform: rotate(-135deg); |
| 384 } | 395 } |
| 385 | 396 |
| 386 .column-header { | 397 .column-header { |
| 387 color: var(--paper-grey-600); | 398 color: var(--paper-grey-600); |
| 388 font-weight: 500; | 399 font-weight: 500; |
| 389 } | 400 } |
| 390 </style> | 401 </style> |
| 391 </template> | 402 </template> |
| 392 </dom-module> | 403 </dom-module> |
| OLD | NEW |