summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2019-03-12 01:23:51 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-03-12 01:23:51 +0000
commit39f960842501dfe0f66795fb2c56425f33a3c12b (patch)
treeb20cf08ef008eedb6e2ef687e7393c1dbba3153b
parent891b84bdf148183ca9fd0f3f515f5cddb6afa03c (diff)
parent374a473c35b7b23a486348071ae49d98dc62d0f0 (diff)
Merge "Update syntax highlighting class" into stable-2.16
-rw-r--r--polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js2
-rw-r--r--polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html9
-rw-r--r--polygerrit-ui/app/styles/themes/app-theme.html3
3 files changed, 14 insertions, 0 deletions
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
index 88221d4aed..8bf42b79e1 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-layer/gr-syntax-layer.js
@@ -96,6 +96,7 @@
'gr-diff gr-syntax gr-syntax-attribute': true,
'gr-diff gr-syntax gr-syntax-built_in': true,
'gr-diff gr-syntax gr-syntax-comment': true,
+ 'gr-diff gr-syntax gr-syntax-function': true,
'gr-diff gr-syntax gr-syntax-keyword': true,
'gr-diff gr-syntax gr-syntax-link': true,
'gr-diff gr-syntax gr-syntax-literal': true,
@@ -103,6 +104,7 @@
'gr-diff gr-syntax gr-syntax-meta-keyword': true,
'gr-diff gr-syntax gr-syntax-name': true,
'gr-diff gr-syntax gr-syntax-number': true,
+ 'gr-diff gr-syntax gr-syntax-params': true,
'gr-diff gr-syntax gr-syntax-regexp': true,
'gr-diff gr-syntax gr-syntax-selector-attr': true,
'gr-diff gr-syntax gr-syntax-selector-class': true,
diff --git a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
index 41d38040fe..a122113166 100644
--- a/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
+++ b/polygerrit-ui/app/elements/diff/gr-syntax-themes/gr-syntax-theme.html
@@ -29,6 +29,12 @@ limitations under the License.
.contentText {
color: var(--syntax-default-color);
}
+ .gr-syntax-attribute {
+ color: var(--syntax-attribute-color);
+ }
+ .gr-syntax-function {
+ color: var(--syntax-function-color);
+ }
.gr-syntax-meta {
color: var(--syntax-meta-color);
}
@@ -94,6 +100,9 @@ limitations under the License.
.gr-syntax-template-tag {
color: var(--syntax-template-tag-color);
}
+ .gr-syntax-param {
+ color: var(--syntax-param-color);
+ }
</style>
</template>
</dom-module>
diff --git a/polygerrit-ui/app/styles/themes/app-theme.html b/polygerrit-ui/app/styles/themes/app-theme.html
index fba3e978bd..ec445ae181 100644
--- a/polygerrit-ui/app/styles/themes/app-theme.html
+++ b/polygerrit-ui/app/styles/themes/app-theme.html
@@ -109,6 +109,8 @@ limitations under the License.
--tooltip-text-color: #fff;
--syntax-default-color: var(--primary-text-color);
+ --syntax-attribute-color: var(--primary-text-color);
+ --syntax-function-color: #e90;
--syntax-meta-color: #FF1717;
--syntax-keyword-color: #9E0069;
--syntax-number-color: #164;
@@ -130,6 +132,7 @@ limitations under the License.
--syntax-regexp-color: #FA8602;
--syntax-selector-attr-color: #FA8602;
--syntax-template-tag-color: #FA8602;
+ --syntax-param-color: var(--primary-text-color);
}
@media screen and (max-width: 50em) {
:root {