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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 | 95 |
| 96 span ~ a { | 96 span ~ a { |
| 97 -webkit-margin-start: 4px; | 97 -webkit-margin-start: 4px; |
| 98 } | 98 } |
| 99 | 99 |
| 100 [is='action-link'], | 100 [is='action-link'], |
| 101 [is='action-link']:active, | 101 [is='action-link']:active, |
| 102 [is='action-link']:hover, | 102 [is='action-link']:hover, |
| 103 [is='action-link']:visited, | 103 [is='action-link']:visited, |
| 104 .primary-button, | 104 .primary-button, |
| 105 .tertiary-button { | 105 .tertiary-button, |
| 106 a[href] { | |
| 106 color: var(--google-blue-700); | 107 color: var(--google-blue-700); |
| 107 } | 108 } |
| 108 | 109 |
| 110 a[href] { | |
| 111 text-decoration: none; | |
| 112 } | |
| 113 | |
| 109 .primary-button, | 114 .primary-button, |
| 110 .tertiary-button { | 115 .tertiary-button { |
| 111 --paper-button-flat-keyboard-focus: { | 116 --paper-button-flat-keyboard-focus: { |
| 112 background: rgba(51, 103, 214, .12); /* --google-blue-700 */ | 117 background: rgba(51, 103, 214, .12); /* --google-blue-700 */ |
| 113 }; | 118 }; |
| 114 } | 119 } |
| 115 | 120 |
|
Dan Beam
2016/09/28 20:28:55
can we combine the text-decoration rule with this
dmazzoni
2016/09/28 22:11:43
Sure.
I combined it slightly differently so as no
Dan Beam
2016/09/28 22:15:08
well, that's fine, but it's equivalent to
a[href]
dmazzoni
2016/09/28 22:29:43
Oh, of course. Fixed.
Your suggestion would have
| |
| 116 [is='action-link']:hover { | 121 [is='action-link']:hover { |
| 117 text-decoration: none; | 122 text-decoration: none; |
| 118 } | 123 } |
| 119 | 124 |
| 120 /* There are three main button styles, .primary-button, .secondary-button, | 125 /* There are three main button styles, .primary-button, .secondary-button, |
| 121 * and .tertiary-button. The primary is the action button (e.g. "edit", | 126 * and .tertiary-button. The primary is the action button (e.g. "edit", |
| 122 * "delete") while the secondary is often a "Cancel" button. A tertiary | 127 * "delete") while the secondary is often a "Cancel" button. A tertiary |
| 123 * button may be used to get more information or similar, that we expect | 128 * button may be used to get more information or similar, that we expect |
| 124 * most users will not need. */ | 129 * most users will not need. */ |
| 125 .primary-button { | 130 .primary-button { |
| (...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 /* Turns the arrow direction downwards, when the bubble is placed above | 389 /* Turns the arrow direction downwards, when the bubble is placed above |
| 385 * the anchor element */ | 390 * the anchor element */ |
| 386 .search-bubble-innards.above::after { | 391 .search-bubble-innards.above::after { |
| 387 -webkit-transform: rotate(-135deg); | 392 -webkit-transform: rotate(-135deg); |
| 388 bottom: -5px; | 393 bottom: -5px; |
| 389 top: auto; | 394 top: auto; |
| 390 } | 395 } |
| 391 </style> | 396 </style> |
| 392 </template> | 397 </template> |
| 393 </dom-module> | 398 </dom-module> |
| OLD | NEW |