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

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

Issue 1981423002: [MD settings] change button padding and placement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added comment Created 4 years, 7 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 <!-- Common styles for Material Design settings. --> 1 <!-- Common styles for Material Design settings. -->
2 <dom-module id="settings-shared"> 2 <dom-module id="settings-shared">
3 <template> 3 <template>
4 <style> 4 <style>
5 :root { 5 :root {
6 --checkbox-margin-start: 2px; 6 --checkbox-margin-start: 2px;
7 --checkbox-size: 16px; 7 --checkbox-size: 16px;
8 --checkbox-spacing: 18px; 8 --checkbox-spacing: 18px;
9 --iron-icon-fill-color: var(--paper-grey-600); 9 --iron-icon-fill-color: var(--paper-grey-600);
10 --iron-icon-height: 20px; 10 --iron-icon-height: 20px;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 margin: 0; 52 margin: 0;
53 min-height: var(--settings-row-min-height); 53 min-height: var(--settings-row-min-height);
54 } 54 }
55 55
56 iron-icon[icon='cr:check'], 56 iron-icon[icon='cr:check'],
57 iron-icon[icon='settings:done'] { 57 iron-icon[icon='settings:done'] {
58 --iron-icon-fill-color: var(--google-green-500); 58 --iron-icon-fill-color: var(--google-green-500);
59 } 59 }
60 60
61 paper-button { 61 paper-button {
62 @apply(--layout-center);
63 display: flex;
62 margin: 0; 64 margin: 0;
65 min-height: 32px;
66 padding: 0 12px;
63 } 67 }
64 68
65 paper-button[toggles][active] { 69 paper-button[toggles][active] {
66 background-color: var(--paper-grey-300); 70 background-color: var(--paper-grey-300);
67 } 71 }
68 72
69 span ~ a { 73 span ~ a {
70 -webkit-margin-start: 4px; 74 -webkit-margin-start: 4px;
71 } 75 }
72 76
(...skipping 10 matching lines...) Expand all
83 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we 87 /* TODO(dbeam): check with bettes@ on this one, but I'm pretty sure we
84 * shouldn't be showing much :hover stuff on Polymer pages. */ 88 * shouldn't be showing much :hover stuff on Polymer pages. */
85 text-decoration: none; 89 text-decoration: none;
86 } 90 }
87 91
88 paper-button.primary-button { 92 paper-button.primary-button {
89 --paper-button: { 93 --paper-button: {
90 font-weight: 500; 94 font-weight: 500;
91 text-align: start; 95 text-align: start;
92 }; 96 };
93 margin: 0 -0.57em; /* Offsets default paper-button padding. */
94 } 97 }
95 98
96 paper-button.secondary-button { 99 paper-button.secondary-button {
97 --paper-button: { 100 --paper-button: {
98 color: var(--paper-grey-600); 101 color: var(--paper-grey-600);
99 text-decoration: none; 102 text-decoration: none;
100 font-weight: 500; 103 font-weight: 500;
101 }; 104 };
102 } 105 }
103 106
(...skipping 25 matching lines...) Expand all
129 paper-radio-group { 132 paper-radio-group {
130 width: 100%; 133 width: 100%;
131 } 134 }
132 135
133 .text-elide { 136 .text-elide {
134 overflow: hidden; 137 overflow: hidden;
135 text-overflow: ellipsis; 138 text-overflow: ellipsis;
136 white-space: nowrap; 139 white-space: nowrap;
137 } 140 }
138 141
139 .button-row {
140 display: flex;
141 margin-top: 25px;
142 }
143
144 .button-strip { 142 .button-strip {
145 text-align: end; 143 text-align: end;
146 } 144 }
147 145
148 .action-button { 146 .action-button {
149 background: var(--google-blue-500); 147 background: var(--google-blue-500);
150 color: white; 148 color: white;
151 } 149 }
152 150
153 .action-button[disabled] { 151 .action-button[disabled] {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 } 215 }
218 216
219 .settings-box { 217 .settings-box {
220 @apply(--layout-center); 218 @apply(--layout-center);
221 border-top: var(--settings-separator-line); 219 border-top: var(--settings-separator-line);
222 display: flex; 220 display: flex;
223 min-height: var(--settings-row-min-height); 221 min-height: var(--settings-row-min-height);
224 padding: 0 20px; 222 padding: 0 20px;
225 } 223 }
226 224
225 /* The button-strip inside of a settings-box is moved over a small amount
226 * to line up the text of the button label with the 20px settings-box
227 * margin. See also: .secondary-action for buttons at the end of the row.
228 */
229 .settings-box.button-strip {
230 /* Plus 12px for the button equals 20px total. */
231 -webkit-padding-start: 8px;
232 }
233
227 .settings-box.first, 234 .settings-box.first,
228 .settings-box.continuation { 235 .settings-box.continuation {
229 border-top: none; 236 border-top: none;
230 } 237 }
231 238
232 .settings-box.block { 239 .settings-box.block {
233 display: block; 240 display: block;
234 } 241 }
235 242
236 .settings-box.two-line { 243 .settings-box.two-line {
(...skipping 17 matching lines...) Expand all
254 261
255 /* The secondary-action wraps a clickable sub-area of a .settings-box. 262 /* The secondary-action wraps a clickable sub-area of a .settings-box.
256 * An example is the |sign out| button on the People settings. 263 * An example is the |sign out| button on the People settings.
257 * Here is an example with and without a secondary action box: 264 * Here is an example with and without a secondary action box:
258 * 265 *
259 * +-------------------------------------------------------+ 266 * +-------------------------------------------------------+
260 * | Main action area .settings-box | .secondary-action | 267 * | Main action area .settings-box | .secondary-action |
261 * +-------------------------------------------------------+ 268 * +-------------------------------------------------------+
262 * | Another setting-box without a secondary-action | 269 * | Another setting-box without a secondary-action |
263 * +-------------------------------------------------------+ 270 * +-------------------------------------------------------+
271 *
272 * See also: .button-strip for buttons at the start of the row.
264 */ 273 */
265 .settings-box .secondary-action { 274 .settings-box .secondary-action {
275 @apply(--layout-center);
266 -webkit-border-start: var(--settings-separator-line); 276 -webkit-border-start: var(--settings-separator-line);
267 -webkit-padding-start: 20px; 277 -webkit-padding-start: 8px;
278 display: flex;
279 left: 12px; /* Equal to the paper-button padding. */
Dan Beam 2016/05/18 00:32:47 wont work in RTL
dschuyler 2016/05/18 20:29:04 Done.
280 min-height: 32px;
281 position: relative;
268 } 282 }
269 283
270 .settings-box paper-item iron-icon { 284 .settings-box paper-item iron-icon {
271 /* Same padding as paper-icon-button. */ 285 /* Same padding as paper-icon-button. */
272 padding: 8px; 286 padding: 8px;
273 } 287 }
274 288
275 .vertical-list > *:not(:first-of-type) { 289 .vertical-list > *:not(:first-of-type) {
276 border-top: var(--settings-separator-line); 290 border-top: var(--settings-separator-line);
277 } 291 }
(...skipping 14 matching lines...) Expand all
292 306
293 .favicon-image { 307 .favicon-image {
294 background-repeat: no-repeat; 308 background-repeat: no-repeat;
295 background-size: contain; 309 background-size: contain;
296 height: 16px; 310 height: 16px;
297 width: 16px; 311 width: 16px;
298 } 312 }
299 </style> 313 </style>
300 </template> 314 </template>
301 </dom-module> 315 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698