Commit 1812c1d4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'improved-monokai' into 'master'

Improve Monokai highlight style to match original

The current monokai style is not very true to the original and lacks colors for certain syntactic items as mentioned in ticket https://github.com/gitlabhq/gitlabhq/issues/6855. This change's goal is to bring the monokai highlight style in line with the original design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/

Before:
![monokai-old](https://gitlab.com/uploads/klowner/gitlab-ce/ce96c7d7c2/monokai-old.png)

After:
![monokai](https://gitlab.com/uploads/klowner/gitlab-ce/b257a8143a/monokai.png)

See merge request !238
parents 94ea4f42 9a8ffadc
......@@ -7,6 +7,7 @@ v 7.6.0
- Add optional Sidekiq MemoryKiller middleware (enabled via SIDEKIQ_MAX_RSS env variable)
-
-
- Monokai highlighting style now more faithful to original design (Mark Riedesel)
- Create project with repository in synchrony
- Added ability to create empty repo or import existing one if project does not have repository
-
......
......@@ -29,28 +29,30 @@
.hljs-tag,
.hljs-tag .hljs-title,
.hljs-keyword,
.hljs-literal,
.hljs-strong,
.hljs-change,
.hljs-winutils,
.hljs-flow,
.lisp .hljs-title,
.clojure .hljs-built_in,
.hljs-keyword,
.nginx .hljs-title,
.tex .hljs-special {
color: #F92672;
}
.hljs {
color: #DDD;
color: #F8F8F2;
}
.hljs .hljs-constant,
.asciidoc .hljs-code {
.asciidoc .hljs-code,
.markdown .hljs-code,
.hljs-literal,
.hljs-function .hljs-keyword {
color: #66D9EF;
}
.hljs-code,
.hljs-class .hljs-title,
.hljs-header {
......@@ -62,18 +64,27 @@
.hljs-symbol,
.hljs-symbol .hljs-string,
.hljs-value,
.hljs-constant,
.hljs-number,
.hljs-regexp {
color: #BF79DB;
color: #AE81FF;
}
.hljs-string {
color: #E6DB74;
}
.hljs-params {
color: #fd971f;
}
.hljs-link_url,
.hljs-tag .hljs-value,
.hljs-string,
.hljs-bullet,
.hljs-subst,
.hljs-title,
.hljs-emphasis,
.haskell .hljs-type,
.hljs-type,
.hljs-preprocessor,
.hljs-pragma,
.ruby .hljs-class .hljs-parent,
......@@ -99,12 +110,12 @@
}
.hljs-comment,
.java .hljs-annotation,
.hljs-annotation,
.smartquote,
.hljs-blockquote,
.hljs-horizontal_rule,
.python .hljs-decorator,
.hljs-template_comment,
.hljs-decorator,
.hljs-pi,
.hljs-doctype,
.hljs-deletion,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment