diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-03-11 21:41:36 +0300 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-03-11 21:41:36 +0300 |
| commit | 1647994adade890fbb2d8276c1bb99e6ec909fb8 (patch) | |
| tree | 2a5743c358b353141aca444969bc4bdbeedcd99c /app/assets/stylesheets/highlight/white.scss | |
| parent | b2f656796179d4ea8ef3295fa4cf2c6780bcd25e (diff) | |
| parent | 4218a2bfcf7a3f864268c3eafe8ead28bb7808d8 (diff) | |
Merge branch 'fix-code-preview' into 'master'
Fix code preview theme setting for comments, issues, merge requests, and snippets
User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.
Closes #1139
See merge request !357
Diffstat (limited to 'app/assets/stylesheets/highlight/white.scss')
| -rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index c8217d3e6bf..a52ffc971d1 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -1,6 +1,10 @@ /* https://github.com/aahan/pygments-github-style */ +pre.code.highlight.white, .code.white { + background-color: #fff; + color: #333; + pre.highlight, .line-numbers, .line-numbers a { |