From 9a8ffadc39bf3d9742d4c623d261bee4c6d9e5bf Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Thu, 13 Nov 2014 12:40:55 -0600
Subject: [PATCH] Improve Monokai highlight style to match original
The current monokai style in highlightjs is not very true to the
original and lacks colors for certain syntactic items. This change's
goal is to bring the highlightjs monokai style in line with the original
design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/
---
CHANGELOG | 1 +
app/assets/stylesheets/highlight/monokai.scss | 31 +++++++++++++------
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index c9ac79566bd..c8fae4588f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
-
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss
index 36bc5df2f44..dffa2dc9ed2 100644
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -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,
--
GitLab