Commit ffee5bb090c3723bb57e6858d32e9c34baba9912
1 parent
76be57fc
Exists in
spb-stable
and in
3 other branches
Improve themes. Load highlight.js properly
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
7 changed files
with
487 additions
and
152 deletions
Show diff stats
app/assets/javascripts/blob.js.coffee
@@ -17,7 +17,7 @@ class BlobView | @@ -17,7 +17,7 @@ class BlobView | ||
17 | 17 | ||
18 | setHash(hash) | 18 | setHash(hash) |
19 | e.preventDefault() | 19 | e.preventDefault() |
20 | - | 20 | + |
21 | # See if there are lines selected | 21 | # See if there are lines selected |
22 | # "#L12" and "#L34-56" supported | 22 | # "#L12" and "#L34-56" supported |
23 | highlightBlobLines = (e) -> | 23 | highlightBlobLines = (e) -> |
app/assets/javascripts/main.js.coffee
@@ -56,11 +56,12 @@ document.addEventListener("page:fetch", unbindEvents) | @@ -56,11 +56,12 @@ document.addEventListener("page:fetch", unbindEvents) | ||
56 | document.addEventListener("page:change", stopSpinner) | 56 | document.addEventListener("page:change", stopSpinner) |
57 | 57 | ||
58 | $ -> | 58 | $ -> |
59 | + $('pre code').each (i, e) -> | ||
60 | + hljs.highlightBlock(e) | ||
61 | + | ||
59 | # Click a .one_click_select field, select the contents | 62 | # Click a .one_click_select field, select the contents |
60 | $(".one_click_select").on 'click', -> $(@).select() | 63 | $(".one_click_select").on 'click', -> $(@).select() |
61 | 64 | ||
62 | - hljs.initHighlightingOnLoad() | ||
63 | - | ||
64 | $('.remove-row').bind 'ajax:success', -> | 65 | $('.remove-row').bind 'ajax:success', -> |
65 | $(this).closest('li').fadeOut() | 66 | $(this).closest('li').fadeOut() |
66 | 67 |
app/assets/stylesheets/generic/files.scss
@@ -158,6 +158,11 @@ | @@ -158,6 +158,11 @@ | ||
158 | font-size: 12px !important; | 158 | font-size: 12px !important; |
159 | line-height: 16px !important; | 159 | line-height: 16px !important; |
160 | margin: 0; | 160 | margin: 0; |
161 | + | ||
162 | + code { | ||
163 | + white-space: pre; | ||
164 | + word-wrap: normal; | ||
165 | + } | ||
161 | } | 166 | } |
162 | 167 | ||
163 | .hljs { | 168 | .hljs { |
@@ -171,6 +176,7 @@ | @@ -171,6 +176,7 @@ | ||
171 | width: 60px; | 176 | width: 60px; |
172 | 177 | ||
173 | a { | 178 | a { |
179 | + font-family: $monospace_font; | ||
174 | display: block; | 180 | display: block; |
175 | font-size: 12px !important; | 181 | font-size: 12px !important; |
176 | line-height: 16px !important; | 182 | line-height: 16px !important; |
app/assets/stylesheets/highlight/dark.scss
1 | -.dark .highlight { | 1 | +.dark { |
2 | + background-color: #232323; | ||
2 | 3 | ||
3 | - background-color: #333; | 4 | + .highlight{ |
5 | + border-left: 1px solid #444; | ||
6 | + } | ||
7 | + | ||
8 | + .line-numbers a { | ||
9 | + color: #666; | ||
10 | + } | ||
4 | 11 | ||
5 | pre { | 12 | pre { |
6 | - background-color: #333; | ||
7 | - color: #eee; | ||
8 | - } | ||
9 | - | ||
10 | - .hll { display: block; background-color: darken($hover, 65%) } | ||
11 | - .c { color: #888888; font-style: italic } /* Comment */ | ||
12 | - .err { color: #a61717; background-color: #e3d2d2 } /* Error */ | ||
13 | - .k { color: #CDA869; font-weight: bold } /* Keyword */ | ||
14 | - .kp { color: #CDA869; font-weight: bold } /* Keyword */ | ||
15 | - .cm { color: #888888 } /* Comment.Multiline */ | ||
16 | - .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ | ||
17 | - .c1 { color: #888888 } /* Comment.Single */ | ||
18 | - .cs { color: #cc0000; font-weight: bold; background-color: transparent } /* Comment.Special */ | ||
19 | - .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ | ||
20 | - .ge { font-style: italic } /* Generic.Emph */ | ||
21 | - .gr { color: #aa0000 } /* Generic.Error */ | ||
22 | - .gh { color: #303030 } /* Generic.Heading */ | ||
23 | - .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ | ||
24 | - .go { color: #888888 } /* Generic.Output */ | ||
25 | - .gp { color: #555555 } /* Generic.Prompt */ | ||
26 | - .gs { font-weight: bold } /* Generic.Strong */ | ||
27 | - .gu { color: #606060 } /* Generic.Subheading */ | ||
28 | - .gt { color: #aa0000 } /* Generic.Traceback */ | ||
29 | - .kc{font-weight: bold;} /* Keyword.Constant */ | ||
30 | - .kd{font-weight: bold;} /* Keyword.Declaration */ | ||
31 | - .kn{font-weight: bold;} /* Keyword.Namespace */ | ||
32 | - .kp{font-weight: bold;} /* Keyword.Pseudo */ | ||
33 | - .kr{font-weight: bold;} /* Keyword.Reserved */ | ||
34 | - .kt{color: #458;font-weight: bold;} /* Keyword.Type */ | ||
35 | - .m { color: #0000DD; font-weight: bold } /* Literal.Number */ | ||
36 | - .p { color: #eee; } | ||
37 | - .s { color: #0AD; background-color: transparent } /* Literal.String */ | ||
38 | - .na{color: #008080;} /* Name.Attribute */ | ||
39 | - .nb{color: #0086B3;} /* Name.Builtin */ | ||
40 | - .nc{color: #ccc;font-weight: bold;} /* Name.Class */ | ||
41 | - .no{color: turquoise;} /* Name.Constant */ | ||
42 | - .ni{color: #800080;} | ||
43 | - .ne{color: #900;font-weight: bold;} /* Name.Exception */ | ||
44 | - .nf{color: #ccc;font-weight: bold;} /* Name.Function */ | ||
45 | - .nn{color: #79C3E0;font-weight: bold;} /* Name.Namespace */ | ||
46 | - .nt{color: #fc5;} /* Name.Tag */ | ||
47 | - .nv{color: #FA4;} /* Name.Variable */ | ||
48 | - .py { color: #336699; font-weight: bold } /* Name.Property */ | ||
49 | - .ow { color: #008800 } /* Operator.Word */ | ||
50 | - .w { color: #bbbbbb } /* Text.Whitespace */ | ||
51 | - .mf { color: #7AC; font-weight: bold } /* Literal.Number.Float */ | ||
52 | - .mh { color: #7AC; font-weight: bold } /* Literal.Number.Hex */ | ||
53 | - .mi {color: #099;} /* Literal.Number.Integer */ | ||
54 | - .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ | ||
55 | - .sb { color: #dd2200; background-color: transparent; } /* Literal.String.Backtick */ | ||
56 | - .sc{color: #d14;} /* Literal.String.Char */ | ||
57 | - .sd { color: #dd2200; background-color: transparent; } /* Literal.String.Doc */ | ||
58 | - .s2{color: orange;} /* Literal.String.Double */ | ||
59 | - .se{color: orange;} /* Literal.String.Escape */ | ||
60 | - .sh{color: orange;} /* Literal.String.Heredoc */ | ||
61 | - .si{color: orange;} /* Literal.String.Interpol */ | ||
62 | - .sx{color: orange;} /* Literal.String.Other */ | ||
63 | - .sr{color: orange;} /* Literal.String.Regex */ | ||
64 | - .s1{color: orange;} /* Literal.String.Single */ | ||
65 | - .ss{color: orange;} /* Literal.String.Symbol */ | ||
66 | - .bp { color: #D58 } /* Name.Builtin.Pseudo */ | ||
67 | - .vc { color: #336699 } /* Name.Variable.Class */ | ||
68 | - .vg { color: #dd7700 } /* Name.Variable.Global */ | ||
69 | - .vi { color: cyan } | ||
70 | -} | 13 | + background-color: #232323; |
14 | + } | ||
15 | + | ||
16 | + .hljs { | ||
17 | + display: block; | ||
18 | + padding: 0.5em; | ||
19 | + background: #232323; | ||
20 | + color: #E6E1DC; | ||
21 | + } | ||
22 | + | ||
23 | + .hljs-comment, | ||
24 | + .hljs-template_comment, | ||
25 | + .hljs-javadoc, | ||
26 | + .hljs-shebang { | ||
27 | + color: #BC9458; | ||
28 | + font-style: italic; | ||
29 | + } | ||
30 | + | ||
31 | + .hljs-keyword, | ||
32 | + .ruby .hljs-function .hljs-keyword, | ||
33 | + .hljs-request, | ||
34 | + .hljs-status, | ||
35 | + .nginx .hljs-title, | ||
36 | + .method, | ||
37 | + .hljs-list .hljs-title { | ||
38 | + color: #C26230; | ||
39 | + } | ||
40 | + | ||
41 | + .hljs-string, | ||
42 | + .hljs-number, | ||
43 | + .hljs-regexp, | ||
44 | + .hljs-tag .hljs-value, | ||
45 | + .hljs-cdata, | ||
46 | + .hljs-filter .hljs-argument, | ||
47 | + .hljs-attr_selector, | ||
48 | + .apache .hljs-cbracket, | ||
49 | + .hljs-date, | ||
50 | + .tex .hljs-command, | ||
51 | + .markdown .hljs-link_label { | ||
52 | + color: #A5C261; | ||
53 | + } | ||
54 | + | ||
55 | + .hljs-subst { | ||
56 | + color: #519F50; | ||
57 | + } | ||
58 | + | ||
59 | + .hljs-tag, | ||
60 | + .hljs-tag .hljs-keyword, | ||
61 | + .hljs-tag .hljs-title, | ||
62 | + .hljs-doctype, | ||
63 | + .hljs-sub .hljs-identifier, | ||
64 | + .hljs-pi, | ||
65 | + .input_number { | ||
66 | + color: #E8BF6A; | ||
67 | + } | ||
68 | + | ||
69 | + .hljs-identifier { | ||
70 | + color: #D0D0FF; | ||
71 | + } | ||
72 | + | ||
73 | + .hljs-class .hljs-title, | ||
74 | + .haskell .hljs-type, | ||
75 | + .smalltalk .hljs-class, | ||
76 | + .hljs-javadoctag, | ||
77 | + .hljs-yardoctag, | ||
78 | + .hljs-phpdoc { | ||
79 | + text-decoration: none; | ||
80 | + } | ||
81 | + | ||
82 | + .hljs-constant { | ||
83 | + color: #DA4939; | ||
84 | + } | ||
85 | + | ||
86 | + | ||
87 | + .hljs-symbol, | ||
88 | + .hljs-built_in, | ||
89 | + .ruby .hljs-symbol .hljs-string, | ||
90 | + .ruby .hljs-symbol .hljs-identifier, | ||
91 | + .markdown .hljs-link_url, | ||
92 | + .hljs-attribute { | ||
93 | + color: #6D9CBE; | ||
94 | + } | ||
95 | + | ||
96 | + .markdown .hljs-link_url { | ||
97 | + text-decoration: underline; | ||
98 | + } | ||
99 | + | ||
100 | + | ||
71 | 101 | ||
102 | + .hljs-params, | ||
103 | + .hljs-variable, | ||
104 | + .clojure .hljs-attribute { | ||
105 | + color: #D0D0FF; | ||
106 | + } | ||
107 | + | ||
108 | + .css .hljs-tag, | ||
109 | + .hljs-rules .hljs-property, | ||
110 | + .hljs-pseudo, | ||
111 | + .tex .hljs-special { | ||
112 | + color: #CDA869; | ||
113 | + } | ||
114 | + | ||
115 | + .css .hljs-class { | ||
116 | + color: #9B703F; | ||
117 | + } | ||
118 | + | ||
119 | + .hljs-rules .hljs-keyword { | ||
120 | + color: #C5AF75; | ||
121 | + } | ||
122 | + | ||
123 | + .hljs-rules .hljs-value { | ||
124 | + color: #CF6A4C; | ||
125 | + } | ||
126 | + | ||
127 | + .css .hljs-id { | ||
128 | + color: #8B98AB; | ||
129 | + } | ||
130 | + | ||
131 | + .hljs-annotation, | ||
132 | + .apache .hljs-sqbracket, | ||
133 | + .nginx .hljs-built_in { | ||
134 | + color: #9B859D; | ||
135 | + } | ||
136 | + | ||
137 | + .hljs-preprocessor, | ||
138 | + .hljs-preprocessor *, | ||
139 | + .hljs-pragma { | ||
140 | + color: #8996A8 !important; | ||
141 | + } | ||
142 | + | ||
143 | + .hljs-hexcolor, | ||
144 | + .css .hljs-value .hljs-number { | ||
145 | + color: #A5C261; | ||
146 | + } | ||
147 | + | ||
148 | + .hljs-title, | ||
149 | + .hljs-decorator, | ||
150 | + .css .hljs-function { | ||
151 | + color: #FFC66D; | ||
152 | + } | ||
153 | + | ||
154 | + .diff .hljs-header, | ||
155 | + .hljs-chunk { | ||
156 | + background-color: #2F33AB; | ||
157 | + color: #E6E1DC; | ||
158 | + display: inline-block; | ||
159 | + width: 100%; | ||
160 | + } | ||
161 | + | ||
162 | + .diff .hljs-change { | ||
163 | + background-color: #4A410D; | ||
164 | + color: #F8F8F8; | ||
165 | + display: inline-block; | ||
166 | + width: 100%; | ||
167 | + } | ||
168 | + | ||
169 | + .hljs-addition { | ||
170 | + background-color: #144212; | ||
171 | + color: #E6E1DC; | ||
172 | + display: inline-block; | ||
173 | + width: 100%; | ||
174 | + } | ||
175 | + | ||
176 | + .hljs-deletion { | ||
177 | + background-color: #600; | ||
178 | + color: #E6E1DC; | ||
179 | + display: inline-block; | ||
180 | + width: 100%; | ||
181 | + } | ||
182 | + | ||
183 | + .coffeescript .javascript, | ||
184 | + .javascript .xml, | ||
185 | + .tex .hljs-formula, | ||
186 | + .xml .javascript, | ||
187 | + .xml .vbscript, | ||
188 | + .xml .css, | ||
189 | + .xml .hljs-cdata { | ||
190 | + opacity: 0.7; | ||
191 | + } | ||
192 | +} |
app/assets/stylesheets/highlight/monokai.scss
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; | 1 | +.monokai { |
2 | + background-color: #272822; | ||
9 | 3 | ||
10 | -.monokai .highlight { | 4 | + .highlight{ |
5 | + border-left: 1px solid #444; | ||
6 | + } | ||
11 | 7 | ||
12 | - background-color: #272822; | 8 | + .line-numbers a { |
9 | + color: #666; | ||
10 | + } | ||
13 | 11 | ||
14 | pre { | 12 | pre { |
15 | background-color: #272822; | 13 | background-color: #272822; |
16 | - color: $monokai-fg; | 14 | + color: #f8f8f2; |
17 | } | 15 | } |
18 | 16 | ||
19 | - .hll { background-color: darken($hover, 65%) } | ||
20 | - .c { color: $monokai-comment } /* Comment */ | ||
21 | - .err { color: $monokai-fg } /* Error */ | ||
22 | - .g { color: $monokai-fg } /* Generic */ | ||
23 | - .k { color: $monokai-pink } /* Keyword */ | ||
24 | - .l { color: $monokai-fg } /* Literal */ | ||
25 | - .n { color: $monokai-blue } /* Name */ | ||
26 | - .o { color: $monokai-fg } /* Operator */ | ||
27 | - .x { color: $monokai-fg } /* Other */ | ||
28 | - .p { color: $monokai-fg } /* Punctuation */ | ||
29 | - .cm { color: $monokai-comment } /* Comment.Multiline */ | ||
30 | - .cp { color: $monokai-comment } /* Comment.Preproc */ | ||
31 | - .c1 { color: $monokai-comment } /* Comment.Single */ | ||
32 | - .cs { color: $monokai-comment } /* Comment.Special */ | ||
33 | - .gd { color: #8b0807 } /* Generic.Deleted */ | ||
34 | - .ge { color: $monokai-fg; text-decoration: underline } /* Generic.Emph */ | ||
35 | - .gr { color: $monokai-fg } /* Generic.Error */ | ||
36 | - .gh { color: $monokai-fg; font-weight: bold } /* Generic.Heading */ | ||
37 | - .gi { color: $monokai-fg; font-weight: bold; background-color: #46830c } /* Generic.Inserted */ | ||
38 | - .go { color: $monokai-dark; background-color: #31322c } /* Generic.Output */ | ||
39 | - .gp { color: $monokai-fg } /* Generic.Prompt */ | ||
40 | - .gs { color: $monokai-fg } /* Generic.Strong */ | ||
41 | - .gu { color: $monokai-fg; font-weight: bold } /* Generic.Subheading */ | ||
42 | - .gt { color: #f8f8f0; background-color: $monokai-pink } /* Generic.Traceback */ | ||
43 | - .kc { color: $monokai-purple } /* Keyword.Constant */ | ||
44 | - .kd { color: $monokai-pink } /* Keyword.Declaration */ | ||
45 | - .kn { color: $monokai-pink } /* Keyword.Namespace */ | ||
46 | - .kp { color: $monokai-pink } /* Keyword.Pseudo */ | ||
47 | - .kr { color: $monokai-pink } /* Keyword.Reserved */ | ||
48 | - .kt { color: $monokai-fg } /* Keyword.Type */ | ||
49 | - .ld { color: $monokai-fg } /* Literal.Date */ | ||
50 | - .m { color: $monokai-purple } /* Literal.Number */ | ||
51 | - .s { color: $monokai-gold } /* Literal.String */ | ||
52 | - .na { color: $monokai-purple } /* Name.Attribute */ | ||
53 | - .nb { color: $monokai-blue } /* Name.Builtin */ | ||
54 | - .nc { color: $monokai-fg } /* Name.Class */ | ||
55 | - .no { color: $monokai-fg } /* Name.Constant */ | ||
56 | - .nd { color: $monokai-fg } /* Name.Decorator */ | ||
57 | - .ni { color: $monokai-fg } /* Name.Entity */ | ||
58 | - .ne { color: $monokai-fg } /* Name.Exception */ | ||
59 | - .nf { color: $monokai-green } /* Name.Function */ | ||
60 | - .nl { color: $monokai-gold } /* Name.Label */ | ||
61 | - .nn { color: $monokai-fg } /* Name.Namespace */ | ||
62 | - .nx { color: $monokai-fg } /* Name.Other */ | ||
63 | - .nt { color: $monokai-pink } /* Name.Tag */ | ||
64 | - .nv { color: $monokai-blue; font-style: italic } /* Name.Variable */ | ||
65 | - .py { color: $monokai-fg } /* Name.Property */ | ||
66 | - .ow { color: $monokai-pink } /* Operator.Word */ | ||
67 | - .w { color: $monokai-fg } /* Text.Whitespace */ | ||
68 | - .mf { color: $monokai-purple } /* Literal.Number.Float */ | ||
69 | - .mh { color: $monokai-purple } /* Literal.Number.Hex */ | ||
70 | - .mi { color: $monokai-purple } /* Literal.Number.Integer */ | ||
71 | - .mo { color: $monokai-purple } /* Literal.Number.Oct */ | ||
72 | - .sb { color: $monokai-gold } /* Literal.String.Backtick */ | ||
73 | - .sc { color: $monokai-gold } /* Literal.String.Char */ | ||
74 | - .sd { color: $monokai-gold } /* Literal.String.Doc */ | ||
75 | - .s2 { color: $monokai-gold } /* Literal.String.Double */ | ||
76 | - .se { color: $monokai-gold } /* Literal.String.Escape */ | ||
77 | - .sh { color: $monokai-gold } /* Literal.String.Heredoc */ | ||
78 | - .si { color: $monokai-gold } /* Literal.String.Interpol */ | ||
79 | - .sx { color: $monokai-gold } /* Literal.String.Other */ | ||
80 | - .sr { color: $monokai-gold } /* Literal.String.Regex */ | ||
81 | - .s1 { color: $monokai-gold } /* Literal.String.Single */ | ||
82 | - .ss { color: $monokai-gold } /* Literal.String.Symbol */ | ||
83 | - .bp { color: $monokai-fg } /* Name.Builtin.Pseudo */ | ||
84 | - .vc { color: $monokai-blue; font-style: italic } /* Name.Variable.Class */ | ||
85 | - .vg { color: $monokai-blue; font-style: italic } /* Name.Variable.Global */ | ||
86 | - .vi { color: $monokai-blue; font-style: italic } /* Name.Variable.Instance */ | ||
87 | - .il { color: $monokai-purple } /* Literal.Number.Integer.Long */ | ||
88 | -} | 17 | + .hljs { |
18 | + display: block; padding: 0.5em; | ||
19 | + background: #272822; | ||
20 | + } | ||
21 | + | ||
22 | + .hljs-tag, | ||
23 | + .hljs-tag .hljs-title, | ||
24 | + .hljs-keyword, | ||
25 | + .hljs-literal, | ||
26 | + .hljs-strong, | ||
27 | + .hljs-change, | ||
28 | + .hljs-winutils, | ||
29 | + .hljs-flow, | ||
30 | + .lisp .hljs-title, | ||
31 | + .clojure .hljs-built_in, | ||
32 | + .nginx .hljs-title, | ||
33 | + .tex .hljs-special { | ||
34 | + color: #F92672; | ||
35 | + } | ||
36 | + | ||
37 | + .hljs { | ||
38 | + color: #DDD; | ||
39 | + } | ||
40 | + | ||
41 | + .hljs .hljs-constant, | ||
42 | + .asciidoc .hljs-code { | ||
43 | + color: #66D9EF; | ||
44 | + } | ||
89 | 45 | ||
46 | + .hljs-code, | ||
47 | + .hljs-class .hljs-title, | ||
48 | + .hljs-header { | ||
49 | + color: white; | ||
50 | + } | ||
51 | + | ||
52 | + .hljs-link_label, | ||
53 | + .hljs-attribute, | ||
54 | + .hljs-symbol, | ||
55 | + .hljs-symbol .hljs-string, | ||
56 | + .hljs-value, | ||
57 | + .hljs-regexp { | ||
58 | + color: #BF79DB; | ||
59 | + } | ||
60 | + | ||
61 | + .hljs-link_url, | ||
62 | + .hljs-tag .hljs-value, | ||
63 | + .hljs-string, | ||
64 | + .hljs-bullet, | ||
65 | + .hljs-subst, | ||
66 | + .hljs-title, | ||
67 | + .hljs-emphasis, | ||
68 | + .haskell .hljs-type, | ||
69 | + .hljs-preprocessor, | ||
70 | + .hljs-pragma, | ||
71 | + .ruby .hljs-class .hljs-parent, | ||
72 | + .hljs-built_in, | ||
73 | + .sql .hljs-aggregate, | ||
74 | + .django .hljs-template_tag, | ||
75 | + .django .hljs-variable, | ||
76 | + .smalltalk .hljs-class, | ||
77 | + .hljs-javadoc, | ||
78 | + .django .hljs-filter .hljs-argument, | ||
79 | + .smalltalk .hljs-localvars, | ||
80 | + .smalltalk .hljs-array, | ||
81 | + .hljs-attr_selector, | ||
82 | + .hljs-pseudo, | ||
83 | + .hljs-addition, | ||
84 | + .hljs-stream, | ||
85 | + .hljs-envvar, | ||
86 | + .apache .hljs-tag, | ||
87 | + .apache .hljs-cbracket, | ||
88 | + .tex .hljs-command, | ||
89 | + .hljs-prompt { | ||
90 | + color: #A6E22E; | ||
91 | + } | ||
92 | + | ||
93 | + .hljs-comment, | ||
94 | + .java .hljs-annotation, | ||
95 | + .smartquote, | ||
96 | + .hljs-blockquote, | ||
97 | + .hljs-horizontal_rule, | ||
98 | + .python .hljs-decorator, | ||
99 | + .hljs-template_comment, | ||
100 | + .hljs-pi, | ||
101 | + .hljs-doctype, | ||
102 | + .hljs-deletion, | ||
103 | + .hljs-shebang, | ||
104 | + .apache .hljs-sqbracket, | ||
105 | + .tex .hljs-formula { | ||
106 | + color: #75715E; | ||
107 | + } | ||
108 | + | ||
109 | + .hljs-keyword, | ||
110 | + .hljs-literal, | ||
111 | + .css .hljs-id, | ||
112 | + .hljs-phpdoc, | ||
113 | + .hljs-title, | ||
114 | + .hljs-header, | ||
115 | + .haskell .hljs-type, | ||
116 | + .vbscript .hljs-built_in, | ||
117 | + .sql .hljs-aggregate, | ||
118 | + .rsl .hljs-built_in, | ||
119 | + .smalltalk .hljs-class, | ||
120 | + .diff .hljs-header, | ||
121 | + .hljs-chunk, | ||
122 | + .hljs-winutils, | ||
123 | + .bash .hljs-variable, | ||
124 | + .apache .hljs-tag, | ||
125 | + .tex .hljs-special, | ||
126 | + .hljs-request, | ||
127 | + .hljs-status { | ||
128 | + font-weight: bold; | ||
129 | + } | ||
130 | + | ||
131 | + .coffeescript .javascript, | ||
132 | + .javascript .xml, | ||
133 | + .tex .hljs-formula, | ||
134 | + .xml .javascript, | ||
135 | + .xml .vbscript, | ||
136 | + .xml .css, | ||
137 | + .xml .hljs-cdata { | ||
138 | + opacity: 0.5; | ||
139 | + } | ||
140 | +} |
app/assets/stylesheets/highlight/solarized_dark.scss
app/assets/stylesheets/highlight/white.scss
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | background-color: #fff; | 2 | background-color: #fff; |
3 | 3 | ||
4 | .highlight{ | 4 | .highlight{ |
5 | - border-left: 1px solid #ddd; | 5 | + border-left: 1px solid #eee; |
6 | } | 6 | } |
7 | 7 | ||
8 | pre { | 8 | pre { |
@@ -17,6 +17,158 @@ | @@ -17,6 +17,158 @@ | ||
17 | .line-numbers a { | 17 | .line-numbers a { |
18 | color: #999; | 18 | color: #999; |
19 | } | 19 | } |
20 | + | ||
21 | + .hljs { | ||
22 | + display: block; padding: 0.5em; | ||
23 | + background: #fff; color: black; | ||
24 | + } | ||
25 | + | ||
26 | + .hljs-comment, | ||
27 | + .hljs-template_comment, | ||
28 | + .hljs-javadoc, | ||
29 | + .hljs-comment * { | ||
30 | + color: #006a00; | ||
31 | + } | ||
32 | + | ||
33 | + .hljs-keyword, | ||
34 | + .hljs-literal, | ||
35 | + .nginx .hljs-title { | ||
36 | + color: #aa0d91; | ||
37 | + } | ||
38 | + .method, | ||
39 | + .hljs-list .hljs-title, | ||
40 | + .hljs-tag .hljs-title, | ||
41 | + .setting .hljs-value, | ||
42 | + .hljs-winutils, | ||
43 | + .tex .hljs-command, | ||
44 | + .http .hljs-title, | ||
45 | + .hljs-request, | ||
46 | + .hljs-status { | ||
47 | + color: #008; | ||
48 | + } | ||
49 | + | ||
50 | + .hljs-envvar, | ||
51 | + .tex .hljs-special { | ||
52 | + color: #660; | ||
53 | + } | ||
54 | + | ||
55 | + .hljs-string { | ||
56 | + color: #c41a16; | ||
57 | + } | ||
58 | + .hljs-tag .hljs-value, | ||
59 | + .hljs-cdata, | ||
60 | + .hljs-filter .hljs-argument, | ||
61 | + .hljs-attr_selector, | ||
62 | + .apache .hljs-cbracket, | ||
63 | + .hljs-date, | ||
64 | + .hljs-regexp { | ||
65 | + color: #080; | ||
66 | + } | ||
67 | + | ||
68 | + .hljs-sub .hljs-identifier, | ||
69 | + .hljs-pi, | ||
70 | + .hljs-tag, | ||
71 | + .hljs-tag .hljs-keyword, | ||
72 | + .hljs-decorator, | ||
73 | + .ini .hljs-title, | ||
74 | + .hljs-shebang, | ||
75 | + .hljs-prompt, | ||
76 | + .hljs-hexcolor, | ||
77 | + .hljs-rules .hljs-value, | ||
78 | + .hljs-symbol, | ||
79 | + .hljs-symbol .hljs-string, | ||
80 | + .hljs-number, | ||
81 | + .css .hljs-function, | ||
82 | + .clojure .hljs-title, | ||
83 | + .clojure .hljs-built_in, | ||
84 | + .hljs-function .hljs-title, | ||
85 | + .coffeescript .hljs-attribute { | ||
86 | + color: #1c00cf; | ||
87 | + } | ||
88 | + | ||
89 | + .hljs-class .hljs-title, | ||
90 | + .haskell .hljs-type, | ||
91 | + .smalltalk .hljs-class, | ||
92 | + .hljs-javadoctag, | ||
93 | + .hljs-yardoctag, | ||
94 | + .hljs-phpdoc, | ||
95 | + .hljs-typename, | ||
96 | + .hljs-tag .hljs-attribute, | ||
97 | + .hljs-doctype, | ||
98 | + .hljs-class .hljs-id, | ||
99 | + .hljs-built_in, | ||
100 | + .setting, | ||
101 | + .hljs-params, | ||
102 | + .clojure .hljs-attribute { | ||
103 | + color: #5c2699; | ||
104 | + } | ||
105 | + | ||
106 | + .hljs-variable { | ||
107 | + color: #3f6e74; | ||
108 | + } | ||
109 | + .css .hljs-tag, | ||
110 | + .hljs-rules .hljs-property, | ||
111 | + .hljs-pseudo, | ||
112 | + .hljs-subst { | ||
113 | + color: #000; | ||
114 | + } | ||
115 | + | ||
116 | + .css .hljs-class, | ||
117 | + .css .hljs-id { | ||
118 | + color: #9B703F; | ||
119 | + } | ||
120 | + | ||
121 | + .hljs-value .hljs-important { | ||
122 | + color: #ff7700; | ||
123 | + font-weight: bold; | ||
124 | + } | ||
125 | + | ||
126 | + .hljs-rules .hljs-keyword { | ||
127 | + color: #C5AF75; | ||
128 | + } | ||
129 | + | ||
130 | + .hljs-annotation, | ||
131 | + .apache .hljs-sqbracket, | ||
132 | + .nginx .hljs-built_in { | ||
133 | + color: #9B859D; | ||
134 | + } | ||
135 | + | ||
136 | + .hljs-preprocessor, | ||
137 | + .hljs-preprocessor *, | ||
138 | + .hljs-pragma { | ||
139 | + color: #643820; | ||
140 | + } | ||
141 | + | ||
142 | + .tex .hljs-formula { | ||
143 | + background-color: #EEE; | ||
144 | + font-style: italic; | ||
145 | + } | ||
146 | + | ||
147 | + .diff .hljs-header, | ||
148 | + .hljs-chunk { | ||
149 | + color: #808080; | ||
150 | + font-weight: bold; | ||
151 | + } | ||
152 | + | ||
153 | + .diff .hljs-change { | ||
154 | + background-color: #BCCFF9; | ||
155 | + } | ||
156 | + | ||
157 | + .hljs-addition { | ||
158 | + background-color: #BAEEBA; | ||
159 | + } | ||
160 | + | ||
161 | + .hljs-deletion { | ||
162 | + background-color: #FFC8BD; | ||
163 | + } | ||
164 | + | ||
165 | + .hljs-comment .hljs-yardoctag { | ||
166 | + font-weight: bold; | ||
167 | + } | ||
168 | + | ||
169 | + .method .hljs-id { | ||
170 | + color: #000; | ||
171 | + } | ||
20 | } | 172 | } |
21 | 173 | ||
22 | .shadow { | 174 | .shadow { |