Merge "Let image diff builder know when to use new UI"
diff --git a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.ts b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.ts
index 312532e..6d678eb 100644
--- a/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-label-score-row/gr-label-score-row_html.ts
@@ -62,12 +62,16 @@
}
gr-button.iron-selected[vote='positive'] {
--button-background-color: var(--vote-color-recommended);
+ border-radius: 12px;
+ border: 1px solid var(--vote-outline-recommended);
}
gr-button.iron-selected[vote='min'] {
--button-background-color: var(--vote-color-rejected);
}
gr-button.iron-selected[vote='negative'] {
--button-background-color: var(--vote-color-disliked);
+ border-radius: 12px;
+ border: 1px solid var(--vote-outline-disliked);
}
gr-button.iron-selected[vote='neutral'] {
--button-background-color: var(--vote-color-neutral);
diff --git a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
index 45f4406..ed1c981 100644
--- a/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
+++ b/polygerrit-ui/app/elements/change/gr-message/gr-message_html.ts
@@ -170,15 +170,19 @@
}
.score.negative {
background-color: var(--vote-color-disliked);
+ border: 1px solid var(--vote-outline-disliked);
}
.score.negative.min {
background-color: var(--vote-color-rejected);
+ border: none;
}
.score.positive {
background-color: var(--vote-color-recommended);
+ border: 1px solid var(--vote-outline-recommended);
}
.score.positive.max {
background-color: var(--vote-color-approved);
+ border: none;
}
gr-account-label {
--gr-account-label-text-style: {
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
index 798792d5..1f4b778 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
+++ b/polygerrit-ui/app/elements/diff/gr-diff-host/gr-diff-host.ts
@@ -1007,16 +1007,16 @@
if (this._anyLineTooLong(diff)) {
fireAlert(
this,
- `A line is longer than ${SYNTAX_MAX_LINE_LENGTH}.` +
- ' Syntax Highlighting was turned off.'
+ `Files with line longer than ${SYNTAX_MAX_LINE_LENGTH} characters` +
+ ' will not be syntax highlighted.'
);
return false;
}
if (this.$.diff.getDiffLength(diff) > SYNTAX_MAX_DIFF_LENGTH) {
fireAlert(
this,
- `A diff is longer than ${SYNTAX_MAX_DIFF_LENGTH}.` +
- ' Syntax Highlighting was turned off.'
+ `Files with more than ${SYNTAX_MAX_DIFF_LENGTH} lines` +
+ ' will not be syntax highlighted.'
);
return false;
}
diff --git a/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info_html.ts b/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info_html.ts
index 0efe73d..3fa0da7 100644
--- a/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info_html.ts
+++ b/polygerrit-ui/app/elements/shared/gr-label-info/gr-label-info_html.ts
@@ -43,9 +43,13 @@
}
.positive {
background-color: var(--vote-color-recommended);
+ border-radius: 12px;
+ border: 1px solid var(--vote-outline-recommended);
}
.negative {
background-color: var(--vote-color-disliked);
+ border-radius: 12px;
+ border: 1px solid var(--vote-outline-disliked);
}
.hidden {
display: none;
diff --git a/polygerrit-ui/app/styles/themes/app-theme.ts b/polygerrit-ui/app/styles/themes/app-theme.ts
index 2a17949..6c40707 100644
--- a/polygerrit-ui/app/styles/themes/app-theme.ts
+++ b/polygerrit-ui/app/styles/themes/app-theme.ts
@@ -230,7 +230,7 @@
--vote-outline-disliked: var(--red-700);
--vote-color-neutral: var(--gray-300);
--vote-color-recommended: var(--green-50);
- --vote-outline-recommended: var(--green-300);
+ --vote-outline-recommended: var(--green-700);
--vote-color-rejected: var(--red-300);
--outline-color-focus: var(--gray-900);
diff --git a/tools/nongoogle.bzl b/tools/nongoogle.bzl
index 3f5ef20..11710f0 100644
--- a/tools/nongoogle.bzl
+++ b/tools/nongoogle.bzl
@@ -141,24 +141,24 @@
sha1 = GUAVA_BIN_SHA1,
)
- GUICE_VERS = "5.0.0-BETA-1"
+ GUICE_VERS = "5.0.1"
maven_jar(
name = "guice-library",
artifact = "com.google.inject:guice:" + GUICE_VERS,
- sha1 = "c5572be8a8b75ea50e0fdf54fa1f75a3141ab936",
+ sha1 = "0dae7556b441cada2b4f0a2314eb68e1ff423429",
)
maven_jar(
name = "guice-assistedinject",
artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
- sha1 = "4d06eba0e08151b52d9e25a14e4f01eedf998bc3",
+ sha1 = "62e02f2aceb7d90ba354584dacc018c1e94ff01c",
)
maven_jar(
name = "guice-servlet",
artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS,
- sha1 = "373b9a4f1b6683d9a991410660d2c9adb9f06737",
+ sha1 = "f527009d51f172a2e6937bfb55fcb827e2e2386b",
)
# Keep this version of Soy synchronized with the version used in Gitiles.
