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

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

Issue 2847583002: [MD settings] css for row separator (Closed)
Patch Set: comment change Created 3 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
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_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 /* Included here so we don't have to include "iron-positioning" in every 8 /* Included here so we don't have to include "iron-positioning" in every
9 * stylesheet. See crbug.com/498405. */ 9 * stylesheet. See crbug.com/498405. */
10 [hidden] { 10 [hidden] {
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 align-items: center; 311 align-items: center;
312 flex: auto; 312 flex: auto;
313 } 313 }
314 314
315 .no-outline, 315 .no-outline,
316 [scrollable] .no-outline { 316 [scrollable] .no-outline {
317 background: none; 317 background: none;
318 outline: none; 318 outline: none;
319 } 319 }
320 320
321 /* The secondary-action wraps a clickable sub-area of a .settings-box. 321 /* TODO(dschuyler): replace with .vertical-rule-line.
Dan Beam 2017/04/27 00:11:03 wait, why can't we do this now?
dschuyler 2017/04/27 01:13:12 I was looking to hammer out the details before spr
322 * An example is the |sign out| button on the People settings. 322 * The secondary-action wraps a clickable sub-area of a .settings-box.
323 * Here is an example with and without a secondary action box: 323 * Here is an example with and without a secondary action box:
324 * 324 *
325 * +-------------------------------------------------------+ 325 * +-------------------------------------------------------+
326 * | Main action area .settings-box | .secondary-action | 326 * | Main action area .settings-box | .secondary-action |
327 * +-------------------------------------------------------+ 327 * +-------------------------------------------------------+
328 * | Another setting-box without a secondary-action | 328 * | Another setting-box without a secondary-action |
329 * +-------------------------------------------------------+ */ 329 * +-------------------------------------------------------+ */
330 :-webkit-any(.settings-box, .list-item) .secondary-action { 330 :-webkit-any(.settings-box, .list-item) .secondary-action {
331 -webkit-border-start: var(--settings-separator-line); 331 -webkit-border-start: var(--settings-separator-line);
332 -webkit-margin-start: 20px; 332 -webkit-margin-start: 20px;
333 -webkit-padding-start: 20px; 333 -webkit-padding-start: 20px;
334 align-items: center; 334 align-items: center;
335 display: flex; 335 display: flex;
336 flex-shrink: 0; 336 flex-shrink: 0;
337 height: 36px; 337 height: 36px;
338 } 338 }
339 339
340 :-webkit-any(.settings-box, .list-item).two-line .secondary-action { 340 :-webkit-any(.settings-box, .list-item).two-line .secondary-action {
341 height: 46px; 341 height: 46px;
342 } 342 }
343 343
344 /* Helper for a list frame to automatically avoid the separator line. */ 344 /* Helper for a list frame to automatically avoid the separator line. */
345 .vertical-list > *:not(:first-of-type) { 345 .vertical-list > *:not(:first-of-type) {
346 border-top: var(--settings-separator-line); 346 border-top: var(--settings-separator-line);
347 } 347 }
348 348
349 /* The vertical-rule-line is a separator line like a horizontal rule
350 * <hr> tag, but goes the other way.
351 * An example is near the |sign out| button on the People settings. */
352 .vertical-rule-line {
Dan Beam 2017/04/27 00:11:03 nit: i like .separator more because it's not so ti
dschuyler 2017/04/27 01:13:12 Done.
353 -webkit-border-start: var(--settings-separator-line);
354 -webkit-margin-start: var(--settings-box-row-padding);
355 -webkit-padding-start: var(--settings-box-row-padding);
356 flex-shrink: 0;
357 height: 80%; /* e.g. 36px in a 45px row */
358 }
359
360 :-webkit-any(.settings-box, .list-item).two-line .vertical-rule-line {
361 height: 46px;
362 }
363
349 .settings-checkbox-spacer { 364 .settings-checkbox-spacer {
350 -webkit-margin-start: calc( 365 -webkit-margin-start: calc(
351 var(--checkbox-margin-start) + 366 var(--checkbox-margin-start) +
352 var(--checkbox-size) + 367 var(--checkbox-size) +
353 var(--settings-control-spacing)); 368 var(--settings-control-spacing));
354 } 369 }
355 370
356 .favicon-image { 371 .favicon-image {
357 background-repeat: no-repeat; 372 background-repeat: no-repeat;
358 background-size: contain; 373 background-size: contain;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 transform: rotate(-135deg); 410 transform: rotate(-135deg);
396 } 411 }
397 412
398 .column-header { 413 .column-header {
399 color: var(--paper-grey-600); 414 color: var(--paper-grey-600);
400 font-weight: 500; 415 font-weight: 500;
401 } 416 }
402 </style> 417 </style>
403 </template> 418 </template>
404 </dom-module> 419 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698