Skip to content

Commit 8e77d14

Browse files
barryclarkbarryclark
committed
Merge pull request barryclark#76 from rnicholus/syntax-highlighting
Better syntax highlighting & switch to redcarpet parser
2 parents 0bdcb9b + 2f04c03 commit 8e77d14

File tree

2 files changed

+80
-157
lines changed

2 files changed

+80
-157
lines changed

‎_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ baseurl: ""
4949
# !! You don't need to change any of the configuration flags below !!
5050
#
5151

52-
markdown: kramdown
52+
markdown: redcarpet
5353
highlighter: pygments
5454
permalink: /:title/
5555

‎_scss/_highlights.scss

+79-156
Original file line numberDiff line numberDiff line change
@@ -1,161 +1,84 @@
11

2-
/***********************/
3-
/* SYNTAX HIGHLIGHTING */
4-
/***********************/
5-
6-
.highlight {
7-
background-color: $darkerGray;
8-
padding: 5px 10px;
9-
margin: 20px 0;
2+
.highlight {
3+
background-color: #efefef;
4+
padding: 7px 7px 7px 10px;
5+
border: 1px solid #ddd;
6+
-moz-box-shadow: 3px 3px rgba(0,0,0,0.1);
7+
-webkit-box-shadow: 3px 3px rgba(0,0,0,0.1);
8+
box-shadow: 3px 3px rgba(0,0,0,0.1);
9+
margin: 20px 0 20px 0;
10+
overflow: scroll;
1011
}
1112

12-
.highlight pre {
13-
/* overflow: scroll; Prefer no word wrap? Uncomment this line and comment out the 2 lines below. */
14-
word-break: break-all;
15-
word-wrap: break-word;
16-
}
17-
1813
code {
19-
font-family: 'Courier', monospace;
20-
font-size: 14px;
21-
color: #999
14+
font-family:'Bitstream Vera Sans Mono','Courier', monospace;
2215
}
23-
24-
// Solarized Light Pygments
25-
// Thanks https://gist.github.com/edwardhotchkiss/2005058
26-
/* Comment */
27-
.highlight .c, .highlight .c1 { color: #586E75 }
28-
/* Error */
29-
.highlight .err { color: #93A1A1 }
30-
/* Generic */
31-
.highlight .g { color: #93A1A1 }
32-
/* Keyword */
33-
.highlight .k { color: #859900 }
34-
/* Literal */
35-
.highlight .l { color: #93A1A1 }
36-
/* Name */
37-
.highlight .n { color: #93A1A1 }
38-
/* Operator */
39-
.highlight .o { color: #859900 }
40-
/* Other */
41-
.highlight .x { color: #CB4B16 }
42-
/* Punctuation */
43-
.highlight .p { color: #93A1A1 }
44-
/* Comment.Multiline */
45-
.highlight .cm { color: #586E75 }
46-
/* Comment.Preproc */
47-
.highlight .cp { color: #859900 }
48-
/* Comment.Single */
49-
.highlight .c1 { color: #586E75 }
50-
/* Comment.Special */
51-
.highlight .cs { color: #859900 }
52-
/* Generic.Deleted */
53-
.highlight .gd { color: #2AA198 }
54-
/* Generic.Emph */
55-
.highlight .ge { color: #93A1A1; font-style: italic }
56-
/* Generic.Error */
57-
.highlight .gr { color: #DC322F }
58-
/* Generic.Heading */
59-
.highlight .gh { color: #CB4B16 }
60-
/* Generic.Inserted */
61-
.highlight .gi { color: #859900 }
62-
/* Generic.Output */
63-
.highlight .go { color: #93A1A1 }
64-
/* Generic.Prompt */
65-
.highlight .gp { color: #93A1A1 }
66-
/* Generic.Strong */
67-
.highlight .gs { color: #93A1A1; font-weight: bold }
68-
/* Generic.Subheading */
69-
.highlight .gu { color: #CB4B16 }
70-
/* Generic.Traceback */
71-
.highlight .gt { color: #93A1A1 }
72-
/* Keyword.Constant */
73-
.highlight .kc { color: #CB4B16 }
74-
/* Keyword.Declaration */
75-
.highlight .kd { color: #268BD2 }
76-
/* Keyword.Namespace */
77-
.highlight .kn { color: #859900 }
78-
/* Keyword.Pseudo */
79-
.highlight .kp { color: #859900 }
80-
/* Keyword.Reserved */
81-
.highlight .kr { color: #268BD2 }
82-
/* Keyword.Type */
83-
.highlight .kt { color: #DC322F }
84-
/* Literal.Date */
85-
.highlight .ld { color: #93A1A1 }
86-
/* Literal.Number */
87-
.highlight .m { color: #2AA198 }
88-
/* Literal.String */
89-
.highlight .s { color: #2AA198 }
90-
/* Name.Attribute */
91-
.highlight .na { color: #93A1A1 }
92-
/* Name.Builtin */
93-
.highlight .nb { color: #B58900 }
94-
/* Name.Class */
95-
.highlight .nc { color: #268BD2 }
96-
/* Name.Constant */
97-
.highlight .no { color: #CB4B16 }
98-
/* Name.Decorator */
99-
.highlight .nd { color: #268BD2 }
100-
/* Name.Entity */
101-
.highlight .ni { color: #CB4B16 }
102-
/* Name.Exception */
103-
.highlight .ne { color: #CB4B16 }
104-
/* Name.Function */
105-
.highlight .nf { color: #268BD2 }
106-
/* Name.Label */
107-
.highlight .nl { color: #93A1A1 }
108-
/* Name.Namespace */
109-
.highlight .nn { color: #93A1A1 }
110-
/* Name.Other */
111-
.highlight .nx { color: #555 }
112-
/* Name.Property */
113-
.highlight .py { color: #93A1A1 }
114-
/* Name.Tag */
115-
.highlight .nt { color: #268BD2 }
116-
/* Name.Variable */
117-
.highlight .nv { color: #268BD2 }
118-
/* Operator.Word */
119-
.highlight .ow { color: #859900 }
120-
/* Text.Whitespace */
121-
.highlight .w { color: #93A1A1 }
122-
/* Literal.Number.Float */
123-
.highlight .mf { color: #2AA198 }
124-
/* Literal.Number.Hex */
125-
.highlight .mh { color: #2AA198 }
126-
/* Literal.Number.Integer */
127-
.highlight .mi { color: #2AA198 }
128-
/* Literal.Number.Oct */
129-
.highlight .mo { color: #2AA198 }
130-
/* Literal.String.Backtick */
131-
.highlight .sb { color: #586E75 }
132-
/* Literal.String.Char */
133-
.highlight .sc { color: #2AA198 }
134-
/* Literal.String.Doc */
135-
.highlight .sd { color: #93A1A1 }
136-
/* Literal.String.Double */
137-
.highlight .s2 { color: #2AA198 }
138-
/* Literal.String.Escape */
139-
.highlight .se { color: #CB4B16 }
140-
/* Literal.String.Heredoc */
141-
.highlight .sh { color: #93A1A1 }
142-
/* Literal.String.Interpol */
143-
.highlight .si { color: #2AA198 }
144-
/* Literal.String.Other */
145-
.highlight .sx { color: #2AA198 }
146-
/* Literal.String.Regex */
147-
.highlight .sr { color: #DC322F }
148-
/* Literal.String.Single */
149-
.highlight .s1 { color: #2AA198 }
150-
/* Literal.String.Symbol */
151-
.highlight .ss { color: #2AA198 }
152-
/* Name.Builtin.Pseudo */
153-
.highlight .bp { color: #268BD2 }
154-
/* Name.Variable.Class */
155-
.highlight .vc { color: #268BD2 }
156-
/* Name.Variable.Global */
157-
.highlight .vg { color: #268BD2 }
158-
/* Name.Variable.Instance */
159-
.highlight .vi { color: #268BD2 }
160-
/* Literal.Number.Integer.Long */
161-
.highlight .il { color: #2AA198 }
16+
17+
.highlight .c { color: #586E75 } /* Comment */
18+
.highlight .err { color: #93A1A1 } /* Error */
19+
.highlight .g { color: #93A1A1 } /* Generic */
20+
.highlight .k { color: #859900 } /* Keyword */
21+
.highlight .l { color: #93A1A1 } /* Literal */
22+
.highlight .n { color: #93A1A1 } /* Name */
23+
.highlight .o { color: #859900 } /* Operator */
24+
.highlight .x { color: #CB4B16 } /* Other */
25+
.highlight .p { color: #93A1A1 } /* Punctuation */
26+
.highlight .cm { color: #586E75 } /* Comment.Multiline */
27+
.highlight .cp { color: #859900 } /* Comment.Preproc */
28+
.highlight .c1 { color: #586E75 } /* Comment.Single */
29+
.highlight .cs { color: #859900 } /* Comment.Special */
30+
.highlight .gd { color: #2AA198 } /* Generic.Deleted */
31+
.highlight .ge { color: #93A1A1; font-style: italic } /* Generic.Emph */
32+
.highlight .gr { color: #DC322F } /* Generic.Error */
33+
.highlight .gh { color: #CB4B16 } /* Generic.Heading */
34+
.highlight .gi { color: #859900 } /* Generic.Inserted */
35+
.highlight .go { color: #93A1A1 } /* Generic.Output */
36+
.highlight .gp { color: #93A1A1 } /* Generic.Prompt */
37+
.highlight .gs { color: #93A1A1; font-weight: bold } /* Generic.Strong */
38+
.highlight .gu { color: #CB4B16 } /* Generic.Subheading */
39+
.highlight .gt { color: #93A1A1 } /* Generic.Traceback */
40+
.highlight .kc { color: #CB4B16 } /* Keyword.Constant */
41+
.highlight .kd { color: #268BD2 } /* Keyword.Declaration */
42+
.highlight .kn { color: #859900 } /* Keyword.Namespace */
43+
.highlight .kp { color: #859900 } /* Keyword.Pseudo */
44+
.highlight .kr { color: #268BD2 } /* Keyword.Reserved */
45+
.highlight .kt { color: #DC322F } /* Keyword.Type */
46+
.highlight .ld { color: #93A1A1 } /* Literal.Date */
47+
.highlight .m { color: #2AA198 } /* Literal.Number */
48+
.highlight .s { color: #2AA198 } /* Literal.String */
49+
.highlight .na { color: #93A1A1 } /* Name.Attribute */
50+
.highlight .nb { color: #B58900 } /* Name.Builtin */
51+
.highlight .nc { color: #268BD2 } /* Name.Class */
52+
.highlight .no { color: #CB4B16 } /* Name.Constant */
53+
.highlight .nd { color: #268BD2 } /* Name.Decorator */
54+
.highlight .ni { color: #CB4B16 } /* Name.Entity */
55+
.highlight .ne { color: #CB4B16 } /* Name.Exception */
56+
.highlight .nf { color: #268BD2 } /* Name.Function */
57+
.highlight .nl { color: #93A1A1 } /* Name.Label */
58+
.highlight .nn { color: #93A1A1 } /* Name.Namespace */
59+
.highlight .nx { color: #555 } /* Name.Other */
60+
.highlight .py { color: #93A1A1 } /* Name.Property */
61+
.highlight .nt { color: #268BD2 } /* Name.Tag */
62+
.highlight .nv { color: #268BD2 } /* Name.Variable */
63+
.highlight .ow { color: #859900 } /* Operator.Word */
64+
.highlight .w { color: #93A1A1 } /* Text.Whitespace */
65+
.highlight .mf { color: #2AA198 } /* Literal.Number.Float */
66+
.highlight .mh { color: #2AA198 } /* Literal.Number.Hex */
67+
.highlight .mi { color: #2AA198 } /* Literal.Number.Integer */
68+
.highlight .mo { color: #2AA198 } /* Literal.Number.Oct */
69+
.highlight .sb { color: #586E75 } /* Literal.String.Backtick */
70+
.highlight .sc { color: #2AA198 } /* Literal.String.Char */
71+
.highlight .sd { color: #93A1A1 } /* Literal.String.Doc */
72+
.highlight .s2 { color: #2AA198 } /* Literal.String.Double */
73+
.highlight .se { color: #CB4B16 } /* Literal.String.Escape */
74+
.highlight .sh { color: #93A1A1 } /* Literal.String.Heredoc */
75+
.highlight .si { color: #2AA198 } /* Literal.String.Interpol */
76+
.highlight .sx { color: #2AA198 } /* Literal.String.Other */
77+
.highlight .sr { color: #DC322F } /* Literal.String.Regex */
78+
.highlight .s1 { color: #2AA198 } /* Literal.String.Single */
79+
.highlight .ss { color: #2AA198 } /* Literal.String.Symbol */
80+
.highlight .bp { color: #268BD2 } /* Name.Builtin.Pseudo */
81+
.highlight .vc { color: #268BD2 } /* Name.Variable.Class */
82+
.highlight .vg { color: #268BD2 } /* Name.Variable.Global */
83+
.highlight .vi { color: #268BD2 } /* Name.Variable.Instance */
84+
.highlight .il { color: #2AA198 } /* Literal.Number.Integer.Long */

0 commit comments

Comments
 (0)