Download as
Browse Code »

Commit 561ac35553d23d000f75cda4450dba94e84053dc

Authored by Dmitriy Zaporozhets
2 parents f58d55da d4688af3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #3692 from szechyjs/master 

Add monokai highlighting theme
Showing 5 changed files with 93 additions and 0 deletions   Show diff stats
app/assets/images/monokai.png 0 → 100644
View file @561ac35

6.5 KB
app/assets/stylesheets/application.scss
  Diff comments   View file @561ac35
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
41 @import "highlight/white.scss"; 41 @import "highlight/white.scss";
42 @import "highlight/dark.scss"; 42 @import "highlight/dark.scss";
43 @import "highlight/solarized_dark.scss"; 43 @import "highlight/solarized_dark.scss";
  44 +@import "highlight/monokai.scss";
44 45
45 /** 46 /**
46 * UI themes: 47 * UI themes:
app/assets/stylesheets/highlight/monokai.scss 0 → 100644
  Diff comments   View file @561ac35
@@ -0,0 +1,86 @@ @@ -0,0 +1,86 @@
  1 +$monokai-fg: #f8f8f2;
  2 +$monokai-comment: #75715e;
  3 +$monokai-pink: #f92672;
  4 +$monokai-blue: #66d9ef;
  5 +$monokai-green: #a6e22e;
  6 +$monokai-gold: #e6db74;
  7 +$monokai-dark: #3b3a32;
  8 +$monokai-purple: #ae81ff;
  9 +
  10 +.monokai .highlight {
  11 + pre {
  12 + background-color: #272822;
  13 + color: $monokai-fg;
  14 + }
  15 +
  16 + .hll { background-color: #ffffcc }
  17 + .c { color: $monokai-comment } /* Comment */
  18 + .err { color: $monokai-fg } /* Error */
  19 + .g { color: $monokai-fg } /* Generic */
  20 + .k { color: $monokai-pink } /* Keyword */
  21 + .l { color: $monokai-fg } /* Literal */
  22 + .n { color: $monokai-blue } /* Name */
  23 + .o { color: $monokai-fg } /* Operator */
  24 + .x { color: $monokai-fg } /* Other */
  25 + .p { color: $monokai-fg } /* Punctuation */
  26 + .cm { color: $monokai-comment } /* Comment.Multiline */
  27 + .cp { color: $monokai-comment } /* Comment.Preproc */
  28 + .c1 { color: $monokai-comment } /* Comment.Single */
  29 + .cs { color: $monokai-comment } /* Comment.Special */
  30 + .gd { color: #8b0807 } /* Generic.Deleted */
  31 + .ge { color: $monokai-fg; text-decoration: underline } /* Generic.Emph */
  32 + .gr { color: $monokai-fg } /* Generic.Error */
  33 + .gh { color: $monokai-fg; font-weight: bold } /* Generic.Heading */
  34 + .gi { color: $monokai-fg; font-weight: bold; background-color: #46830c } /* Generic.Inserted */
  35 + .go { color: $monokai-dark; background-color: #31322c } /* Generic.Output */
  36 + .gp { color: $monokai-fg } /* Generic.Prompt */
  37 + .gs { color: $monokai-fg } /* Generic.Strong */
  38 + .gu { color: $monokai-fg; font-weight: bold } /* Generic.Subheading */
  39 + .gt { color: #f8f8f0; background-color: $monokai-pink } /* Generic.Traceback */
  40 + .kc { color: $monokai-purple } /* Keyword.Constant */
  41 + .kd { color: $monokai-pink } /* Keyword.Declaration */
  42 + .kn { color: $monokai-pink } /* Keyword.Namespace */
  43 + .kp { color: $monokai-pink } /* Keyword.Pseudo */
  44 + .kr { color: $monokai-pink } /* Keyword.Reserved */
  45 + .kt { color: $monokai-fg } /* Keyword.Type */
  46 + .ld { color: $monokai-fg } /* Literal.Date */
  47 + .m { color: $monokai-purple } /* Literal.Number */
  48 + .s { color: $monokai-gold } /* Literal.String */
  49 + .na { color: $monokai-purple } /* Name.Attribute */
  50 + .nb { color: $monokai-blue } /* Name.Builtin */
  51 + .nc { color: $monokai-fg } /* Name.Class */
  52 + .no { color: $monokai-fg } /* Name.Constant */
  53 + .nd { color: $monokai-fg } /* Name.Decorator */
  54 + .ni { color: $monokai-fg } /* Name.Entity */
  55 + .ne { color: $monokai-fg } /* Name.Exception */
  56 + .nf { color: $monokai-green } /* Name.Function */
  57 + .nl { color: $monokai-gold } /* Name.Label */
  58 + .nn { color: $monokai-fg } /* Name.Namespace */
  59 + .nx { color: $monokai-fg } /* Name.Other */
  60 + .nt { color: $monokai-pink } /* Name.Tag */
  61 + .nv { color: $monokai-blue; font-style: italic } /* Name.Variable */
  62 + .py { color: $monokai-fg } /* Name.Property */
  63 + .ow { color: $monokai-pink } /* Operator.Word */
  64 + .w { color: $monokai-fg } /* Text.Whitespace */
  65 + .mf { color: $monokai-purple } /* Literal.Number.Float */
  66 + .mh { color: $monokai-purple } /* Literal.Number.Hex */
  67 + .mi { color: $monokai-purple } /* Literal.Number.Integer */
  68 + .mo { color: $monokai-purple } /* Literal.Number.Oct */
  69 + .sb { color: $monokai-gold } /* Literal.String.Backtick */
  70 + .sc { color: $monokai-gold } /* Literal.String.Char */
  71 + .sd { color: $monokai-gold } /* Literal.String.Doc */
  72 + .s2 { color: $monokai-gold } /* Literal.String.Double */
  73 + .se { color: $monokai-gold } /* Literal.String.Escape */
  74 + .sh { color: $monokai-gold } /* Literal.String.Heredoc */
  75 + .si { color: $monokai-gold } /* Literal.String.Interpol */
  76 + .sx { color: $monokai-gold } /* Literal.String.Other */
  77 + .sr { color: $monokai-gold } /* Literal.String.Regex */
  78 + .s1 { color: $monokai-gold } /* Literal.String.Single */
  79 + .ss { color: $monokai-gold } /* Literal.String.Symbol */
  80 + .bp { color: $monokai-fg } /* Name.Builtin.Pseudo */
  81 + .vc { color: $monokai-blue; font-style: italic } /* Name.Variable.Class */
  82 + .vg { color: $monokai-blue; font-style: italic } /* Name.Variable.Global */
  83 + .vi { color: $monokai-blue; font-style: italic } /* Name.Variable.Instance */
  84 + .il { color: $monokai-purple } /* Literal.Number.Integer.Long */
  85 +}
  86 +
app/helpers/application_helper.rb
  Diff comments   View file @561ac35
@@ -132,6 +132,7 @@ module ApplicationHelper @@ -132,6 +132,7 @@ module ApplicationHelper
132 when 1 then 'white' 132 when 1 then 'white'
133 when 2 then 'black' 133 when 2 then 'black'
134 when 3 then 'solarized-dark' 134 when 3 then 'solarized-dark'
  135 + when 4 then 'monokai'
135 else 136 else
136 'white' 137 'white'
137 end 138 end
app/views/profiles/design.html.haml
  Diff comments   View file @561ac35
@@ -55,3 +55,8 @@ @@ -55,3 +55,8 @@
55 = image_tag "solarized_dark.png" 55 = image_tag "solarized_dark.png"
56 = f.radio_button :color_scheme_id, 3 56 = f.radio_button :color_scheme_id, 3
57 Solarized Dark 57 Solarized Dark
  58 + = label_tag do
  59 + .prev
  60 + = image_tag "monokai.png"
  61 + = f.radio_button :color_scheme_id, 4
  62 + Monokai