Merge pull request #7 from tasmo/highlight.js

Adds highlight.js
tasmo · Oct 26, 2021 · bbc56c2 · bbc56c2
2 parents f33a7b7 + eac2f14
commit bbc56c2
Show file tree

Hide file tree

Showing 256 changed files with 37,102 additions and 98 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,7 @@ trim_trailing_whitespace = true
 insert_final_newline = false
 charset = utf-8
 
-[*.{json,js,css,scss,yml,htm,html}]
+[*.{json,js,css,scss,yml}]
 indent_style = space
 indent_size = 2
 

diff --git a/README.md b/README.md
diff --git a/_config.yml b/_config.yml
@@ -2,9 +2,7 @@ timezone:    Europe/Berlin
 future:      false
 # Set baseurl to the base path of the site eg "/mytalk"
 baseurl:     ""
-# The allowed values are 'rouge', 'pygments' or null.
-highlighter: rouge
-# markdown - Valid options are [ maruku | rdiscount | kramdown | redcarpet ]
+highlighter: ""
 markdown:    kramdown
 lsi:         false
 permalink:   "/:title"
@@ -304,15 +302,16 @@ reveal:
 exclude: [
   "Gemfile",
   "Gemfile.lock",
+  "default.nix",
   "vendor",
   "README.md",
   "LICENSE",
-  "reveal.js/test",
-  "reveal.js/index.html",
-  "reveal.js/README.md",
-  "reveal.js/bower.json",
-  "reveal.js/Gruntfile.js",
   "reveal.js/CONTRIBUTING.md",
   "reveal.js/LICENSE",
-  "reveal.js/package.json"
+  "reveal.js/README.md",
+  "reveal.js/gulpfile.js",
+  "reveal.js/index.html",
+  "reveal.js/package-lock.json",
+  "reveal.js/package.json",
+  "reveal.js/test"
 ]
diff --git a/_includes/head.html b/_includes/head.html
@@ -11,6 +11,7 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
 <link rel="stylesheet" href="{{ site.baseurl }}/assets/css/style.css">
+<link rel="stylesheet" href="{{ site.baseurl }}/assets/css/highlight/base16/solarized-light.css">
 <!-- jQuery -->
 <script src="{{ site.github.url }}/assets/js/jquery-3.5.1.min.js"></script>
 

diff --git a/_includes/script.html b/_includes/script.html
@@ -3,6 +3,7 @@
 <script src="{{ site.github.url }}/reveal.js/plugin/notes/notes.js"></script>
 <script src="{{ site.github.url }}/reveal.js/plugin/search/search.js"></script>
 <script src="{{ site.github.url }}/reveal.js/plugin/markdown/markdown.js"></script>
+<script src="{{ site.github.url }}/reveal.js/plugin/highlight/highlight.js"></script>
 
 <!-- reveal.js init -->
 <script>
@@ -13,7 +14,7 @@
     {% for attr in site.reveal %}{{attr[0]}}: {% unless {attr[1]} == false or {attr[1]} == true %}'{{attr[1]}}',{% else %}{{attr[1]}},{% endunless %}
     {% endfor %}
     {% endif %}
-    plugins: [ RevealZoom, RevealNotes, RevealSearch, RevealMarkdown ]
+    plugins: [ RevealZoom, RevealNotes, RevealSearch, RevealMarkdown, RevealHighlight ]
   });
 
   {% if site.slideNumber.format and site.slideNumber.format != "none" %}

diff --git a/_includes/slide.html b/_includes/slide.html
@@ -1,5 +1,5 @@
 <section {% if post.slide-id %}id="{{post.slide-id}}"{%endif %} class="step{%if post.classes | size %}{% for class in post.classes %} {{class}}{% endfor %}{% else %} slide{% endif %}" {% unless site.simple-slideshow %}{% for attr in post.data %} data-{{attr[0]}}="{{attr[1]}}"{% endfor %}{% endunless %}>
-  {% if post.title != "" %}<h1>{{ post.title }}</h1>{% endif %}
+	{% if post.title != "" %}<h1>{{ post.title }}</h1>{% endif %}
 
-  {{ post.content }}
+	{{ post.content }}
 </section>
diff --git a/_layouts/presentation.html b/_layouts/presentation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="{% if site.solarized.theme %}{{site.solarized.theme}}{% else %}dark{% endif %}">
 <head>
-  {% include head.html %}
+	{% include head.html %}
 </head>
 <body>
 	<div class="reveal">

diff --git a/_layouts/print.html b/_layouts/print.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {% include head.html %}
+	{% include head.html %}
 </head>
 <body>
-  <div class="reveal">
-    {{ content }}
-  </div>
+	<div class="reveal">
+		{{ content }}
+	</div>
 </body>
 </html>
 
diff --git a/_layouts/slide.html b/_layouts/slide.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <html>
 <head>
-  {% include head.html %}
+	{% include head.html %}
 </head>
 <body>
-  <div class="reveal">
-    <div class="step">
-      {{ content }}
-    </div>
-  </div>
+	<div class="reveal">
+		<div class="slides">
+			{{ content }}
+		</div>
+	</div>
 </body>
 </html>
 
