Merge changes I5726cae3,Ie3acbfa4 * changes: Use --dialog-background-color in more dialogs Rework some CSS constant usage
diff --git a/polygerrit-ui/app/elements/change/gr-included-in-dialog/gr-included-in-dialog.html b/polygerrit-ui/app/elements/change/gr-included-in-dialog/gr-included-in-dialog.html index a07c724f..cf79a31 100644 --- a/polygerrit-ui/app/elements/change/gr-included-in-dialog/gr-included-in-dialog.html +++ b/polygerrit-ui/app/elements/change/gr-included-in-dialog/gr-included-in-dialog.html
@@ -23,13 +23,13 @@ <template> <style include="shared-styles"> :host { + background-color: var(--dialog-background-color); display: block; max-height: 80vh; overflow-y: auto; padding: 4.5em 1em 1em 1em; } header { - background: var(--view-background-color); border-bottom: 1px solid var(--border-color); left: 0; padding: 1em; @@ -58,8 +58,9 @@ margin-bottom: 1em; } ul li { + border: 1px solid var(--border-color); border-radius: .2em; - background: var(--header-background-color); + background: var(--chip-background-color); display: inline-block; margin: 0 .2em .4em .2em; padding: .2em .4em;
diff --git a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html index 1e37725..df39362 100644 --- a/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html +++ b/polygerrit-ui/app/elements/change/gr-reply-dialog/gr-reply-dialog.html
@@ -38,6 +38,7 @@ <template> <style include="shared-styles"> :host { + background-color: var(--dialog-background-color); display: block; max-height: 100%; } @@ -59,7 +60,7 @@ width: 100%; } .actions { - background-color: var(--view-background-color); + background-color: var(--dialog-background-color); bottom: 0; display: flex; justify-content: space-between; @@ -75,6 +76,7 @@ flex-shrink: 0; } .peopleContainer { + border-top: none; display: table; } .peopleList { @@ -120,7 +122,7 @@ display: block; } .previewContainer gr-formatted-text { - background: var(--header-background-color); + background: var(--table-header-background-color); padding: 1em; } .draftsContainer h3 {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html index 7c7ce06..81c6d99 100644 --- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html +++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
@@ -202,7 +202,7 @@ display: block; } .target-row td.blame { - background: var(--header-background-color); + background: var(--diff-selection-background-color); } col.blame { display: none;
diff --git a/polygerrit-ui/app/elements/shared/gr-account-chip/gr-account-chip.html b/polygerrit-ui/app/elements/shared/gr-account-chip/gr-account-chip.html index f04caaa..8a86f93 100644 --- a/polygerrit-ui/app/elements/shared/gr-account-chip/gr-account-chip.html +++ b/polygerrit-ui/app/elements/shared/gr-account-chip/gr-account-chip.html
@@ -31,7 +31,7 @@ } .container { align-items: center; - background: var(--header-background-color); + background: var(--table-header-background-color); border-radius: .75em; display: inline-flex; padding: 0 .5em;
diff --git a/polygerrit-ui/app/elements/shared/gr-linked-chip/gr-linked-chip.html b/polygerrit-ui/app/elements/shared/gr-linked-chip/gr-linked-chip.html index 5d7a8a8..fab562a 100644 --- a/polygerrit-ui/app/elements/shared/gr-linked-chip/gr-linked-chip.html +++ b/polygerrit-ui/app/elements/shared/gr-linked-chip/gr-linked-chip.html
@@ -31,7 +31,7 @@ } .container { align-items: center; - background: var(--header-background-color); + background: var(--chip-background-color); border-radius: .75em; display: inline-flex; padding: 0 .5em;
diff --git a/polygerrit-ui/app/styles/app-theme.html b/polygerrit-ui/app/styles/app-theme.html index 70395e2..227befe 100644 --- a/polygerrit-ui/app/styles/app-theme.html +++ b/polygerrit-ui/app/styles/app-theme.html
@@ -42,6 +42,8 @@ --table-header-background-color: #fafafa; --table-subheader-background-color: #eaeaea; + --chip-background-color: var(--header-background-color); + --dropdown-background-color: #fff; /* Font sizes */