From a126b53b4c90fac33b5d855894647cd8bcac3558 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Sat, 30 Jan 2016 21:01:12 -0500 Subject: [PATCH] CSS changes for Rouge highlighting This adds a new CSS file and adjusts existing highlighting files for the Rouge syntax highlighting that was enabled. --- docs/_sass/_code.scss | 4 +- docs/_sass/_examples.scss | 1 + docs/_sass/_prettify.scss | 1 - docs/_sass/_syntax-highlighting.scss | 117 +++++++++++++++++++++++++++ docs/css/s2-docs.scss | 4 +- 5 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 docs/_sass/_syntax-highlighting.scss diff --git a/docs/_sass/_code.scss b/docs/_sass/_code.scss index e751e85a..ecd3aa97 100644 --- a/docs/_sass/_code.scss +++ b/docs/_sass/_code.scss @@ -8,9 +8,9 @@ h4 code { } // Modify Bootstrap's styles for blocks of code -pre { +pre.prettyprint { padding: 9px 14px; margin-bottom: 14px; background-color: #f7f7f9; border: 1px solid #e1e1e8; -} +} \ No newline at end of file diff --git a/docs/_sass/_examples.scss b/docs/_sass/_examples.scss index b122bdce..0af55914 100644 --- a/docs/_sass/_examples.scss +++ b/docs/_sass/_examples.scss @@ -70,6 +70,7 @@ } .s2-example + pre, +.s2-example + figure, .s2-event-log + pre { margin: -15px -15px 15px; border-radius: 0; diff --git a/docs/_sass/_prettify.scss b/docs/_sass/_prettify.scss index bfe8249e..4b799d54 100644 --- a/docs/_sass/_prettify.scss +++ b/docs/_sass/_prettify.scss @@ -19,7 +19,6 @@ color: #2F6F9F; } .typ, .atn, .dec, .var { - /*color: teal;*/ color: #428BCA; } .pln { diff --git a/docs/_sass/_syntax-highlighting.scss b/docs/_sass/_syntax-highlighting.scss new file mode 100644 index 00000000..9dca6bdc --- /dev/null +++ b/docs/_sass/_syntax-highlighting.scss @@ -0,0 +1,117 @@ +// Jekyll syntax highlighting styles adjusted to match Google Code Prettify + +.highlight { + background: #fff; + + // Text + .nx { + color: #333; + } + + // Keywords and operators + .k, .o { + font-weight: bold; + } + + // Attribute name + .na { + color: #428BCA; + } + + // Strings + .s, .s1, .s2, .sb, .sc, .sd, .se, .sh, .si, .sx { + color: #C7254E; + } + + // Literals + .m, .mf, mh, .mi, .mo { + color: #195f91; + } + + // Parentheses + .p { + color: #93a1a1; + } + + // Tag + .nt { + color: #2F6F9F; + } + + // Comments + .c { + color: #999; + font-style: italic; + } + + // Error + .err { + background-color: #e3d2d2; + color: #a61717; + } + + // Generic error + .gr { + color: #a00; + } + + // Container styles + pre { + border: none; + margin: 0; + } + + & > pre { + border: 1px solid #eee; + padding: 0; + margin-bottom: 14px; + } + + // Line numbers + .lineno { + background-color: #fbfbfb; + color: #bebebe; + + -ms-user-select: none; + -moz-user-select: none; + -webkit-user-select: none; + } +} + +.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */ +.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ +.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gh { color: #999999 } /* Generic.Heading */ +.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */ +.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gp { color: #555555 } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #aaaaaa } /* Generic.Subheading */ +.highlight .gt { color: #aa0000 } /* Generic.Traceback */ +.highlight .kc { font-weight: bold } /* Keyword.Constant */ +.highlight .kd { font-weight: bold } /* Keyword.Declaration */ +.highlight .kp { font-weight: bold } /* Keyword.Pseudo */ +.highlight .kr { font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */ +.highlight .nb { color: #0086B3 } /* Name.Builtin */ +.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */ +.highlight .no { color: #008080 } /* Name.Constant */ +.highlight .ni { color: #800080 } /* Name.Entity */ +.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */ +.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */ +.highlight .nn { color: #555555 } /* Name.Namespace */ +.highlight .nv { color: #008080 } /* Name.Variable */ +.highlight .ow { font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .sr { color: #009926 } /* Literal.String.Regex */ +.highlight .ss { color: #990073 } /* Literal.String.Symbol */ +.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #008080 } /* Name.Variable.Class */ +.highlight .vg { color: #008080 } /* Name.Variable.Global */ +.highlight .vi { color: #008080 } /* Name.Variable.Instance */ +.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/docs/css/s2-docs.scss b/docs/css/s2-docs.scss index c50570f2..7fe35124 100644 --- a/docs/css/s2-docs.scss +++ b/docs/css/s2-docs.scss @@ -1,5 +1,6 @@ --- --- + @import "result-repository"; @import "sidenav"; @import "hamburger"; @@ -16,4 +17,5 @@ @import "anchorjs"; @import "jumbotron"; @import "prettify"; -@import "typography" +@import "syntax-highlighting"; +@import "typography";