From 4270c6c399f3cc981d27d2f2da79d3a003d98671 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Sko=C5=99epa?= <jakub@skorepa.info> Date: Thu, 25 Feb 2016 18:20:18 +0100 Subject: [PATCH] Syntax highlighting overhaul --- sass/style.scss | 14 ++-- static/theme/github.css | 99 ------------------------- static/theme/highlight.css | 74 ++++++++++++++++++ templates/partials/header.html.nunjucks | 2 +- 4 files changed, 84 insertions(+), 105 deletions(-) delete mode 100644 static/theme/github.css create mode 100644 static/theme/highlight.css diff --git a/sass/style.scss b/sass/style.scss index ca998b7..ca547d5 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -195,15 +195,19 @@ td { } } +pre { + padding: 2px 0 2px 10px; + background-color: #2b2b2b; +} code { - background-color: #fce4ec; - color: #880e4f; + padding: 2px 5px; + color: #bababa; + background-color: #2b2b2b; font-family: "Menlo", "Liberation Mono", "Consolas", "DejaVu Sans Mono", "Ubuntu Mono", "Courier New", "andale mono", "lucida console", monospace; } - pre code { - background-color: unset; - color: unset; + padding: 0; } +.article ul li {list-style: circle outside} @import "search.scss" diff --git a/static/theme/github.css b/static/theme/github.css deleted file mode 100644 index 791932b..0000000 --- a/static/theme/github.css +++ /dev/null @@ -1,99 +0,0 @@ -/* - -github.com style (c) Vasily Polovnyov <vast@whiteants.net> - -*/ - -.hljs { - display: block; - overflow-x: auto; - padding: 0.5em; - color: #333; - background: #f8f8f8; -} - -.hljs-comment, -.hljs-quote { - color: #998; - font-style: italic; -} - -.hljs-keyword, -.hljs-selector-tag, -.hljs-subst { - color: #333; - font-weight: bold; -} - -.hljs-number, -.hljs-literal, -.hljs-variable, -.hljs-template-variable, -.hljs-tag .hljs-attr { - color: #008080; -} - -.hljs-string, -.hljs-doctag { - color: #d14; -} - -.hljs-title, -.hljs-section, -.hljs-selector-id { - color: #900; - font-weight: bold; -} - -.hljs-subst { - font-weight: normal; -} - -.hljs-type, -.hljs-class .hljs-title { - color: #458; - font-weight: bold; -} - -.hljs-tag, -.hljs-name, -.hljs-attribute { - color: #000080; - font-weight: normal; -} - -.hljs-regexp, -.hljs-link { - color: #009926; -} - -.hljs-symbol, -.hljs-bullet { - color: #990073; -} - -.hljs-built_in, -.hljs-builtin-name { - color: #0086b3; -} - -.hljs-meta { - color: #999; - font-weight: bold; -} - -.hljs-deletion { - background: #fdd; -} - -.hljs-addition { - background: #dfd; -} - -.hljs-emphasis { - font-style: italic; -} - -.hljs-strong { - font-weight: bold; -} diff --git a/static/theme/highlight.css b/static/theme/highlight.css new file mode 100644 index 0000000..c01f9a7 --- /dev/null +++ b/static/theme/highlight.css @@ -0,0 +1,74 @@ +/* + +Darkula color scheme from the JetBrains family of IDEs + +*/ + + +.hljs { + display: block; + overflow-x: auto; + padding: 0.5em; + background: #2b2b2b; +} + +.hljs { + color: #bababa; +} + +.hljs-strong, +.hljs-emphasis { + color: #a8a8a2; +} + +.hljs-bullet, +.hljs-quote, +.hljs-link, +.hljs-number, +.hljs-regexp, +.hljs-literal { + color: #6896ba; +} + +.hljs-code, +.hljs-selector-class { + color: #a6e22e; +} + +.hljs-emphasis { + font-style: italic; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-section, +.hljs-attribute, +.hljs-name, +.hljs-variable { + color: #cb7832; +} + +.hljs-params { + color: #b9b9b9; +} + +.hljs-string, +.hljs-subst, +.hljs-type, +.hljs-built_in, +.hljs-builtin-name, +.hljs-symbol, +.hljs-selector-id, +.hljs-selector-attr, +.hljs-selector-pseudo, +.hljs-template-tag, +.hljs-template-variable, +.hljs-addition { + color: #e0c46c; +} + +.hljs-comment, +.hljs-deletion, +.hljs-meta { + color: #7f7f7f; +} diff --git a/templates/partials/header.html.nunjucks b/templates/partials/header.html.nunjucks index 5e66cc0..e7b0460 100644 --- a/templates/partials/header.html.nunjucks +++ b/templates/partials/header.html.nunjucks @@ -7,7 +7,7 @@ <link href='https://fonts.googleapis.com/css?family=Roboto&subset=latin,latin-ext' rel='stylesheet' type='text/css'> <link href="{{ config.baseurl }}/theme/style.css" type="text/css" rel="stylesheet" media="screen,projection"/> - <link href="{{ config.baseurl }}/theme/github.css" type="text/css" rel="stylesheet" media="screen,projection"/> + <link href="{{ config.baseurl }}/theme/highlight.css" type="text/css" rel="stylesheet" media="screen,projection"/> <script src="{{ config.baseurl }}/theme/js/jquery-1.12.0.min.js"></script> -- GitLab