Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* Copyright 2016 The Chromium Authors. All rights reserved. | 1 /* Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 * Use of this source code is governed by a BSD-style license that can be | 2 * Use of this source code is governed by a BSD-style license that can be |
| 3 * found in the LICENSE file. */ | 3 * found in the LICENSE file. */ |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview | 6 * @fileoverview |
| 7 * Common styles for Material Design settings. | 7 * Common styles for Material Design settings. |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 <dom-module id="settings-shared"> | 10 <dom-module id="settings-shared"> |
| 11 <template> | 11 <template> |
| 12 <style> | 12 <style> |
| 13 :root { | 13 :root { |
| 14 --settings-secondary: { | 14 --settings-secondary: { |
| 15 color: #969696; | 15 color: var(--paper-grey-500); |
| 16 font-weight: 400; | 16 font-weight: 400; |
| 17 } | 17 } |
| 18 } | 18 } |
| 19 | 19 |
| 20 h2 { | 20 h2 { |
| 21 @apply(--layout-center); | 21 @apply(--layout-center); |
| 22 color: var(--paper-grey-500); | 22 color: var(--paper-grey-500); |
| 23 display: flex; | 23 display: flex; |
| 24 font-size: 100%; | 24 font-size: 100%; |
| 25 font-weight: 500; | 25 font-weight: 500; |
| 26 margin: 0; | 26 margin: 0; |
| 27 min-height: 40px; | 27 min-height: 40px; |
| 28 } | 28 } |
| 29 | 29 |
| 30 iron-icon { | 30 iron-icon { |
| 31 color: #969696; | 31 color: var(--paper-grey-300); |
| 32 } | 32 } |
| 33 | 33 |
| 34 iron-icon[icon=done] { | 34 iron-icon[icon=done] { |
| 35 color: rgb(0, 128, 0); | 35 color: var(--google-green-500); |
| 36 } | 36 } |
| 37 | 37 |
| 38 paper-button { | 38 paper-button { |
| 39 margin: 0; | 39 margin: 0; |
| 40 min-width: auto; | 40 min-width: auto; |
| 41 } | 41 } |
| 42 | 42 |
| 43 paper-button[toggles][active] { | 43 paper-button[toggles][active] { |
| 44 background-color: LightGray; | 44 background-color: var(--paper-grey-300); |
| 45 } | 45 } |
| 46 | 46 |
| 47 span ~ a { | 47 span ~ a { |
| 48 -webkit-margin-start: 4px; | 48 -webkit-margin-start: 4px; |
| 49 } | 49 } |
| 50 | 50 |
| 51 [is='action-link'], | 51 [is='action-link'], |
| 52 [is='action-link']:active, | 52 [is='action-link']:active, |
| 53 [is='action-link']:hover, | 53 [is='action-link']:hover, |
| 54 [is='action-link']:visited, | 54 [is='action-link']:visited, |
| 55 paper-button.primary-button { | 55 paper-button.primary-button { |
|
Dan Beam
2016/02/25 00:08:17
could you just add to this rule, actually
paper-b
dschuyler
2016/02/25 00:19:07
Hmm, the tertiary-button has the color inside
a --
Dan Beam
2016/02/25 00:44:47
it is different: it's slower ;)
https://coderevie
dschuyler
2016/02/25 21:32:25
Done.
| |
| 56 /* TODO(dbeam): change all other colors in this file into --google or | 56 /* TODO(dbeam): change all other colors in this file into --google or |
| 57 * --paper where applicable. */ | 57 * --paper where applicable. */ |
|
dschuyler
2016/02/25 00:19:07
I'll do a followup to remove this comment as well.
Dan Beam
2016/02/25 00:44:47
Acknowledged.
| |
| 58 color: var(--google-blue-700); | 58 color: var(--google-blue-700); |
| 59 } | 59 } |
| 60 | 60 |
| 61 [is='action-link']:hover { | 61 [is='action-link']:hover { |
| 62 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we | 62 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we |
| 63 * shouldn't be showing much :hover stuff on Polymer pages. */ | 63 * shouldn't be showing much :hover stuff on Polymer pages. */ |
| 64 text-decoration: none; | 64 text-decoration: none; |
| 65 } | 65 } |
| 66 | 66 |
| 67 paper-button.primary-button { | 67 paper-button.primary-button { |
| 68 --paper-button: { | 68 --paper-button: { |
| 69 font-weight: 500; | 69 font-weight: 500; |
| 70 text-align: start; | 70 text-align: start; |
| 71 }; | 71 }; |
| 72 margin: 0 -0.57em; /* Offsets default paper-button padding. */ | 72 margin: 0 -0.57em; /* Offsets default paper-button padding. */ |
| 73 } | 73 } |
| 74 | 74 |
| 75 paper-button.secondary-button { | 75 paper-button.secondary-button { |
| 76 --paper-button: { | 76 --paper-button: { |
| 77 color: #5a5a5a; | 77 color: var(--paper-grey-700); |
| 78 text-decoration: none; | 78 text-decoration: none; |
| 79 font-weight: 500; | 79 font-weight: 500; |
| 80 }; | 80 }; |
| 81 } | 81 } |
| 82 | 82 |
| 83 paper-button.tertiary-button { | 83 paper-button.tertiary-button { |
| 84 --paper-button: { | 84 --paper-button: { |
| 85 color: rgb(51, 103, 214); | 85 color: var(--google-blue-700); |
|
Dan Beam
2016/02/25 00:08:17
^ and remove this
dschuyler
2016/02/25 00:19:07
Acknowledged.
| |
| 86 font-weight: 400; | 86 font-weight: 400; |
| 87 text-decoration: none; | 87 text-decoration: none; |
| 88 }; | 88 }; |
| 89 } | 89 } |
| 90 | 90 |
| 91 paper-radio-button { | 91 paper-radio-button { |
| 92 --paper-radio-button-checked-color: var(--google-blue-500); | 92 --paper-radio-button-checked-color: var(--google-blue-500); |
| 93 --paper-radio-button-label-spacing: 18px; | 93 --paper-radio-button-label-spacing: 18px; |
| 94 --paper-radio-button-unchecked-color: #969696; | 94 --paper-radio-button-unchecked-color: var(--paper-grey-500); |
| 95 -webkit-margin-start: 2px; | 95 -webkit-margin-start: 2px; |
| 96 } | 96 } |
| 97 | 97 |
| 98 .text-elide { | 98 .text-elide { |
| 99 overflow: hidden; | 99 overflow: hidden; |
| 100 text-overflow: ellipsis; | 100 text-overflow: ellipsis; |
| 101 white-space: nowrap; | 101 white-space: nowrap; |
| 102 } | 102 } |
| 103 | 103 |
| 104 .button-row { | 104 .button-row { |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 130 .list-item { | 130 .list-item { |
| 131 @apply(--layout-center); | 131 @apply(--layout-center); |
| 132 display: flex; | 132 display: flex; |
| 133 min-height: 40px; | 133 min-height: 40px; |
| 134 padding: 0; | 134 padding: 0; |
| 135 } | 135 } |
| 136 | 136 |
| 137 /* This button has no ink ripple */ | 137 /* This button has no ink ripple */ |
| 138 .list-item.list-button { | 138 .list-item.list-button { |
| 139 @apply(--layout-center); | 139 @apply(--layout-center); |
| 140 color: rgb(66, 133, 244); | 140 color: var(--google-blue-500); |
| 141 font-weight: 500; | 141 font-weight: 500; |
| 142 text-decoration: none; | 142 text-decoration: none; |
| 143 } | 143 } |
| 144 | 144 |
| 145 .list-item iron-icon { | 145 .list-item iron-icon { |
| 146 @apply(--layout-center); | 146 @apply(--layout-center); |
| 147 height: 20px; | 147 height: 20px; |
| 148 width: 20px; | 148 width: 20px; |
| 149 } | 149 } |
| 150 | 150 |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 161 white-space: nowrap; | 161 white-space: nowrap; |
| 162 } | 162 } |
| 163 | 163 |
| 164 .list-item > paper-icon-item { | 164 .list-item > paper-icon-item { |
| 165 padding: 0; | 165 padding: 0; |
| 166 } | 166 } |
| 167 | 167 |
| 168 /* This button has no ink ripple. */ | 168 /* This button has no ink ripple. */ |
| 169 .list-item.list-button { | 169 .list-item.list-button { |
| 170 @apply(--layout-center); | 170 @apply(--layout-center); |
| 171 color: rgb(66, 133, 244); | 171 color: var(--google-blue-500); |
| 172 font-weight: 500; | 172 font-weight: 500; |
| 173 } | 173 } |
|
Dan Beam
2016/02/25 00:08:17
is this a copy... did I do this from a merge confl
dschuyler
2016/02/25 00:19:07
Done.
| |
| 174 | 174 |
| 175 .settings-card { | 175 .settings-card { |
| 176 padding: 8px 0; | 176 padding: 8px 0; |
| 177 } | 177 } |
| 178 | 178 |
| 179 .settings-box { | 179 .settings-box { |
| 180 @apply(--layout-center); | 180 @apply(--layout-center); |
| 181 border-top: 1px solid var(--paper-grey-300); | 181 border-top: 1px solid var(--paper-grey-300); |
| 182 display: flex; | 182 display: flex; |
| 183 min-height: 40px; | 183 min-height: 40px; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 240 .vertical-list > div:first-of-type { | 240 .vertical-list > div:first-of-type { |
| 241 border-top: none; | 241 border-top: none; |
| 242 } | 242 } |
| 243 | 243 |
| 244 .vertical-list > div { | 244 .vertical-list > div { |
| 245 border-top: 1px solid var(--paper-grey-300); | 245 border-top: 1px solid var(--paper-grey-300); |
| 246 } | 246 } |
| 247 </style> | 247 </style> |
| 248 </template> | 248 </template> |
| 249 </dom-module> | 249 </dom-module> |
| OLD | NEW |