diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /app/assets/stylesheets/highlight | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'app/assets/stylesheets/highlight')
6 files changed, 41 insertions, 18 deletions
diff --git a/app/assets/stylesheets/highlight/themes/dark.scss b/app/assets/stylesheets/highlight/themes/dark.scss index 5ab762a5104..8d965ea4309 100644 --- a/app/assets/stylesheets/highlight/themes/dark.scss +++ b/app/assets/stylesheets/highlight/themes/dark.scss @@ -1,6 +1,6 @@ /* https://github.com/MozMorris/tomorrow-pygments */ -@import "../common"; +@import '../common'; /* * Dark syntax colors @@ -223,11 +223,20 @@ $dark-il: #de935f; .cs { color: $dark-cs; } /* Comment.Special */ .gd { color: $dark-gd; } /* Generic.Deleted */ .ge { font-style: italic; } /* Generic.Emph */ - .gh { color: $dark-gh; font-weight: $gl-font-weight-bold; } /* Generic.Heading */ + .gh { /* Generic.Heading */ + color: $dark-gh; + font-weight: $gl-font-weight-bold; + } .gi { color: $dark-gi; } /* Generic.Inserted */ - .gp { color: $dark-gp; font-weight: $gl-font-weight-bold; } /* Generic.Prompt */ + .gp { /* Generic.Prompt */ + color: $dark-gp; + font-weight: $gl-font-weight-bold; + } .gs { font-weight: $gl-font-weight-bold; } /* Generic.Strong */ - .gu { color: $dark-gu; font-weight: $gl-font-weight-bold; } /* Generic.Subheading */ + .gu { /* Generic.Subheading */ + color: $dark-gu; + font-weight: $gl-font-weight-bold; + } .kc { color: $dark-kc; } /* Keyword.Constant */ .kd { color: $dark-kd; } /* Keyword.Declaration */ .kn { color: $dark-kn; } /* Keyword.Namespace */ diff --git a/app/assets/stylesheets/highlight/themes/monokai.scss b/app/assets/stylesheets/highlight/themes/monokai.scss index 348ef69cc4f..5ef2b9dcc36 100644 --- a/app/assets/stylesheets/highlight/themes/monokai.scss +++ b/app/assets/stylesheets/highlight/themes/monokai.scss @@ -1,6 +1,6 @@ /* https://github.com/richleland/pygments-css/blob/master/monokai.css */ -@import "../common"; +@import '../common'; /* * Monokai Colors @@ -211,7 +211,10 @@ $monokai-gi: #a6e22e; .hll { background-color: $monokai-hll; } .c { color: $monokai-c; } /* Comment */ - .err { color: $monokai-err-color; background-color: $monokai-err-bg; } /* Error */ + .err { /* Error */ + color: $monokai-err-color; + background-color: $monokai-err-bg; + } .k { color: $monokai-k; } /* Keyword */ .l { color: $monokai-l; } /* Literal */ .n { color: $monokai-n; } /* Name */ diff --git a/app/assets/stylesheets/highlight/themes/none.scss b/app/assets/stylesheets/highlight/themes/none.scss index 2fc5d7f7a85..fb548a00526 100644 --- a/app/assets/stylesheets/highlight/themes/none.scss +++ b/app/assets/stylesheets/highlight/themes/none.scss @@ -2,7 +2,7 @@ * None Syntax Colors */ -@import "../common"; +@import '../common'; @mixin match-line { color: $black-transparent; @@ -10,7 +10,7 @@ } .code.none { - // Line numbers + // Line numbers .line-numbers, .diff-line-num { background-color: $gray-light; @@ -44,7 +44,6 @@ $none-expanded-bg: #e0e0e0; .line_holder { - &.match .line_content, .new-nonewline.line_content, .old-nonewline.line_content { @@ -149,12 +148,12 @@ background-color: $white-normal; } - // Search result highlight + // Search result highlight span.highlight_word { background-color: $white-normal; } - // Links to URLs, emails, or dependencies + // Links to URLs, emails, or dependencies .line a { color: $gl-text-color; text-decoration: underline; diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss index f5b36480f18..190a6e6156a 100644 --- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss +++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss @@ -1,6 +1,6 @@ /* https://gist.github.com/qguv/7936275 */ -@import "../common"; +@import '../common'; /* * Solarized dark colors @@ -244,13 +244,19 @@ $solarized-dark-il: #2aa198; .c1 { color: $solarized-dark-c1; } /* Comment.Single */ .cs { color: $solarized-dark-cs; } /* Comment.Special */ .gd { color: $solarized-dark-gd; } /* Generic.Deleted */ - .ge { color: $solarized-dark-ge; font-style: italic; } /* Generic.Emph */ + .ge { /* Generic.Emph */ + color: $solarized-dark-ge; + font-style: italic; + } .gr { color: $solarized-dark-gr; } /* Generic.Error */ .gh { color: $solarized-dark-gh; } /* Generic.Heading */ .gi { color: $solarized-dark-gi; } /* Generic.Inserted */ .go { color: $solarized-dark-go; } /* Generic.Output */ .gp { color: $solarized-dark-gp; } /* Generic.Prompt */ - .gs { color: $solarized-dark-gs; font-weight: $gl-font-weight-bold; } /* Generic.Strong */ + .gs { /* Generic.Strong */ + color: $solarized-dark-gs; + font-weight: $gl-font-weight-bold; + } .gu { color: $solarized-dark-gu; } /* Generic.Subheading */ .gt { color: $solarized-dark-gt; } /* Generic.Traceback */ .kc { color: $solarized-dark-kc; } /* Keyword.Constant */ diff --git a/app/assets/stylesheets/highlight/themes/solarized-light.scss b/app/assets/stylesheets/highlight/themes/solarized-light.scss index 993370642c3..71d8dd06834 100644 --- a/app/assets/stylesheets/highlight/themes/solarized-light.scss +++ b/app/assets/stylesheets/highlight/themes/solarized-light.scss @@ -1,6 +1,6 @@ /* https://gist.github.com/qguv/7936275 */ -@import "../common"; +@import '../common'; /* * Solarized light syntax colors @@ -252,13 +252,19 @@ $solarized-light-il: #2aa198; .c1 { color: $solarized-light-c1; } /* Comment.Single */ .cs { color: $solarized-light-cs; } /* Comment.Special */ .gd { color: $solarized-light-gd; } /* Generic.Deleted */ - .ge { color: $solarized-light-ge; font-style: italic; } /* Generic.Emph */ + .ge { /* Generic.Emph */ + color: $solarized-light-ge; + font-style: italic; + } .gr { color: $solarized-light-gr; } /* Generic.Error */ .gh { color: $solarized-light-gh; } /* Generic.Heading */ .gi { color: $solarized-light-gi; } /* Generic.Inserted */ .go { color: $solarized-light-go; } /* Generic.Output */ .gp { color: $solarized-light-gp; } /* Generic.Prompt */ - .gs { color: $solarized-light-gs; font-weight: $gl-font-weight-bold; } /* Generic.Strong */ + .gs { /* Generic.Strong */ + color: $solarized-light-gs; + font-weight: $gl-font-weight-bold; + } .gu { color: $solarized-light-gu; } /* Generic.Subheading */ .gt { color: $solarized-light-gt; } /* Generic.Traceback */ .kc { color: $solarized-light-kc; } /* Keyword.Constant */ diff --git a/app/assets/stylesheets/highlight/themes/white.scss b/app/assets/stylesheets/highlight/themes/white.scss index 7239086f649..6362dd734f6 100644 --- a/app/assets/stylesheets/highlight/themes/white.scss +++ b/app/assets/stylesheets/highlight/themes/white.scss @@ -1,3 +1,3 @@ .code.white { - @import "../white_base"; + @import '../white_base'; } |