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

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

Issue 2902363002: [MD settings] adjust button layout (Closed)
Patch Set: moved styling 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_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;
11 align-self: flex-start; 11 align-self: flex-start;
12 color: var(--paper-grey-600); 12 color: var(--paper-grey-600);
13 display: flex; 13 display: flex;
14 font-size: inherit; 14 font-size: inherit;
15 font-weight: 500; 15 font-weight: 500;
16 margin: 0; 16 margin: 0;
17 padding-bottom: 12px; 17 padding-bottom: 12px;
18 padding-top: 24px; 18 padding-top: 24px;
19 } 19 }
20 20
21 iron-icon { 21 iron-icon {
22 flex-shrink: 0; /* Prevent distortion of icons in cramped UI. */ 22 flex-shrink: 0; /* Prevent distortion of icons in cramped UI. */
23 } 23 }
24 24
25 iron-icon[icon='cr:check'], 25 iron-icon[icon='cr:check'],
26 iron-icon[icon='settings:done'] { 26 iron-icon[icon='settings:done'] {
27 --iron-icon-fill-color: var(--google-green-500); 27 --iron-icon-fill-color: var(--google-green-500);
28 } 28 }
29 29
30 paper-icon-button {
31 -webkit-margin-end: 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'] {
hcarmona 2017/05/26 19:00:50 Nit: combine this
dschuyler 2017/05/26 22:09:07 Done.
38 -webkit-margin-start: var(--cr-icon-ripple-margin);
39 }
40
41 .separator + paper-icon-button {
hcarmona 2017/05/26 19:00:50 and this b/c they apply the same styling
dschuyler 2017/05/26 22:09:07 Done.
42 -webkit-margin-start: var(--cr-icon-ripple-margin));
43 }
44
30 /* See notes in .primary-button. 45 /* See notes in .primary-button.
31 * TODO(dschuyler): Remove unnecessary .secondary-button references. */ 46 * TODO(dschuyler): Remove unnecessary .secondary-button references. */
32 paper-button { 47 paper-button {
33 --paper-button: { 48 --paper-button: {
34 -webkit-padding-end: var(--settings-button-edge-spacing); 49 -webkit-padding-end: var(--settings-button-edge-spacing);
35 -webkit-padding-start: var(--settings-button-edge-spacing); 50 -webkit-padding-start: var(--settings-button-edge-spacing);
36 color: var(--paper-grey-600); 51 color: var(--paper-grey-600);
37 font-weight: 500; 52 font-weight: 500;
38 min-width: 1em; /* A tighter fit than 5.14em for short buttons. */ 53 min-width: 1em; /* A tighter fit than 5.14em for short buttons. */
39 text-decoration: none; 54 text-decoration: none;
40 }; 55 };
41 --paper-button-flat-keyboard-focus: { 56 --paper-button-flat-keyboard-focus: {
42 background: rgba(0, 0, 0, .12); 57 background: rgba(0, 0, 0, .12);
43 }; 58 };
44 flex-shrink: 0; 59 flex-shrink: 0;
45 height: 36px; 60 height: 36px;
46 margin: 0; 61 margin: 0;
47 } 62 }
48 63
49 paper-button[toggles][active] { 64 paper-button[toggles][active] {
50 background-color: var(--paper-grey-300); 65 background-color: var(--paper-grey-300);
51 } 66 }
52 67
53 .settings-box paper-button { 68 /* If a button is at the end of the row, shift it to overlap the end of
69 * the row. */
70 .settings-box paper-button:last-of-type {
54 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1); 71 -webkit-margin-end: calc(var(--settings-button-edge-spacing) * -1);
72 }
73
74 /* Space out multiple buttons in the same row. */
75 .settings-box paper-button + paper-button {
76 -webkit-margin-start: 16px;
77 }
78
79 /* Adjust the margin between the separator and the first button. */
80 .settings-box .separator + paper-button {
55 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1); 81 -webkit-margin-start: calc(var(--settings-button-edge-spacing) * -1);
56 } 82 }
57 83
58 /* There are two settings button styles, .primary-button and normal 84 /* There are two settings button styles, .primary-button and normal
59 * buttons. The primary is the action button (e.g. "edit", "delete") 85 * buttons. The primary is the action button (e.g. "edit", "delete")
60 * while the normal (secondary-button) is often a "Cancel" button. */ 86 * while the normal (secondary-button) is often a "Cancel" button. */
61 .primary-button { 87 .primary-button {
62 --paper-button: { 88 --paper-button: {
63 -webkit-padding-end: var(--settings-button-edge-spacing); 89 -webkit-padding-end: var(--settings-button-edge-spacing);
64 -webkit-padding-start: var(--settings-button-edge-spacing); 90 -webkit-padding-start: var(--settings-button-edge-spacing);
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 transform: rotate(-135deg); 409 transform: rotate(-135deg);
384 } 410 }
385 411
386 .column-header { 412 .column-header {
387 color: var(--paper-grey-600); 413 color: var(--paper-grey-600);
388 font-weight: 500; 414 font-weight: 500;
389 } 415 }
390 </style> 416 </style>
391 </template> 417 </template>
392 </dom-module> 418 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698