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 :host-context([dir=rtl]) button[is='paper-icon-button-light'] { | 8 :host-context([dir=rtl]) button[is='paper-icon-button-light'] { |
| 9 transform: scaleX(-1); /* Flip on the X axis (aka mirror). */ | 9 transform: scaleX(-1); /* Flip on the X axis (aka mirror). */ |
| 10 } | 10 } |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 313 align-items: center; | 313 align-items: center; |
| 314 flex: auto; | 314 flex: auto; |
| 315 } | 315 } |
| 316 | 316 |
| 317 .no-outline, | 317 .no-outline, |
| 318 [scrollable] .no-outline { | 318 [scrollable] .no-outline { |
| 319 background: none; | 319 background: none; |
| 320 outline: none; | 320 outline: none; |
| 321 } | 321 } |
| 322 | 322 |
| 323 /* Prevent icon-button's ripples from fighting with potential scrollbars. | |
| 324 * Also apply to all iron-lists to align the buttons across them all.*/ | |
| 325 [scrollable], | |
| 326 .scroll-container, | |
| 327 iron-list { | |
| 328 --cr-paper-icon-button-margin: { | |
| 329 -webkit-margin-start: 0; | |
| 330 -webkit-margin-end: 0; | |
| 331 }; | |
| 332 } | |
| 333 | |
| 323 /* Helper for a list frame to automatically avoid the separator line. */ | 334 /* Helper for a list frame to automatically avoid the separator line. */ |
| 324 .vertical-list > *:not(:first-of-type) { | 335 .vertical-list > *:not(:first-of-type) { |
| 325 border-top: var(--settings-separator-line); | 336 border-top: var(--settings-separator-line); |
| 326 } | 337 } |
| 327 | 338 |
| 328 /* The separator a vertical line like a horizontal rule <hr> tag, but goes | 339 /* The separator a vertical line like a horizontal rule <hr> tag, but goes |
| 329 * the other way. An example is near the |sign out| button on the People | 340 * the other way. An example is near the |sign out| button on the People |
| 330 * settings. */ | 341 * settings. */ |
| 331 :-webkit-any(.settings-box, .list-item) .separator { | 342 :-webkit-any(.settings-box, .list-item) .separator { |
| 332 -webkit-border-start: var(--settings-separator-line); | 343 -webkit-border-start: var(--settings-separator-line); |
| 333 -webkit-margin-end: var(--settings-box-row-padding); | 344 -webkit-margin-end: var(--settings-box-row-padding); |
| 334 -webkit-margin-start: var(--settings-box-row-padding); | 345 -webkit-margin-start: var(--settings-box-row-padding); |
| 335 flex-shrink: 0; | 346 flex-shrink: 0; |
| 336 --settings-separator-gaps: 9px; | 347 --settings-separator-gaps: 9px; |
| 337 height: calc(var(--settings-row-min-height) - | 348 height: calc(var(--settings-row-min-height) - |
| 338 var(--settings-separator-gaps)); | 349 var(--settings-separator-gaps)); |
| 339 } | 350 } |
| 340 | 351 |
| 341 :-webkit-any(.settings-box, .list-item).two-line .separator { | 352 :-webkit-any(.settings-box, .list-item).two-line .separator { |
| 342 height: calc(var(--settings-row-two-line-min-height) - | 353 height: calc(var(--settings-row-two-line-min-height) - |
| 343 2 * var(--settings-separator-gaps)); | 354 2 * var(--settings-separator-gaps)); |
| 344 } | 355 } |
| 345 | 356 |
| 357 | |
| 358 /* Avoid too much margin from both .separator and the button */ | |
| 359 .separator + button[is='paper-icon-button-light'] { | |
| 360 --cr-paper-icon-button-margin: { | |
| 361 --webkit-margin-start: 0; | |
|
Dan Beam
2017/05/23 16:36:22
i don't think this is working because this acciden
scottchen
2017/05/27 00:18:03
Done.
| |
| 362 }; | |
| 363 } | |
| 364 | |
| 346 .settings-checkbox-spacer { | 365 .settings-checkbox-spacer { |
| 347 -webkit-margin-start: calc( | 366 -webkit-margin-start: calc( |
| 348 var(--checkbox-margin-start) + | 367 var(--checkbox-margin-start) + |
| 349 var(--checkbox-size) + | 368 var(--checkbox-size) + |
| 350 var(--settings-control-spacing)); | 369 var(--settings-control-spacing)); |
| 351 } | 370 } |
| 352 | 371 |
| 353 .favicon-image { | 372 .favicon-image { |
| 354 background-repeat: no-repeat; | 373 background-repeat: no-repeat; |
| 355 background-size: contain; | 374 background-size: contain; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 392 transform: rotate(-135deg); | 411 transform: rotate(-135deg); |
| 393 } | 412 } |
| 394 | 413 |
| 395 .column-header { | 414 .column-header { |
| 396 color: var(--paper-grey-600); | 415 color: var(--paper-grey-600); |
| 397 font-weight: 500; | 416 font-weight: 500; |
| 398 } | 417 } |
| 399 </style> | 418 </style> |
| 400 </template> | 419 </template> |
| 401 </dom-module> | 420 </dom-module> |
| OLD | NEW |