diff --git a/_posts/2014-1-1-9-markdown.md b/_posts/2014-1-1-9-markdown.md
@@ -5,11 +5,11 @@ title: Markdown support
 
 Every Markdown file in `_posts` becomes a single slide in "reveal-jekyll".
 
-{% highlight markdown %}
+<pre><code class="language-markdown" data-trim data-noescape data-line-numbers="1-4|6">
 ---
 layout: slide
 title: Markdown support
 ---
 
 Every Markdown file in `_posts` becomes a single slide in "reveal-jekyll".
-{% endhighlight %}
+</code></pre>
diff --git a/_sass/solarized/solarized.scss b/_sass/solarized/solarized.scss
@@ -185,15 +185,18 @@ html * {
     font-weight: normal;
   }
   pre code {
-    padding: 0;
+    padding: .7em 1em .8em;
     overflow: hidden;
     word-wrap: break-word;
     white-space: pre-wrap;
   }
+  :not(figure) > pre.code-wrapper > code {
+    @include border-radius( 0.4em );
+  }
+  :not(figure) > pre.code-wrapper,
   figure.highlight {
     width: 90%;
     margin: .5em auto;
-    padding: .7em 1em .8em;
     text-shadow: none;
     box-shadow: 0px 0px 6px rgba( 0,0,0,0.3 );
     @include border-radius( 0.4em );

diff --git a/assets/css/highlight/a11y-dark.css b/assets/css/highlight/a11y-dark.css
@@ -0,0 +1,98 @@
+/*!
+  Theme: a11y-dark
+  Author: @ericwbailey
+  Maintainer: @ericwbailey
+
+  Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css
+*/
+
+.hljs {
+  background: #2b2b2b;
+  color: #f8f8f2;
+}
+
+/* Comment */
+.hljs-comment,
+.hljs-quote {
+  color: #d4d0ab;
+}
+
+/* Red */
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-regexp,
+.hljs-deletion {
+  color: #ffa07a;
+}
+
+/* Orange */
+.hljs-number,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-params,
+.hljs-meta,
+.hljs-link {
+  color: #f5ab35;
+}
+
+/* Yellow */
+.hljs-attribute {
+  color: #ffd700;
+}
+
+/* Green */
+.hljs-string,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-addition {
+  color: #abe338;
+}
+
+/* Blue */
+.hljs-title,
+.hljs-section {
+  color: #00e0e0;
+}
+
+/* Purple */
+.hljs-keyword,
+.hljs-selector-tag {
+  color: #dcc6e0;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+@media screen and (-ms-high-contrast: active) {
+  .hljs-addition,
+  .hljs-attribute,
+  .hljs-built_in,
+  .hljs-bullet,
+  .hljs-comment,
+  .hljs-link,
+  .hljs-literal,
+  .hljs-meta,
+  .hljs-number,
+  .hljs-params,
+  .hljs-string,
+  .hljs-symbol,
+  .hljs-type,
+  .hljs-quote {
+        color: highlight;
+    }
+
+    .hljs-keyword,
+    .hljs-selector-tag {
+        font-weight: bold;
+    }
+}
diff --git a/assets/css/highlight/a11y-light.css b/assets/css/highlight/a11y-light.css
@@ -0,0 +1,98 @@
+/*!
+  Theme: a11y-light
+  Author: @ericwbailey
+  Maintainer: @ericwbailey
+
+  Based on the Tomorrow Night Eighties theme: https://github.com/isagalaev/highlight.js/blob/master/src/styles/tomorrow-night-eighties.css
+*/
+
+.hljs {
+  background: #fefefe;
+  color: #545454;
+}
+
+/* Comment */
+.hljs-comment,
+.hljs-quote {
+  color: #696969;
+}
+
+/* Red */
+.hljs-variable,
+.hljs-template-variable,
+.hljs-tag,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-regexp,
+.hljs-deletion {
+  color: #d91e18;
+}
+
+/* Orange */
+.hljs-number,
+.hljs-built_in,
+.hljs-literal,
+.hljs-type,
+.hljs-params,
+.hljs-meta,
+.hljs-link {
+  color: #aa5d00;
+}
+
+/* Yellow */
+.hljs-attribute {
+  color: #aa5d00;
+}
+
+/* Green */
+.hljs-string,
+.hljs-symbol,
+.hljs-bullet,
+.hljs-addition {
+  color: #008000;
+}
+
+/* Blue */
+.hljs-title,
+.hljs-section {
+  color: #007faa;
+}
+
+/* Purple */
+.hljs-keyword,
+.hljs-selector-tag {
+  color: #7928a1;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+@media screen and (-ms-high-contrast: active) {
+  .hljs-addition,
+  .hljs-attribute,
+  .hljs-built_in,
+  .hljs-bullet,
+  .hljs-comment,
+  .hljs-link,
+  .hljs-literal,
+  .hljs-meta,
+  .hljs-number,
+  .hljs-params,
+  .hljs-string,
+  .hljs-symbol,
+  .hljs-type,
+  .hljs-quote {
+        color: highlight;
+    }
+
+    .hljs-keyword,
+    .hljs-selector-tag {
+        font-weight: bold;
+    }
+}