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 button[is='paper-icon-button-light'] { | 8 button[is='paper-icon-button-light'] { |
9 -webkit-margin-end: -8px; /* Allow ripple to overlap the end. */ | 9 -webkit-margin-end: -8px; /* Allow ripple to overlap the end. */ |
10 -webkit-margin-start: 16px; | 10 -webkit-margin-start: 16px; |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
156 --paper-button: { | 156 --paper-button: { |
157 font-weight: 500; | 157 font-weight: 500; |
158 text-align: start; | 158 text-align: start; |
159 }; | 159 }; |
160 } | 160 } |
161 | 161 |
162 /* See notes in .primary-button. */ | 162 /* See notes in .primary-button. */ |
163 .secondary-button { | 163 .secondary-button { |
164 --paper-button: { | 164 --paper-button: { |
165 color: var(--paper-grey-600); | 165 color: var(--paper-grey-600); |
166 font-weight: 500; | |
167 min-width: 1em; /* A tighter fit than 5.14em for short buttons. */ | |
dschuyler
2016/10/19 18:56:42
5.14em is the Polymer default value.
| |
166 text-decoration: none; | 168 text-decoration: none; |
167 font-weight: 500; | |
168 }; | 169 }; |
169 --paper-button-flat-keyboard-focus: { | 170 --paper-button-flat-keyboard-focus: { |
170 background: rgba(0, 0, 0, .12); | 171 background: rgba(0, 0, 0, .12); |
171 }; | 172 }; |
172 } | 173 } |
173 | 174 |
174 /* See notes in .primary-button. */ | 175 /* See notes in .primary-button. */ |
175 .tertiary-button { | 176 .tertiary-button { |
176 --paper-button: { | 177 --paper-button: { |
177 font-weight: 400; | 178 font-weight: 400; |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
222 | 223 |
223 /* A list-frame is an outer container for list-items. It is intended to be | 224 /* A list-frame is an outer container for list-items. It is intended to be |
224 * outside of a settings-box. A list-frame is likely to follow a | 225 * outside of a settings-box. A list-frame is likely to follow a |
225 * settings box. */ | 226 * settings box. */ |
226 .list-frame { | 227 .list-frame { |
227 @apply(--settings-list-frame-padding); | 228 @apply(--settings-list-frame-padding); |
228 align-items: center; | 229 align-items: center; |
229 display: block; | 230 display: block; |
230 } | 231 } |
231 | 232 |
232 .list-frame .secondary, | |
233 .list-item .secondary { | |
234 @apply(--settings-secondary); | |
235 } | |
236 | |
dschuyler
2016/10/19 18:56:42
These have become redundant.
| |
237 /* A list-item is intended to be contained within a list-frame. The list | 233 /* A list-item is intended to be contained within a list-frame. The list |
238 * frame will setup the initial start margin. */ | 234 * frame will setup the initial start margin. */ |
239 .list-item { | 235 .list-item { |
240 align-items: center; | 236 align-items: center; |
241 display: flex; | 237 display: flex; |
242 min-height: var(--settings-row-min-height); | 238 min-height: var(--settings-row-min-height); |
243 padding: 0; | 239 padding: 0; |
244 } | 240 } |
245 | 241 |
246 /* A thin separator line under a list item. */ | 242 /* A thin separator line under a list item. */ |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
317 /* A settings-box with no height other than the separator line. */ | 313 /* A settings-box with no height other than the separator line. */ |
318 .settings-box.line-only { | 314 .settings-box.line-only { |
319 min-height: 0; | 315 min-height: 0; |
320 } | 316 } |
321 | 317 |
322 /* The lower line of text in a two-line row. */ | 318 /* The lower line of text in a two-line row. */ |
323 .secondary { | 319 .secondary { |
324 @apply(--settings-secondary); | 320 @apply(--settings-secondary); |
325 } | 321 } |
326 | 322 |
323 /* TODO(dschuyler): add :blank when it's supported by Chrome. */ | |
dschuyler
2016/10/19 18:56:42
The :blank thing looks awesome because it will not
| |
324 .secondary:empty { | |
325 margin: 0; | |
326 } | |
327 | |
327 /* The middle part (horizontally) of a row. */ | 328 /* The middle part (horizontally) of a row. */ |
328 .settings-box .middle { | 329 .settings-box .middle { |
329 -webkit-padding-start: 16px; | 330 -webkit-padding-start: 16px; |
330 align-items: center; | 331 align-items: center; |
331 flex: auto; | 332 flex: auto; |
332 } | 333 } |
333 | 334 |
334 .settings-box .middle.two-line, | 335 .settings-box .middle.two-line, |
335 .settings-box .start.two-line { | 336 .settings-box .start.two-line { |
336 display: flex; | 337 display: flex; |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
421 /* Turns the arrow direction downwards, when the bubble is placed above | 422 /* Turns the arrow direction downwards, when the bubble is placed above |
422 * the anchor element */ | 423 * the anchor element */ |
423 .search-bubble-innards.above::after { | 424 .search-bubble-innards.above::after { |
424 -webkit-transform: rotate(-135deg); | 425 -webkit-transform: rotate(-135deg); |
425 bottom: -5px; | 426 bottom: -5px; |
426 top: auto; | 427 top: auto; |
427 } | 428 } |
428 </style> | 429 </style> |
429 </template> | 430 </template> |
430 </dom-module> | 431 </dom-module> |
OLD | NEW |