Merge branch 'master' into moar-readme-updates

Author: TimidRobot

.lektorproject

@@ -12,5 +12,6 @@ lektor-disqus-comments = 0.4.1
 lektor-google-analytics = 0.1.3
 lektor-markdown-excerpt = 0.1
 lektor-markdown-header-anchors = 0.3.1
+lektor-markdown-highlighter = 0.3.1
 lektor-strip-html-tags = 0.3.1
 lektor-webpack-support = 0.5

README.md

@@ -152,6 +152,8 @@ Here's how the code is structured in the top level of the repository:
     excerpt
   - [lektor/lektor-markdown-header-anchors][md-header]: Adds support for
     anchors and table of contents to Markdown
+  - [lektor/lektor-markdown-highlighter][md-highlighter]: Adds support for 
+    syntax highlighting in Markdown and templates
   - [terminal-labs/lektor-strip-html-tags][striphtml]: Strip HTML tags,
     effectively turning HTML into plain text
   - [lektor/lektor-webpack-support][webpacksupport]: Adds webpack support to
@@ -163,6 +165,7 @@ Here's how the code is structured in the top level of the repository:
 [lektorga]: https://github.com/kmonsoor/lektor-google-analytics
 [mdexcerpt]: https://github.com/bancek/lektor-markdown-excerpt
 [md-header]: https://github.com/lektor/lektor-markdown-header-anchors
+[md-highlighter]: https://github.com/lektor/lektor-markdown-highlighter
 [striphtml]: https://github.com/terminal-labs/lektor-strip-html-tags
 [webpacksupport]: https://github.com/lektor/lektor-webpack-support
 

configs/markdown-highlighter.ini

@@ -0,0 +1,2 @@
+[pygments]
+style = tango

templates/layout.html

@@ -5,6 +5,7 @@
 <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
 <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700" rel="stylesheet"> 
 <link rel="stylesheet" href="{{ '/static/gen/style.css'|url }}">
+<link rel="stylesheet" href="{{ get_pygments_stylesheet()|url }}">
 <meta property="og:site_name" content="Creative Commons" />
 <meta property="og:title" content="{{ this.title }}" />
 {% if this.description %}