Skip to content

Commit

Permalink
[MD settings] style dialog footer with separator line
Browse files Browse the repository at this point in the history
This CL correct dialog footer styling so that a footer will have a gray
separator line consistently.

[email protected]

(cherry picked from commit 80f42ed)

Bug: 746186
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I1822f3724762f07658404ed03772d2bb8a83e507
Reviewed-on: https://chromium-review.googlesource.com/578375
Reviewed-by: Hector Carmona <[email protected]>
Reviewed-by: Demetrios Papadopoulos <[email protected]>
Commit-Queue: Dave Schuyler <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#488564}
Reviewed-on: https://chromium-review.googlesource.com/583936
Reviewed-by: Dave Schuyler <[email protected]>
Cr-Commit-Position: refs/branch-heads/3163@{#15}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
  • Loading branch information
dschuyler committed Jul 24, 2017
1 parent 9e41938 commit 4c17c8d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
</div>
<if expr="(not chromeos and is_posix) or is_win or is_macosx">
<template is="dom-if" if="[[!syncStatus.domain]]">
<div class="footer border-top-divider" slot="footer">
<div class="footer" slot="footer">
<div class="settings-box first">
<paper-checkbox id="deleteProfile" class="start"
checked="{{deleteProfile_}}">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
$i18n{resetPageCommit}
</paper-button>
</div>
<div class="footer border-top-divider" slot="footer">
<div class="footer" slot="footer">
<paper-checkbox id="sendSettings" checked>
$i18nRaw{resetPageFeedback}</paper-checkbox>
</div>
Expand Down
5 changes: 1 addition & 4 deletions ui/webui/resources/cr_elements/cr_dialog/cr_dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,11 @@
:host ::slotted([slot=footer]) {
border-bottom-left-radius: inherit;
border-bottom-right-radius: inherit;
border-top: 1px solid var(--divider-color);
margin: 0;
padding: 16px 20px;
}

:host ::slotted([slot=border-top-divider]) {
border-top: 1px solid var(--divider-color);
}

.body-container {
/* Prevent layout moving when border does appear. */
border-bottom: 1px solid transparent;
Expand Down

0 comments on commit 4c17c8d

Please sign in to comment.