Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-20 15:09:35 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-20 15:09:35 +0300
commit76e4e8f1b0629f8af2c627ae34901df77073e3c9 (patch)
treef5744161137b5e8c5d0de992c7585828ce52676c /app/assets/stylesheets
parent79347b42ae647fca1c1b2e514a93d36d422068d3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/highlight/themes/monokai.scss1
-rw-r--r--app/assets/stylesheets/highlight/themes/solarized-dark.scss1
-rw-r--r--app/assets/stylesheets/highlight/themes/solarized-light.scss1
3 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/themes/monokai.scss b/app/assets/stylesheets/highlight/themes/monokai.scss
index 226bb44f0e7..270f81c5cba 100644
--- a/app/assets/stylesheets/highlight/themes/monokai.scss
+++ b/app/assets/stylesheets/highlight/themes/monokai.scss
@@ -1,6 +1,7 @@
/* https://github.com/richleland/pygments-css/blob/master/monokai.css */
@import '../common';
+@import 'highlight.js/styles/base16/monokai.css';
/*
* Monokai Colors
diff --git a/app/assets/stylesheets/highlight/themes/solarized-dark.scss b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
index acd401e1694..d01706446c0 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-dark.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-dark.scss
@@ -1,6 +1,7 @@
/* https://gist.github.com/qguv/7936275 */
@import '../common';
+@import 'highlight.js/styles/base16/solarized-dark.css';
/*
* Solarized dark colors
diff --git a/app/assets/stylesheets/highlight/themes/solarized-light.scss b/app/assets/stylesheets/highlight/themes/solarized-light.scss
index ddcecc4cbcf..a4ce29b7bad 100644
--- a/app/assets/stylesheets/highlight/themes/solarized-light.scss
+++ b/app/assets/stylesheets/highlight/themes/solarized-light.scss
@@ -1,6 +1,7 @@
/* https://gist.github.com/qguv/7936275 */
@import '../common';
+@import 'highlight.js/styles/base16/solarized-light.css';
/*
* Solarized light syntax colors