Merge changes Ia2549551,Ia82f8347,Ideee6730
* changes:
Use CSS constant for assignee color
Use CSS constants in gr-form-styles
Replace more CSS vars with constants
diff --git a/polygerrit-ui/app/elements/admin/gr-group/gr-group.html b/polygerrit-ui/app/elements/admin/gr-group/gr-group.html
index d21247a..1e19107 100644
--- a/polygerrit-ui/app/elements/admin/gr-group/gr-group.html
+++ b/polygerrit-ui/app/elements/admin/gr-group/gr-group.html
@@ -32,7 +32,7 @@
<style include="shared-styles"></style>
<style include="gr-subpage-styles">
h3.edited:after {
- color: #444;
+ color: var(--deemphasized-text-color);
content: ' *';
}
.inputUpdateBtn {
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
index 85dcdbe..ac12d71 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.html
@@ -33,7 +33,7 @@
<style="shared-styles"></style>
<style include="gr-subpage-styles">
h2.edited:after {
- color: #444;
+ color: var(--deemphasized-text-color);
content: ' *';
}
.loading,
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
index de39478..6ea7cf3 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item.html
@@ -46,7 +46,7 @@
font-family: var(--font-family-bold);
}
:host([highlight]) {
- background-color: #fcfad6;
+ background-color: var(--assignee-highlight-color);
}
.container {
position: relative;
diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
index 519b15b..b26d649 100644
--- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
+++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.html
@@ -178,7 +178,7 @@
display: none;
}
.warning {
- color: #d14836;
+ color: var(--error-text-color);
}
hr {
border: 0;
diff --git a/polygerrit-ui/app/elements/change/gr-confirm-move-dialog/gr-confirm-move-dialog.html b/polygerrit-ui/app/elements/change/gr-confirm-move-dialog/gr-confirm-move-dialog.html
index 271dd3cc..350af900 100644
--- a/polygerrit-ui/app/elements/change/gr-confirm-move-dialog/gr-confirm-move-dialog.html
+++ b/polygerrit-ui/app/elements/change/gr-confirm-move-dialog/gr-confirm-move-dialog.html
@@ -55,7 +55,7 @@
width: 100%;
}
.warning {
- color: red;
+ color: var(--error-text-color);
}
</style>
<gr-confirm-dialog
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
index 487d8c8..b59742e 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list.html
@@ -122,7 +122,7 @@
text-overflow: ellipsis;
}
.oldPath {
- color: #999;
+ color: var(--deemphasized-text-color);
}
.comments,
.stats {
diff --git a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.html b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.html
index da5ab1e..73e8bea 100644
--- a/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.html
+++ b/polygerrit-ui/app/elements/change/gr-reviewer-list/gr-reviewer-list.html
@@ -49,12 +49,6 @@
gr-account-chip {
margin-top: .3em;
}
- .remove {
- color: #999;
- }
- .remove {
- font-size: var(--font-size-small);
- }
gr-button {
--gr-button: {
padding-left: 0;
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html
index 29b780a..79b23ca 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-comment/gr-diff-comment.html
@@ -212,7 +212,6 @@
font-size: var(--font-size-small);
}
gr-confirm-dialog .main {
- background-color: #fef;
display: flex;
flex-direction: column;
width: 100%;
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
index 47c4651..edee1ae 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff-view/gr-diff-view.html
@@ -77,7 +77,7 @@
}
.navLink:not([href]),
.downloadLink:not([href]) {
- color: #999;
+ color: var(--deemphasized-text-color);
}
.navLinks {
align-items: center;
@@ -189,7 +189,7 @@
text-decoration: none;
}
.mobileNavLink:not([href]) {
- color: #bbb;
+ color: var(--deemphasized-text-color);
}
.jumpToFileContainer {
display: block;
diff --git a/polygerrit-ui/app/elements/gr-app.html b/polygerrit-ui/app/elements/gr-app.html
index 7cfb3b0..d7d50d1 100644
--- a/polygerrit-ui/app/elements/gr-app.html
+++ b/polygerrit-ui/app/elements/gr-app.html
@@ -127,10 +127,10 @@
font-size: 1.2rem;
}
.errorMoreInfo {
- color: #999;
+ color: var(--deemphasized-text-color);
}
.feedback {
- color: #b71c1c;
+ color: var(--error-text-color);
}
</style>
<gr-fixed-panel id="header">
diff --git a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
index 963d2e3..233235e 100644
--- a/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
+++ b/polygerrit-ui/app/elements/settings/gr-cla-view/gr-cla-view.html
@@ -52,7 +52,7 @@
font-family: var(--font-family-bold);
}
.alreadySubmittedText {
- color: red;
+ color: var(--error-text-color);
margin: 0 2em;
padding: .5em;
}
diff --git a/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete.html b/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete.html
index ef058a5..4b447d1 100644
--- a/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete.html
+++ b/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete.html
@@ -59,7 +59,7 @@
}
paper-input.warnUncommitted {
--paper-input-container-input: {
- color: #ff0000;
+ color: var(--error-text-color);
font-size: var(--font-size-normal);
}
}
diff --git a/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete_test.html b/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete_test.html
index a72511e..585b16f 100644
--- a/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-autocomplete/gr-autocomplete_test.html
@@ -519,12 +519,8 @@
element.text = 'blah blah blah';
MockInteractions.blur(element.$.input);
assert.isTrue(inputClassList.contains('warnUncommitted'));
- assert.equal(getComputedStyle(element.$.input.inputElement).color,
- 'rgb(255, 0, 0)');
MockInteractions.focus(element.$.input);
assert.isFalse(inputClassList.contains('warnUncommitted'));
- assert.notEqual(getComputedStyle(element.$.input.inputElement).color,
- 'rgb(255, 0, 0)ed');
});
test('disabled', () => {
diff --git a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html
index 8a70b8b..cda8a67 100644
--- a/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html
+++ b/polygerrit-ui/app/elements/shared/gr-dropdown/gr-dropdown.html
@@ -69,7 +69,7 @@
@apply --gr-dropdown-item;
}
li .itemAction.disabled {
- color: #ccc;
+ color: var(--deemphasized-text-color);
cursor: default;
}
li .itemAction:link,
diff --git a/polygerrit-ui/app/styles/app-theme.html b/polygerrit-ui/app/styles/app-theme.html
index 6112035..69262c9 100644
--- a/polygerrit-ui/app/styles/app-theme.html
+++ b/polygerrit-ui/app/styles/app-theme.html
@@ -46,6 +46,10 @@
--dropdown-background-color: #fff;
+ --select-background-color: rgb(248, 248, 248);
+
+ --assignee-highlight-color: #fcfad6;
+
/* Font sizes */
--font-size-normal: 1rem;
--font-size-small: .92rem;
diff --git a/polygerrit-ui/app/styles/gr-form-styles.html b/polygerrit-ui/app/styles/gr-form-styles.html
index f4b367b..3cfd1d5c 100644
--- a/polygerrit-ui/app/styles/gr-form-styles.html
+++ b/polygerrit-ui/app/styles/gr-form-styles.html
@@ -17,6 +17,14 @@
<dom-module id="gr-form-styles">
<template>
<style>
+ .gr-form-styles input {
+ background-color: var(--view-background-color);
+ color: var(--primary-text-color);
+ }
+ .gr-form-styles select {
+ background-color: var(--select-background-color);
+ color: var(--primary-text-color);
+ }
.gr-form-styles h1,
.gr-form-styles h2 {
margin-bottom: .3em;
diff --git a/polygerrit-ui/app/styles/gr-menu-page-styles.html b/polygerrit-ui/app/styles/gr-menu-page-styles.html
index 4adbeda..48ca396 100644
--- a/polygerrit-ui/app/styles/gr-menu-page-styles.html
+++ b/polygerrit-ui/app/styles/gr-menu-page-styles.html
@@ -37,7 +37,7 @@
max-width: none;
}
h2.edited:after {
- color: #444;
+ color: var(--deemphasized-text-color);
content: ' *';
}
.loading {
