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

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

Issue 2918953002: [MD settings] layout of buttons inside toggles and iron-lists (Closed)
Patch Set: 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
« no previous file with comments | « chrome/browser/resources/settings/on_startup_page/startup_urls_page.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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 21 matching lines...) Expand all
32 -webkit-margin-start: 16px; 32 -webkit-margin-start: 16px;
33 color: var(--paper-grey-600); 33 color: var(--paper-grey-600);
34 flex-shrink: 0; 34 flex-shrink: 0;
35 } 35 }
36 36
37 .separator + button[is='paper-icon-button-light'], 37 .separator + button[is='paper-icon-button-light'],
38 .separator + paper-icon-button { 38 .separator + paper-icon-button {
39 -webkit-margin-start: var(--cr-icon-ripple-margin)); 39 -webkit-margin-start: var(--cr-icon-ripple-margin));
40 } 40 }
41 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 }
48
42 /* See notes in .primary-button. 49 /* See notes in .primary-button.
43 * TODO(dschuyler): Remove unnecessary .secondary-button references. */ 50 * TODO(dschuyler): Remove unnecessary .secondary-button references. */
44 paper-button { 51 paper-button {
45 --paper-button: { 52 --paper-button: {
46 -webkit-padding-end: var(--settings-button-edge-spacing); 53 -webkit-padding-end: var(--settings-button-edge-spacing);
47 -webkit-padding-start: var(--settings-button-edge-spacing); 54 -webkit-padding-start: var(--settings-button-edge-spacing);
48 color: var(--paper-grey-600); 55 color: var(--paper-grey-600);
49 font-weight: 500; 56 font-weight: 500;
50 min-width: 1em; /* A tighter fit than 5.14em for short buttons. */ 57 min-width: 1em; /* A tighter fit than 5.14em for short buttons. */
51 text-decoration: none; 58 text-decoration: none;
52 }; 59 };
53 --paper-button-flat-keyboard-focus: { 60 --paper-button-flat-keyboard-focus: {
54 background: rgba(0, 0, 0, .12); 61 background: rgba(0, 0, 0, .12);
55 }; 62 };
56 flex-shrink: 0; 63 flex-shrink: 0;
57 height: 36px; 64 height: 36px;
58 margin: 0; 65 margin: 0;
59 } 66 }
60 67
61 paper-button[toggles][active] { 68 paper-button[toggles][active] {
62 background-color: var(--paper-grey-300); 69 background-color: var(--paper-grey-300);
63 } 70 }
64 71
65 /* If a button is at the end of the row, shift it to overlap the end of 72 /* If a button is at the end of the row, shift it to overlap the end of
66 * the row. */ 73 * the row. */
67 .settings-box paper-button:last-of-type { 74 .settings-box paper-button:last-of-type {
68 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1); 75 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1);
69 } 76 }
70 77
78 /* Special case for buttons inside of toggle-buttons. */
79 .settings-box settings-toggle-button paper-button:last-of-type {
80 -webkit-margin-end: 16px;
81 }
82
71 /* Space out multiple buttons in the same row. */ 83 /* Space out multiple buttons in the same row. */
72 .settings-box paper-button + paper-button { 84 .settings-box paper-button + paper-button {
73 -webkit-margin-start: 16px; 85 -webkit-margin-start: 16px;
74 } 86 }
75 87
76 /* Adjust the margin between the separator and the first button. */ 88 /* Adjust the margin between the separator and the first button. */
77 .settings-box .separator + paper-button { 89 .settings-box .separator + paper-button {
78 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1); 90 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1);
79 } 91 }
80 92
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 transform: rotate(-135deg); 418 transform: rotate(-135deg);
407 } 419 }
408 420
409 .column-header { 421 .column-header {
410 color: var(--paper-grey-600); 422 color: var(--paper-grey-600);
411 font-weight: 500; 423 font-weight: 500;
412 } 424 }
413 </style> 425 </style>
414 </template> 426 </template>
415 </dom-module> 427 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/on_startup_page/startup_urls_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698