Merge branch 'release/2.0.2'

getgrav · Aug 9, 2019 · 3a832dc · 3a832dc
2 parents 5a9ff09 + f6e4964
commit 3a832dc
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v2.0.2
+## 08/09/2019
+
+1. [](#improved)
+    * Allow for overriding of `{% block content %}{% endblock %}`
+    * Improved default `.table` styling
+1. [](#bugfix)
+    * Fixed issue with Prism Highlight [prism-highlight#1](https://github.com/trilbymedia/grav-plugin-prism-highlight/issues/1)
+    * Use slug for onpage links [#115](https://github.com/getgrav/grav-theme-quark/issues/115)
+    * Fixed 2 minor YAML linting issues
+
 # v2.0.1
 ## 05/09/2019
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Quark
-version: 2.0.1
+version: 2.0.2
 description: New Grav Default Theme
 icon:  microchip
 author:

diff --git a/blueprints/blog.yaml b/blueprints/blog.yaml
@@ -3,7 +3,7 @@ child_type: item
 
 rules:
   slug:
-    pattern: "[a-z][a-z0-9_\-]+"
+    pattern: "[a-z][a-z0-9_-]+"
     min: 2
     max: 80
 

diff --git a/blueprints/item.yaml b/blueprints/item.yaml
@@ -43,7 +43,7 @@ form:
               toggleable: true
               label: Image File
               help: image filename that exists in the page folder. If not provided, will use the first image found.
-              placeholder: For example: myimage.jpg
+              placeholder: "For example: myimage.jpg"
 
             header.header_image_width:
               type: text

diff --git a/css-compiled/theme.css b/css-compiled/theme.css
diff --git a/css-compiled/theme.min.css b/css-compiled/theme.min.css
diff --git a/quark.php b/quark.php
@@ -53,4 +53,4 @@ public function onTwigInitialized()
 
     }
 
-}
+}
diff --git a/scss/theme/_typography.scss b/scss/theme/_typography.scss
@@ -61,6 +61,13 @@ img {
   max-width: 100%;
 }
 
+// Tables
+.table > table {
+  border-spacing: 0;
+  border-collapse: collapse;
+  width: 100%;
+}
+
 
 // Codeblocks
 pre code, pre.xdebug-var-dump{
@@ -73,8 +80,16 @@ pre code, pre.xdebug-var-dump{
   overflow-x: auto;
 }
 
+pre[class*="language-"] {
+  code {
+    border-radius: inherit;
+    padding: 0 !important;
+    overflow-x: initial;
+  }
+}
+
 pre {
-  code:not(.hljs) {
+  code:not(.hljs):not([class*="language-"]) {
     background: #f8f8f8;
   }
 }
@@ -160,3 +175,4 @@ ol {
   }
 }
 
+
diff --git a/templates/blocks/base.html.twig b/templates/blocks/base.html.twig
@@ -0,0 +1,3 @@
+{% block content_surround %}
+{% block content %}{% endblock %}
+{% endblock %}
diff --git a/templates/modular.html.twig b/templates/modular.html.twig
@@ -1,9 +1,5 @@
 {% extends 'partials/base.html.twig' %}
 
-{% macro pageLinkName(text) %}{{ text|lower|replace({' ':'_'}) }}{% endmacro %}
-
-{% import _self as macro %}
-
 {% set show_onpage_menu = header.onpage_menu == true or header.onpage_menu is null %}
 
 {% block javascripts %}
@@ -33,7 +29,7 @@
         <ul class="navigation">
         {% for module in page.collection() if module.header.visible is not same as(false) %}
             {% set current_module = (module.active or module.activeChild) ? 'active' : '' %}
-            <li><a class="{{ current_module }}" href="#{{ macro.pageLinkName(module.menu) }}">{{ module.menu }}</a></li>
+            <li><a class="{{ current_module }}" href="#{{ module.menu|hyphenize }}">{{ module.menu }}</a></li>
         {% endfor %}
         {% for mitem in site.menu %}
             <li>
@@ -51,14 +47,14 @@
 
 {% block hero %}
     {% for module in page.collection() if module.template == 'modular/hero' %}
-        <div id="{{ macro.pageLinkName(module.menu) }}"></div>
+        <div id="{{ module.menu|hyphenize }}"></div>
         {{ module.content|raw }}
     {% endfor %}
 {% endblock %}
 
 {% block body %}
     {% for module in page.collection() if module.template != 'modular/hero' %}
-        <div id="{{ macro.pageLinkName(module.menu) }}"></div>
+        <div id="{{ module.menu|hyphenize }}"></div>
         {{ module.content|raw }}
     {% endfor %}
 {% endblock %}
diff --git a/templates/partials/base.html.twig b/templates/partials/base.html.twig
@@ -1,6 +1,7 @@
 {% set body_classes = body_class(['header-fixed', 'header-animated', 'header-dark', 'header-transparent', 'sticky-footer']) %}
 {% set grid_size = theme_var('grid-size') %}
 {% set compress = theme_var('production-mode') ? '.min.css' : '.css' %}
+{% use 'blocks/base.html.twig' %}
 <!DOCTYPE html>
 <html lang="{{ grav.language.getActive ?: grav.config.site.default_lang }}">
 <head>
@@ -38,7 +39,7 @@
 </head>
 <body id="top" class="{% block body_classes %}{{ body_classes }}{% endblock %}">
     <div id="page-wrapper">
-    {% block header deferred %}
+    {% block header %}
         <section id="header" class="section">
             <section class="container {{ grid_size }}">
                 <nav class="navbar">
@@ -79,7 +80,7 @@
                     {% block messages %}
                         {% include 'partials/messages.html.twig' ignore missing %}
                     {% endblock %}
-                    {% block content %}{% endblock %}
+                    {{ block('content_surround') }}
                 </section>
             </section>
         {% endblock %}
@@ -91,6 +92,7 @@
         {% include 'partials/footer.html.twig' %}
     {% endblock %}
 
+    {% block mobile %}
     <div class="mobile-container">
         <div class="overlay" id="overlay">
             <div class="mobile-logo">
@@ -101,6 +103,7 @@
             </nav>
         </div>
     </div>
+    {% endblock %}
 
 {% block bottom %}
     {{ assets.js('bottom')|raw }}