Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(339)

Side by Side Diff: chrome/browser/resources/settings/settings_shared_css.html

Issue 2848973003: MD Settings: convert paper-icon-button to paper-icon-button-light. (Closed)
Patch Set: move unrelated fix to another CL Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_icons_css.html">
2 <link rel="import" href="settings_vars_css.html"> 3 <link rel="import" href="settings_vars_css.html">
3 4
4 <!-- Common styles for Material Design settings. --> 5 <!-- Common styles for Material Design settings. -->
5 <dom-module id="settings-shared"> 6 <dom-module id="settings-shared">
6 <template> 7 <template>
7 <style include="cr-shared-style"> 8 <style include="settings-icons cr-shared-style">
8 /* Use <h2> as the "sub-header" mentioned in the UX design docs. */ 9 /* Use <h2> as the "sub-header" mentioned in the UX design docs. */
9 h2 { 10 h2 {
10 align-items: center; 11 align-items: center;
11 align-self: flex-start; 12 align-self: flex-start;
12 color: var(--paper-grey-600); 13 color: var(--paper-grey-600);
13 display: flex; 14 display: flex;
14 font-size: inherit; 15 font-size: inherit;
15 font-weight: 500; 16 font-weight: 500;
16 margin: 0; 17 margin: 0;
17 padding-bottom: 12px; 18 padding-bottom: 12px;
18 padding-top: 24px; 19 padding-top: 24px;
19 } 20 }
20 21
21 iron-icon { 22 iron-icon {
22 flex-shrink: 0; /* Prevent distortion of icons in cramped UI. */ 23 flex-shrink: 0; /* Prevent distortion of icons in cramped UI. */
23 } 24 }
24 25
25 iron-icon[icon='cr:check'], 26 iron-icon[icon='cr:check'],
26 iron-icon[icon='settings:done'] { 27 iron-icon[icon='settings:done'] {
27 --iron-icon-fill-color: var(--google-green-500); 28 --iron-icon-fill-color: var(--google-green-500);
28 } 29 }
29 30
30 paper-icon-button { 31 .separator + button[is='paper-icon-button-light'] {
31 -webkit-margin-end: var(--cr-icon-ripple-margin); 32 -webkit-margin-start: var(--cr-icon-ripple-margin);
32 -webkit-margin-start: 16px;
33 color: var(--paper-grey-600);
34 flex-shrink: 0;
35 }
36
37 .separator + button[is='paper-icon-button-light'],
38 .separator + paper-icon-button {
39 -webkit-margin-start: var(--cr-icon-ripple-margin));
40 }
41
42 .list-item paper-icon-button {
43 /* Workaround iron-list cutting off ripples on paper-icon-buttons.
44 * TODO(dschuyler): Can the end margin be done differently to allow for
45 * ripples to look like they are overlapping the margin. */
46 -webkit-margin-end: 0;
47 } 33 }
48 34
49 /* See notes in .primary-button. 35 /* See notes in .primary-button.
50 * TODO(dschuyler): Remove unnecessary .secondary-button references. */ 36 * TODO(dschuyler): Remove unnecessary .secondary-button references. */
51 paper-button { 37 paper-button {
52 --paper-button: { 38 --paper-button: {
53 -webkit-padding-end: var(--settings-button-edge-spacing); 39 -webkit-padding-end: var(--settings-button-edge-spacing);
54 -webkit-padding-start: var(--settings-button-edge-spacing); 40 -webkit-padding-start: var(--settings-button-edge-spacing);
55 color: var(--paper-grey-600); 41 color: var(--paper-grey-600);
56 font-weight: 500; 42 font-weight: 500;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 /* Expand to fill-up available space. */ 314 /* Expand to fill-up available space. */
329 .settings-row.wide { 315 .settings-row.wide {
330 flex: 1; 316 flex: 1;
331 } 317 }
332 318
333 .no-outline { 319 .no-outline {
334 background: none; 320 background: none;
335 outline: none; 321 outline: none;
336 } 322 }
337 323
324 /* Prevent icon-button's ripples from fighting with potential scrollbars.
325 * Also apply to all iron-lists to align the buttons across them all.*/
326 [scrollable],
327 iron-list,
328 .list-item {
329 --cr-paper-icon-button-margin: {
330 -webkit-margin-end: 0;
331 -webkit-margin-start: var(--cr-icon-button-margin-start);
332 };
333 }
334
338 /* Helper for a list frame to automatically avoid the separator line. */ 335 /* Helper for a list frame to automatically avoid the separator line. */
339 .vertical-list > *:not(:first-of-type) { 336 .vertical-list > *:not(:first-of-type) {
340 border-top: var(--settings-separator-line); 337 border-top: var(--settings-separator-line);
341 } 338 }
342 339
343 /* The separator a vertical line like a horizontal rule <hr> tag, but goes 340 /* The separator a vertical line like a horizontal rule <hr> tag, but goes
344 * the other way. An example is near the |sign out| button on the People 341 * the other way. An example is near the |sign out| button on the People
345 * settings. */ 342 * settings. */
346 :-webkit-any(.settings-box, .list-item) .separator { 343 :-webkit-any(.settings-box, .list-item) .separator {
347 -webkit-border-start: var(--settings-separator-line); 344 -webkit-border-start: var(--settings-separator-line);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 transform: rotate(-135deg); 404 transform: rotate(-135deg);
408 } 405 }
409 406
410 .column-header { 407 .column-header {
411 color: var(--paper-grey-600); 408 color: var(--paper-grey-600);
412 font-weight: 500; 409 font-weight: 500;
413 } 410 }
414 </style> 411 </style>
415 </template> 412 </template>
416 </dom-module> 413 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698