Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev

2 files changed, 9 insertions, 0 deletions

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6d320cd2..f8238744 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -923,6 +923,13 @@ blockquote {
   text-decoration: underline;
 }
 
+pre code {
+                font-family: "Courier New", Courier, monospace;
+                border: 1px solid #ccc;
+                font-size: 0.96em;
+}
+
+
 /* ==========================================================================
    6 = Media Queries
    ========================================================================== */
@@ -1055,3 +1062,4 @@ blockquote {
     left: 0;
   }
 }
+
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index af97407d..703ce5be 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -4,6 +4,7 @@
 {% endblock %}
 {% block title %}{{ entry.title|raw }} ({{ entry.url | e | getDomain }}){% endblock %}
 {% block content %}
+                                {% include '_highlight.twig' %}
         <div id="article_toolbar">
             <ul class="links">
                 <li class="topPosF"><a href="#top" title="{% trans "Back to top" %}" class="tool top icon icon-arrow-up-thick"><span>{% trans "Back to top" %}</span></a></li>