Merge "Increase contrast of +x/-y delta count text"
diff --git a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.js b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.js
index b31ab9b..5ff7dde 100644
--- a/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.js
+++ b/polygerrit-ui/app/elements/change-list/gr-change-list-item/gr-change-list-item_html.js
@@ -90,10 +90,10 @@
line-height: var(--line-height-mono);
}
.u-green {
- color: var(--vote-text-color-recommended);
+ color: var(--positive-green-text-color);
}
.u-red {
- color: var(--vote-text-color-disliked);
+ color: var(--negative-red-text-color);
}
.u-gray-background {
background-color: var(--table-header-background-color);
diff --git a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.js b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.js
index 1b18412..ca176be 100644
--- a/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.js
+++ b/polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata_html.js
@@ -74,10 +74,10 @@
color: #ffa62f;
}
.icon.invalid {
- color: var(--vote-text-color-disliked);
+ color: var(--negative-red-text-color);
}
.icon.trusted {
- color: var(--vote-text-color-recommended);
+ color: var(--positive-green-text-color);
}
.parentList.notCurrent.nonMerge #parentNotCurrentMessage {
--arrow-color: #ffa62f;
diff --git a/polygerrit-ui/app/elements/change/gr-change-requirements/gr-change-requirements_html.js b/polygerrit-ui/app/elements/change/gr-change-requirements/gr-change-requirements_html.js
index 0da31de..657915b 100644
--- a/polygerrit-ui/app/elements/change/gr-change-requirements/gr-change-requirements_html.js
+++ b/polygerrit-ui/app/elements/change/gr-change-requirements/gr-change-requirements_html.js
@@ -31,10 +31,10 @@
line-height: var(--line-height-mono);
}
.approved.status {
- color: var(--vote-text-color-recommended);
+ color: var(--positive-green-text-color);
}
.rejected.status {
- color: var(--vote-text-color-disliked);
+ color: var(--negative-red-text-color);
}
iron-icon {
color: inherit;
diff --git a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.js b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.js
index cc4e934..ccf7f1a 100644
--- a/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.js
+++ b/polygerrit-ui/app/elements/change/gr-file-list/gr-file-list_html.js
@@ -151,10 +151,10 @@
min-width: 3.5em;
}
.added {
- color: var(--vote-text-color-recommended);
+ color: var(--positive-green-text-color);
}
.removed {
- color: var(--vote-text-color-disliked);
+ color: var(--negative-red-text-color);
text-align: left;
min-width: 4em;
padding-left: var(--spacing-s);
@@ -425,14 +425,14 @@
x$="[[_computeBarAdditionX(file, _sizeBarLayout)]]"
y="0"
height="8"
- fill="#388E3C"
+ fill="var(--positive-green-text-color)"
width$="[[_computeBarAdditionWidth(file, _sizeBarLayout)]]"
></rect>
<rect
x$="[[_computeBarDeletionX(_sizeBarLayout)]]"
y="0"
height="8"
- fill="#D32F2F"
+ fill="var(--negative-red-text-color)"
width$="[[_computeBarDeletionWidth(file, _sizeBarLayout)]]"
></rect>
</svg>
diff --git a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.js b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.js
index 77148ad..e511101 100644
--- a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.js
+++ b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.js
@@ -53,7 +53,6 @@
--button-background-color,
var(--table-header-background-color)
);
- color: var(--primary-text-color);
padding: 0 var(--spacing-m);
@apply --vote-chip-styles;
}
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.js b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.js
index 94b293b..25d0f65 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.js
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.js
@@ -132,7 +132,7 @@
}
.score {
border-radius: var(--border-radius);
- color: var(--primary-text-color);
+ color: var(--vote-text-color);
display: inline-block;
padding: 0 var(--spacing-s);
text-align: center;
diff --git a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_html.js b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_html.js
index 687dbd7..6aa7ffc 100644
--- a/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_html.js
+++ b/polygerrit-ui/app/elements/change/gr-related-changes-list/gr-related-changes-list_html.js
@@ -79,7 +79,7 @@
color: #1b5e20;
}
.submittableCheck {
- color: var(--vote-text-color-recommended);
+ color: var(--positive-green-text-color);
display: none;
}
.submittableCheck.submittable {
diff --git a/polygerrit-ui/app/styles/gr-voting-styles.js b/polygerrit-ui/app/styles/gr-voting-styles.js
index 4860428..60bf623 100644
--- a/polygerrit-ui/app/styles/gr-voting-styles.js
+++ b/polygerrit-ui/app/styles/gr-voting-styles.js
@@ -26,6 +26,7 @@
box-shadow: none;
box-sizing: border-box;
min-width: 3em;
+ color: var(--vote-text-color);
}
}
</style>
diff --git a/polygerrit-ui/app/styles/themes/app-theme.js b/polygerrit-ui/app/styles/themes/app-theme.js
index 5d5d9e3..d76efe1 100644
--- a/polygerrit-ui/app/styles/themes/app-theme.js
+++ b/polygerrit-ui/app/styles/themes/app-theme.js
@@ -38,10 +38,11 @@
--primary-button-text-color: white;
/* Used on text color for change list that doesn't need user's attention. */
--reviewed-text-color: black;
+ --vote-text-color: black;
--tooltip-text-color: white;
- --vote-text-color-recommended: #388e3c;
- --vote-text-color-disliked: #d32f2f;
-
+ --negative-red-text-color: #d93025;
+ --positive-green-text-color: #188038;
+
/* background colors */
/* primary background colors */
--background-color-primary: #ffffff;
diff --git a/polygerrit-ui/app/styles/themes/dark-theme.html b/polygerrit-ui/app/styles/themes/dark-theme.html
index 4248878..f4cacd2 100644
--- a/polygerrit-ui/app/styles/themes/dark-theme.html
+++ b/polygerrit-ui/app/styles/themes/dark-theme.html
@@ -33,12 +33,13 @@
--deemphasized-text-color: #9aa0a6;
--default-button-text-color: #8ab4f8;
--error-text-color: red;
- --primary-button-text-color: var(--primary-text-color);
+ --primary-button-text-color: black;
/* Used on text color for change list doesn't need user's attention. */
--reviewed-text-color: #dadce0;
+ --vote-text-color: black;
--tooltip-text-color: white;
- --vote-text-color-recommended: #388e3c;
- --vote-text-color-disliked: #d32f2f;
+ --negative-red-text-color: #f28b82;
+ --positive-green-text-color: #81c995;
/* background colors */
/* primary background colors */
