Merge branch 'release/4.0.7'

CHANGELOG.md

@@ -1,3 +1,18 @@
+## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
+
+### Enhancements
+
+- Add `!default` values to **_sass/_variables.scss**.
+- Collapse sidebar navigation lists on smaller screens. [#607](https://github.com/mmistakes/minimal-mistakes/issues/607)
+
+### Bug Fixes
+
+- Rename `#comments` to something more unique to avoid clashes with Kramdown generated headline IDs. [#582](https://github.com/mmistakes/minimal-mistakes/issues/582)
+
+### Maintenance
+
+- Reorganize SCSS partials in **assets/css/main.scss**
+
 ## [4.0.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.6)
 
 ### Enhancements

_data/ui-text.yml

@@ -8,6 +8,7 @@ en: &DEFAULT_EN
   pagination_next            : "Next"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 : "Toggle Menu"
   toc_label                  : "On This Page"
   ext_link_label             : "Direct Link"
   less_than                  : "less than"
@@ -56,6 +57,7 @@ es: &DEFAULT_ES
   pagination_next            : "Siguiente"
   breadcrumb_home_label      : "Inicio"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Contenidos"
   ext_link_label             : "Enlace"
   less_than                  : "menos de"
@@ -100,6 +102,7 @@ fr: &DEFAULT_FR
   pagination_next            : "Suivant"
   breadcrumb_home_label      : "Accueil"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Sur cette page"
   ext_link_label             : "Lien direct"
   less_than                  : "plus petit que"
@@ -147,6 +150,7 @@ tr: &DEFAULT_TR
   pagination_next            : "Sonraki"
   breadcrumb_home_label      : "Ana Sayfa"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "İçindekiler"
   ext_link_label             : "Doğrudan Bağlantı"
   less_than                  : "Şu süreden az: "
@@ -189,6 +193,7 @@ pt: &DEFAULT_PT
   pagination_next            : "Seguinte"
   breadcrumb_home_label      : "Início"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Nesta Página"
   ext_link_label             : "Link Direto"
   less_than                  : "menos de"
@@ -227,6 +232,7 @@ pt-BR:
   pagination_next            : "Próxima"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Nesta página"
   ext_link_label             : "Link direto"
   less_than                  : "meno que"
@@ -269,6 +275,7 @@ it: &DEFAULT_IT
   pagination_next            : "Prossima"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Indice della pagina"
   ext_link_label             : "Link"
   less_than                  : "meno di"
@@ -311,6 +318,7 @@ zh: &DEFAULT_ZH
   pagination_next            : "向后"
   breadcrumb_home_label      : "首页"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "在本页上"
   ext_link_label             : "直接链接"
   less_than                  : "少于"
@@ -359,6 +367,7 @@ de: &DEFAULT_DE
   pagination_next            : "Nächste"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Auf dieser Seite"
   ext_link_label             : "Direkter Link"
   less_than                  : "weniger als"

_includes/comments.html

@@ -11,7 +11,7 @@
     <h4 class="page__comments-title">{{ comments_label }}</h4>
     <section class="g-comments" data-href="{{ page.url | absolute_url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
   {% when "staticman" %}
-    <section id="comments">
+    <section id="static-comments">
       {% if site.repository and site.staticman.branch %}
         <!-- Start static comments -->
         <div class="js-comments">
@@ -75,6 +75,6 @@
       {% endif %}
     </section>
   {% when "custom" %}
-    <section id="comments"></section>
+    <section id="custom-comments"></section>
   {% endcase %}
 </div>

_includes/nav_list

@@ -1,8 +1,10 @@
 {% assign navigation = site.data.navigation[include.nav] %}
 
 <nav class="nav__list">
-  {% if page.sidebar.title %}<header><h4 class="nav__title" style="padding: 0;">{{ page.sidebar.title }}</h4></header>{% endif %}
+  {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
-  <ul>
+  <input id="ac-toc" name="accordion-toc" type="checkbox" />
+  <label for="ac-toc">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle Menu" }}</label>
+  <ul class="nav__items">
     {% for nav in navigation %}
       <li>
         {% if nav.url %}

_sass/_navigation.scss

@@ -314,20 +314,104 @@
    ========================================================================== */
 
 .nav__list {
-  font-size: 1.25rem;
+  margin-bottom: 1.5em;
 
-  ul {
+  input[type="checkbox"],
-    margin-bottom: 1em;
+  label {
+    display: none;
   }
 
-  a {
+  @include breakpoint(max-width $large) {
-    display: block;
-    padding: 0.125em 0;
-    color: inherit;
 
-    &:hover {
+    label {
-      text-decoration: underline;
+      position: relative;
+      display: inline-block;
+      padding: 0.5em 2.5em 0.5em 1em;
+      color: $gray;
+      font-size: $type-size-6;
+      font-weight: bold;
+      border: 1px solid $light-gray;
+      border-radius: $border-radius;
+      z-index: 20;
+      -webkit-transition: 0.2s ease-out;
+      transition: 0.2s ease-out;
+      cursor: pointer;
+
+      &:before,
+      &:after {
+        content: '';
+        position: absolute;
+        right: 1em;
+        top: 1.25em;
+        width: 0.75em;
+        height: 0.125em;
+        line-height: 1;
+        background-color: $gray;
+        transition: 0.2s ease-out;
+      }
+
+      &:after {
+        transform: rotate(90deg);
+      }
+
+      &:hover {
+        color: #fff;
+        border-color: $gray;
+        background-color: mix(white, #000, 20%);
+
+        &:before,
+        &:after {
+          background-color: #fff;
+        }
+      }
     }
+
+    /* selected*/
+    input:checked + label {
+      color: white;
+      background-color: mix(white, #000, 20%);
+
+      &:before,
+      &:after {
+        background-color: #fff;
+      }
+    }
+
+    // on hover show expand
+    label:hover:after {
+      transform: rotate(90deg);
+    }
+
+    input:checked + label:hover:after {
+      transform: rotate(0);
+    }
+
+    ul {
+      margin-bottom: 1em;
+    }
+
+    a {
+      display: block;
+      padding: 0.25em 0;
+
+      @include breakpoint($large) {
+        padding-top: 0.125em;
+        padding-bottom: 0.125em;
+      }
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+
+.nav__list .nav__items {
+  margin: 0;
+  font-size: 1.25rem;
+
+  a {
+    color: inherit;
   }
 
   .active {
@@ -343,6 +427,33 @@
       color: #fff;
     }
   }
+
+  @include breakpoint(max-width $large) {
+    position: relative;
+    max-height: 0;
+    opacity: 0;
+    overflow: hidden;
+    z-index: 10;
+    -webkit-transition: 0.3s ease-in-out;
+    transition: 0.3s ease-in-out;
+    -webkit-transform: translate(0, 10%);
+        -ms-transform: translate(0, 10%);
+            transform: translate(0, 10%);
+  }
+}
+
+@include breakpoint(max-width $large) {
+  .nav__list input:checked ~ .nav__items {
+    -webkit-transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
+    max-height: 100vh;
+    overflow: visible;
+    opacity: 1;
+    margin-top: 1em;
+    -webkit-transform: translate(0, 0);
+        -ms-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
 }
 
 .nav__title {

_sass/_sidebar.scss

@@ -33,10 +33,6 @@
     font-family: $sans-serif-narrow;
   }
 
-  h3, h4 {
-    font-size: $type-size-5;
-  }
-
   p, li {
     font-family: $sans-serif;
     font-size: $type-size-6;

_sass/_variables.scss

@@ -6,142 +6,123 @@
    Typography
    ========================================================================== */
 
-$doc-font-size              : 16;
+$doc-font-size              : 16 !default;
 
 /* paragraph indention */
-$paragraph-indent           : false; // true, false (default)
+$paragraph-indent           : false !default; // true, false (default)
-$indent-var                 : 1.3em;
+$indent-var                 : 1.3em !default;
 
 /* system typefaces */
-$serif                      : Georgia, Times, serif;
+$serif                      : Georgia, Times, serif !default;
-$sans-serif                 : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
+$sans-serif                 : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif !default;
-$monospace                  : Monaco, Consolas, "Lucida Console", monospace;
+$monospace                  : Monaco, Consolas, "Lucida Console", monospace !default;
 
 /* sans serif typefaces */
-$sans-serif-narrow          : $sans-serif;
+$sans-serif-narrow          : $sans-serif !default;
-$helvetica                  : Helvetica, "Helvetica Neue", Arial, sans-serif;
+$helvetica                  : Helvetica, "Helvetica Neue", Arial, sans-serif !default;
 
 /* serif typefaces */
-$georgia                    : Georgia, serif;
+$georgia                    : Georgia, serif !default;
-$times                      : Times, serif;
+$times                      : Times, serif !default;
-$bodoni                     : "Bodoni MT", serif;
+$bodoni                     : "Bodoni MT", serif !default;
-$calisto                    : "Calisto MT", serif;
+$calisto                    : "Calisto MT", serif !default;
-$garamond                   : Garamond, serif;
+$garamond                   : Garamond, serif !default;
 
-$global-font-family         : $sans-serif;
+$global-font-family         : $sans-serif !default;
-$header-font-family         : $sans-serif;
+$header-font-family         : $sans-serif !default;
-$caption-font-family        : $serif;
+$caption-font-family        : $serif !default;
 
 /* type scale */
-$type-size-1                : 2.441em;  // ~39.056px
+$type-size-1                : 2.441em !default;  // ~39.056px
-$type-size-2                : 1.953em;  // ~31.248px
+$type-size-2                : 1.953em !default;  // ~31.248px
-$type-size-3                : 1.563em;  // ~25.008px
+$type-size-3                : 1.563em !default;  // ~25.008px
-$type-size-4                : 1.25em;   // ~20px
+$type-size-4                : 1.25em !default;   // ~20px
-$type-size-5                : 1em;      // ~16px
+$type-size-5                : 1em !default;      // ~16px
-$type-size-6                : 0.75em;   // ~12px
+$type-size-6                : 0.75em !default;   // ~12px
-$type-size-7                : 0.6875em; // ~11px
+$type-size-7                : 0.6875em !default; // ~11px
-$type-size-8                : 0.625em;  // ~10px
+$type-size-8                : 0.625em !default;  // ~10px
 
 
 /*
    Colors
    ========================================================================== */
 
-$gray                       : #7a8288;
+$gray                       : #7a8288 !default;
-$dark-gray                  : mix(#000, $gray, 40%);
+$dark-gray                  : mix(#000, $gray, 40%) !default;
-$darker-gray                : mix(#000, $gray, 60%);
+$darker-gray                : mix(#000, $gray, 60%) !default;
-$light-gray                 : mix(#fff, $gray, 50%);
+$light-gray                 : mix(#fff, $gray, 50%) !default;
-$lighter-gray               : mix(#fff, $gray, 90%);
+$lighter-gray               : mix(#fff, $gray, 90%) !default;
 
-$body-color                 : #fff;
+$body-color                 : #fff !default;
-$background-color           : #fff;
+$background-color           : #fff !default;
-$code-background-color      : #fafafa;
+$code-background-color      : #fafafa !default;
-$code-background-color-dark : $light-gray;
+$code-background-color-dark : $light-gray !default;
-$text-color                 : $dark-gray;
+$text-color                 : $dark-gray !default;
-$border-color               : $lighter-gray;
+$border-color               : $lighter-gray !default;
 
-$primary-color              : #7a8288;
+$primary-color              : #7a8288 !default;
-$success-color              : #62c462;
+$success-color              : #62c462 !default;
-$warning-color              : #f89406;
+$warning-color              : #f89406 !default;
-$danger-color               : #ee5f5b;
+$danger-color               : #ee5f5b !default;
-$info-color                 : #52adc8;
+$info-color                 : #52adc8 !default;
 
 /* brands */
-$behance-color              : #1769FF;
+$behance-color              : #1769FF !default;
-$dribbble-color             : #ea4c89;
+$dribbble-color             : #ea4c89 !default;
-$facebook-color             : #3b5998;
+$facebook-color             : #3b5998 !default;
-$flickr-color               : #ff0084;
+$flickr-color               : #ff0084 !default;
-$foursquare-color           : #0072b1;
+$foursquare-color           : #0072b1 !default;
-$github-color               : #171516;
+$github-color               : #171516 !default;
-$google-plus-color          : #dd4b39;
+$google-plus-color          : #dd4b39 !default;
-$instagram-color            : #517fa4;
+$instagram-color            : #517fa4 !default;
-$lastfm-color               : #d51007;
+$lastfm-color               : #d51007 !default;
-$linkedin-color             : #007bb6;
+$linkedin-color             : #007bb6 !default;
-$pinterest-color            : #cb2027;
+$pinterest-color            : #cb2027 !default;
-$rss-color                  : #fa9b39;
+$rss-color                  : #fa9b39 !default;
-$soundcloud-color           : #ff3300;
+$soundcloud-color           : #ff3300 !default;
-$stackoverflow-color        : #fe7a15;
+$stackoverflow-color        : #fe7a15 !default;
-$tumblr-color               : #32506d;
+$tumblr-color               : #32506d !default;
-$twitter-color              : #55acee;
+$twitter-color              : #55acee !default;
-$vimeo-color                : #1ab7ea;
+$vimeo-color                : #1ab7ea !default;
-$vine-color                 : #00bf8f;
+$vine-color                 : #00bf8f !default;
-$youtube-color              : #bb0000;
+$youtube-color              : #bb0000 !default;
-$xing-color                 : #006567;
+$xing-color                 : #006567 !default;
 
 
 /* links */
-$link-color                 : $info-color;
+$link-color                 : $info-color !default;
-$link-color-hover           : mix(#000, $link-color, 25%);
+$link-color-hover           : mix(#000, $link-color, 25%) !default;
-$link-color-visited         : mix(#fff, $link-color, 25%);
+$link-color-visited         : mix(#fff, $link-color, 25%) !default;
-$masthead-link-color        : $primary-color;
+$masthead-link-color        : $primary-color !default;
-$masthead-link-color-hover  : mix(#000, $primary-color, 25%);
+$masthead-link-color-hover  : mix(#000, $primary-color, 25%) !default;
 
 
 /*
    Breakpoints
    ========================================================================== */
 
-@include breakpoint-set("to ems", true);
+$small                      : 600px !default;
-
+$medium                     : 768px !default;
-$small                      : 600px;
+$medium-wide                : 900px !default;
-$medium                     : 768px;
+$large                      : 1024px !default;
-$medium-wide                : 900px;
+$x-large                    : 1280px !default;
-$large                      : 1024px;
-$x-large                    : 1280px;
 
 
 /*
    Grid
    ========================================================================== */
 
-$right-sidebar-width-narrow : 200px;
+$right-sidebar-width-narrow : 200px !default;
-$right-sidebar-width        : 300px;
+$right-sidebar-width        : 300px !default;
-$right-sidebar-width-wide   : 400px;
+$right-sidebar-width-wide   : 400px !default;
-
-$susy: (
-  columns: 12,
-  // column-width: 90px,
-  gutters: 1/4,
-  math: fluid,
-  output: float,
-  gutter-position: after,
-  container: $large,
-  global-box-sizing: border-box,
-  // debug: (
-  //   image: show,
-  //   color: blue,
-  //   output: overlay,
-  //   toggle: top right,
-  // ),
-);
 
 
 /*
    Other
    ========================================================================== */
 
-$border-radius              : 4px;
+$border-radius              : 4px !default;
-$box-shadow                 : 0 1px 1px rgba(0, 0, 0, 0.125);
+$box-shadow                 : 0 1px 1px rgba(0, 0, 0, 0.125) !default;
-$navicon-width              : 28px;
+$navicon-width              : 28px !default;
-$navicon-height             : 4px;
+$navicon-height             : 4px !default;
-$global-transition          : all 0.2s ease-in-out;
+$global-transition          : all 0.2s ease-in-out !default;

assets/css/main.scss

@@ -10,14 +10,53 @@
  *
 */
 
-@import "vendor/breakpoint/breakpoint"; // media query mixins
+/*
+   Variables
+   ========================================================================== */
+
 @import "variables";
-@import "mixins";
+
+
+/*
+   Vendor
+   ========================================================================== */
+
+/* Breakpoint - media query mixins */
+@import "vendor/breakpoint/breakpoint";
+@include breakpoint-set("to ems", true);
+
+/* Font Awesome - icon font set */
+@import "vendor/font-awesome/font-awesome";
+
+/* Magnific Popup - responsive lightbox */
+@import "vendor/magnific-popup/magnific-popup"; // Magnific Popup
+
+/* Susy - grid mixins */
+$susy: (
+  columns: 12,
+  gutters: 1/4,
+  math: fluid,
+  output: float,
+  gutter-position: after,
+  container: $large,
+  global-box-sizing: border-box,
+  // debug: (
+  //   image: show,
+  //   color: blue,
+  //   output: overlay,
+  //   toggle: top right,
+  // ),
+);
 @import "vendor/susy/susy";
 
+
+/*
+   Base
+   ========================================================================== */
+
+@import "mixins";
 @import "reset";
 @import "base";
-
 @import "utilities";
 @import "animations";
 @import "tables";
@@ -27,13 +66,14 @@
 @import "navigation";
 @import "footer";
 @import "syntax";
-
 @import "forms";
 
+
+/*
+   Layout specific
+   ========================================================================== */
+
 @import "page";
 @import "archive";
 @import "sidebar";
-
-@import "vendor/font-awesome/font-awesome";
-@import "vendor/magnific-popup/magnific-popup";
 @import "print";

docs/_data/navigation.yml

@@ -7,7 +7,6 @@ foo:
         url: /child-1-page-url/
       - title: "Child Link 2"
         url: /child-2-page-url/
-
   - title: "Parent Link 2"
     url: /parent-2-page-url/
     children:
@@ -23,16 +22,12 @@ foo:
 main:
   - title: "Quick-Start Guide"
     url: /docs/quick-start-guide/
-
   - title: "About"
     url: /about/
-
   - title: "Sample Posts"
     url: /year-archive/
-
   - title: "Sample Collections"
     url: /collection-archive/
-
   - title: "Terms & Privacy Policy"
     url: /terms/
 
@@ -49,7 +44,6 @@ docs:
         url: /docs/installation/
       - title: "Upgrading"
         url: /docs/upgrading/
-
   - title: Customization
     children:
       - title: "Configuration"
@@ -64,7 +58,6 @@ docs:
         url: /docs/authors/
       - title: "Layouts"
         url: /docs/layouts/
-
   - title: Content
     children:
       - title: "Working with Posts"
@@ -77,14 +70,12 @@ docs:
         url: /docs/helpers/
       - title: "Utility Classes"
         url: /docs/utility-classes/
-
   - title: Extras
     children:
       - title: "Stylesheets"
         url: /docs/stylesheets/
       - title: "JavaScript"
         url: /docs/javascript/
-
   - title: Meta
     children:
       - title: "History"
@@ -97,3 +88,46 @@ docs:
         url: /docs/license/
       - title: "Terms & Privacy Policy"
         url: /terms/
+
+# sidebar navigation list sample
+sidebar-sample:
+  - title: "Parent Page A"
+    children:
+      - title: "Child Page A1"
+        url: /
+      - title: "Child Page A2"
+        url: /
+      - title: "Child Page A3"
+        url: /
+      - title: "Child Page A4"
+        url: /
+  - title: "Parent Page B"
+    children:
+      - title: "Child Page B1"
+        url: /
+      - title: "Child Page B2"
+        url: /
+      - title: "Child Page B3"
+        url: /
+      - title: "Child Page B4"
+        url: /
+      - title: "Child Page B5"
+        url: /
+  - title: "Parent Page C"
+    children:
+      - title: "Child Page C1"
+        url: /
+      - title: "Child Page C2"
+        url: /
+      - title: "Child Page C3"
+        url: /
+      - title: "Child Page C4"
+        url: /
+      - title: "Child Page C5"
+        url: /
+  - title: "Parent Page D"
+    children:
+      - title: "Child Page D1"
+        url: /
+      - title: "Child Page D2"
+        url: /

docs/_data/ui-text.yml

@@ -8,6 +8,7 @@ en: &DEFAULT_EN
   pagination_next            : "Next"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 : "Toggle Menu"
   toc_label                  : "On This Page"
   ext_link_label             : "Direct Link"
   less_than                  : "less than"
@@ -56,6 +57,7 @@ es: &DEFAULT_ES
   pagination_next            : "Siguiente"
   breadcrumb_home_label      : "Inicio"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Contenidos"
   ext_link_label             : "Enlace"
   less_than                  : "menos de"
@@ -100,6 +102,7 @@ fr: &DEFAULT_FR
   pagination_next            : "Suivant"
   breadcrumb_home_label      : "Accueil"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Sur cette page"
   ext_link_label             : "Lien direct"
   less_than                  : "plus petit que"
@@ -147,6 +150,7 @@ tr: &DEFAULT_TR
   pagination_next            : "Sonraki"
   breadcrumb_home_label      : "Ana Sayfa"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "İçindekiler"
   ext_link_label             : "Doğrudan Bağlantı"
   less_than                  : "Şu süreden az: "
@@ -189,6 +193,7 @@ pt: &DEFAULT_PT
   pagination_next            : "Seguinte"
   breadcrumb_home_label      : "Início"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Nesta Página"
   ext_link_label             : "Link Direto"
   less_than                  : "menos de"
@@ -227,6 +232,7 @@ pt-BR:
   pagination_next            : "Próxima"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Nesta página"
   ext_link_label             : "Link direto"
   less_than                  : "meno que"
@@ -269,6 +275,7 @@ it: &DEFAULT_IT
   pagination_next            : "Prossima"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Indice della pagina"
   ext_link_label             : "Link"
   less_than                  : "meno di"
@@ -311,6 +318,7 @@ zh: &DEFAULT_ZH
   pagination_next            : "向后"
   breadcrumb_home_label      : "首页"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "在本页上"
   ext_link_label             : "直接链接"
   less_than                  : "少于"
@@ -359,6 +367,7 @@ de: &DEFAULT_DE
   pagination_next            : "Nächste"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 :
   toc_label                  : "Auf dieser Seite"
   ext_link_label             : "Direkter Link"
   less_than                  : "weniger als"

docs/_docs/18-history.md

@@ -4,9 +4,24 @@ permalink: /docs/history/
 excerpt: "Change log of enhancements and bug fixes made to the theme."
 sidebar:
   nav: docs
-modified: 2016-11-16T11:40:00-05:00
+modified: 2016-11-17T15:55:48-05:00
 ---
 
+## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
+
+### Enhancements
+
+- Add `!default` values to **_sass/_variables.scss**.
+- Collapse sidebar navigation lists on smaller screens. [#607](https://github.com/mmistakes/minimal-mistakes/issues/607)
+
+### Bug Fixes
+
+- Rename `#comments` to something more unique to avoid clashes with Kramdown generated headline IDs. [#582](https://github.com/mmistakes/minimal-mistakes/issues/582)
+
+### Maintenance
+
+- Reorganize SCSS partials in **assets/css/main.scss**
+
 ## [4.0.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.6)
 
 ### Enhancements

docs/_includes/comments.html

@@ -11,7 +11,7 @@
     <h4 class="page__comments-title">{{ comments_label }}</h4>
     <section class="g-comments" data-href="{{ page.url | absolute_url }}" data-first_party_property="BLOGGER" data-view_type="FILTERED_POSTMOD">Loading Google+ Comments ...</section>
   {% when "staticman" %}
-    <section id="comments">
+    <section id="static-comments">
       {% if site.repository and site.staticman.branch %}
         <!-- Start static comments -->
         <div class="js-comments">
@@ -75,6 +75,6 @@
       {% endif %}
     </section>
   {% when "custom" %}
-    <section id="comments"></section>
+    <section id="custom-comments"></section>
   {% endcase %}
 </div>

docs/_includes/nav_list

@@ -1,8 +1,10 @@
 {% assign navigation = site.data.navigation[include.nav] %}
 
 <nav class="nav__list">
-  {% if page.sidebar.title %}<header><h4 class="nav__title" style="padding: 0;">{{ page.sidebar.title }}</h4></header>{% endif %}
+  {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
-  <ul>
+  <input id="ac-toc" name="accordion-toc" type="checkbox" />
+  <label for="ac-toc">{{ site.data.ui-text[site.locale].menu_label | default: "Toggle Menu" }}</label>
+  <ul class="nav__items">
     {% for nav in navigation %}
       <li>
         {% if nav.url %}

docs/_pages/home.md

@@ -7,7 +7,7 @@ header:
   cta_label: "<i class='fa fa-download'></i> Install Now"
   cta_url: "/docs/quick-start-guide/"
   caption:
-excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.6">Latest release v4.0.6</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
+excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7">Latest release v4.0.7</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
 feature_row:
   - image_path: /assets/images/mm-customizable-feature.png
     alt: "customizable"

docs/_posts/2012-03-15-layout-sidebar-custom.md

@@ -1,6 +1,6 @@
 ---
 title: "Layout: Sidebar Custom"
-excerpt: "A post to custom sidebar content."
+excerpt: "A post with custom sidebar content."
 author_profile: false
 sidebar:
   - title: "Title"
@@ -11,7 +11,7 @@ sidebar:
     text: "More text here."
 ---
 
-This post has a custom sidebar set in the post's YAML Front Matter..
+This post has a custom sidebar set in the post's YAML Front Matter.
 
 An example of how that YAML could look is:
 

docs/_posts/2012-03-15-layout-sidebar-nav-list.md

@@ -0,0 +1,62 @@
+---
+title: "Layout: Sidebar with Navigation List"
+excerpt: "A post with a sidebar navigation list."
+author_profile: false
+sidebar:
+  title: "Sample Title"
+  nav: sidebar-sample
+---
+
+This post has a custom navigation list set in the post's YAML Front Matter.
+
+```yaml
+sidebar:
+  title: "Sample Title"
+  nav: sidebar-sample
+```
+
+Along with navigation elements set in `_data/navigation.yml`.
+
+```yaml
+sidebar-sample:
+  - title: "Parent Page A"
+    children:
+      - title: "Child Page A1"
+        url: /
+      - title: "Child Page A2"
+        url: /
+      - title: "Child Page A3"
+        url: /
+      - title: "Child Page A4"
+        url: /
+  - title: "Parent Page B"
+    children:
+      - title: "Child Page B1"
+        url: /
+      - title: "Child Page B2"
+        url: /
+      - title: "Child Page B3"
+        url: /
+      - title: "Child Page B4"
+        url: /
+      - title: "Child Page B5"
+        url: /
+  - title: "Parent Page C"
+    children:
+      - title: "Child Page C1"
+        url: /
+      - title: "Child Page C2"
+        url: /
+      - title: "Child Page C3"
+        url: /
+      - title: "Child Page C4"
+        url: /
+      - title: "Child Page C5"
+        url: /
+  - title: "Parent Page D"
+    children:
+      - title: "Child Page D1"
+        url: /
+      - title: "Child Page D2"
+        url: /
+```

docs/_sass/_navigation.scss

@@ -314,7 +314,78 @@
    ========================================================================== */
 
 .nav__list {
-  font-size: 1.25rem;
+  margin-bottom: 1.5em;
+
+  input[type="checkbox"],
+  label {
+    display: none;
+  }
+
+  @include breakpoint(max-width $large) {
+
+    label {
+      position: relative;
+      display: inline-block;
+      padding: 0.5em 2.5em 0.5em 1em;
+      color: $gray;
+      font-size: $type-size-6;
+      font-weight: bold;
+      border: 1px solid $light-gray;
+      border-radius: $border-radius;
+      z-index: 20;
+      -webkit-transition: 0.2s ease-out;
+      transition: 0.2s ease-out;
+      cursor: pointer;
+
+      &:before,
+      &:after {
+        content: '';
+        position: absolute;
+        right: 1em;
+        top: 1.25em;
+        width: 0.75em;
+        height: 0.125em;
+        line-height: 1;
+        background-color: $gray;
+        transition: 0.2s ease-out;
+      }
+
+      &:after {
+        transform: rotate(90deg);
+      }
+
+      &:hover {
+        color: #fff;
+        border-color: $gray;
+        background-color: mix(white, #000, 20%);
+
+        &:before,
+        &:after {
+          background-color: #fff;
+        }
+      }
+    }
+
+    /* selected*/
+    input:checked + label {
+      color: white;
+      background-color: mix(white, #000, 20%);
+
+      &:before,
+      &:after {
+        background-color: #fff;
+      }
+    }
+
+    // on hover show expand
+    label:hover:after {
+      transform: rotate(90deg);
+    }
+
+    input:checked + label:hover:after {
+      transform: rotate(0);
+    }
+  }
 
   ul {
     margin-bottom: 1em;
@@ -322,13 +393,26 @@
 
   a {
     display: block;
-    padding: 0.125em 0;
+    padding: 0.25em 0;
-    color: inherit;
+
+    @include breakpoint($large) {
+      padding-top: 0.125em;
+      padding-bottom: 0.125em;
+    }
 
     &:hover {
       text-decoration: underline;
     }
   }
+}
+
+.nav__list .nav__items {
+  margin: 0;
+  font-size: 1.25rem;
+
+  a {
+    color: inherit;
+  }
 
   .active {
     margin-left: -0.5em;
@@ -343,6 +427,33 @@
       color: #fff;
     }
   }
+
+  @include breakpoint(max-width $large) {
+    position: relative;
+    max-height: 0;
+    opacity: 0;
+    overflow: hidden;
+    z-index: 10;
+    -webkit-transition: 0.3s ease-in-out;
+    transition: 0.3s ease-in-out;
+    -webkit-transform: translate(0, 10%);
+        -ms-transform: translate(0, 10%);
+            transform: translate(0, 10%);
+  }
+}
+
+@include breakpoint(max-width $large) {
+  .nav__list input:checked ~ .nav__items {
+    -webkit-transition: 0.5s ease-in-out;
+    transition: 0.5s ease-in-out;
+    max-height: 100vh;
+    opacity: 1;
+    overflow: visible;
+    margin-top: 1em;
+    -webkit-transform: translate(0, 0);
+        -ms-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
 }
 
 .nav__title {

docs/_sass/_sidebar.scss

@@ -33,10 +33,6 @@
     font-family: $sans-serif-narrow;
   }
 
-  h3, h4 {
-    font-size: $type-size-5;
-  }
-
   p, li {
     font-family: $sans-serif;
     font-size: $type-size-6;

docs/_sass/_variables.scss

@@ -6,142 +6,123 @@
    Typography
    ========================================================================== */
 
-$doc-font-size              : 16;
+$doc-font-size              : 16 !default;
 
 /* paragraph indention */
-$paragraph-indent           : false; // true, false (default)
+$paragraph-indent           : false !default; // true, false (default)
-$indent-var                 : 1.3em;
+$indent-var                 : 1.3em !default;
 
 /* system typefaces */
-$serif                      : Georgia, Times, serif;
+$serif                      : Georgia, Times, serif !default;
-$sans-serif                 : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif;
+$sans-serif                 : -apple-system, ".SFNSText-Regular", "San Francisco", "Roboto", "Segoe UI", "Helvetica Neue", "Lucida Grande", Arial, sans-serif !default;
-$monospace                  : Monaco, Consolas, "Lucida Console", monospace;
+$monospace                  : Monaco, Consolas, "Lucida Console", monospace !default;
 
 /* sans serif typefaces */
-$sans-serif-narrow          : $sans-serif;
+$sans-serif-narrow          : $sans-serif !default;
-$helvetica                  : Helvetica, "Helvetica Neue", Arial, sans-serif;
+$helvetica                  : Helvetica, "Helvetica Neue", Arial, sans-serif !default;
 
 /* serif typefaces */
-$georgia                    : Georgia, serif;
+$georgia                    : Georgia, serif !default;
-$times                      : Times, serif;
+$times                      : Times, serif !default;
-$bodoni                     : "Bodoni MT", serif;
+$bodoni                     : "Bodoni MT", serif !default;
-$calisto                    : "Calisto MT", serif;
+$calisto                    : "Calisto MT", serif !default;
-$garamond                   : Garamond, serif;
+$garamond                   : Garamond, serif !default;
 
-$global-font-family         : $sans-serif;
+$global-font-family         : $sans-serif !default;
-$header-font-family         : $sans-serif;
+$header-font-family         : $sans-serif !default;
-$caption-font-family        : $serif;
+$caption-font-family        : $serif !default;
 
 /* type scale */
-$type-size-1                : 2.441em;  // ~39.056px
+$type-size-1                : 2.441em !default;  // ~39.056px
-$type-size-2                : 1.953em;  // ~31.248px
+$type-size-2                : 1.953em !default;  // ~31.248px
-$type-size-3                : 1.563em;  // ~25.008px
+$type-size-3                : 1.563em !default;  // ~25.008px
-$type-size-4                : 1.25em;   // ~20px
+$type-size-4                : 1.25em !default;   // ~20px
-$type-size-5                : 1em;      // ~16px
+$type-size-5                : 1em !default;      // ~16px
-$type-size-6                : 0.75em;   // ~12px
+$type-size-6                : 0.75em !default;   // ~12px
-$type-size-7                : 0.6875em; // ~11px
+$type-size-7                : 0.6875em !default; // ~11px
-$type-size-8                : 0.625em;  // ~10px
+$type-size-8                : 0.625em !default;  // ~10px
 
 
 /*
    Colors
    ========================================================================== */
 
-$gray                       : #7a8288;
+$gray                       : #7a8288 !default;
-$dark-gray                  : mix(#000, $gray, 40%);
+$dark-gray                  : mix(#000, $gray, 40%) !default;
-$darker-gray                : mix(#000, $gray, 60%);
+$darker-gray                : mix(#000, $gray, 60%) !default;
-$light-gray                 : mix(#fff, $gray, 50%);
+$light-gray                 : mix(#fff, $gray, 50%) !default;
-$lighter-gray               : mix(#fff, $gray, 90%);
+$lighter-gray               : mix(#fff, $gray, 90%) !default;
 
-$body-color                 : #fff;
+$body-color                 : #fff !default;
-$background-color           : #fff;
+$background-color           : #fff !default;
-$code-background-color      : #fafafa;
+$code-background-color      : #fafafa !default;
-$code-background-color-dark : $light-gray;
+$code-background-color-dark : $light-gray !default;
-$text-color                 : $dark-gray;
+$text-color                 : $dark-gray !default;
-$border-color               : $lighter-gray;
+$border-color               : $lighter-gray !default;
 
-$primary-color              : #7a8288;
+$primary-color              : #7a8288 !default;
-$success-color              : #62c462;
+$success-color              : #62c462 !default;
-$warning-color              : #f89406;
+$warning-color              : #f89406 !default;
-$danger-color               : #ee5f5b;
+$danger-color               : #ee5f5b !default;
-$info-color                 : #52adc8;
+$info-color                 : #52adc8 !default;
 
 /* brands */
-$behance-color              : #1769FF;
+$behance-color              : #1769FF !default;
-$dribbble-color             : #ea4c89;
+$dribbble-color             : #ea4c89 !default;
-$facebook-color             : #3b5998;
+$facebook-color             : #3b5998 !default;
-$flickr-color               : #ff0084;
+$flickr-color               : #ff0084 !default;
-$foursquare-color           : #0072b1;
+$foursquare-color           : #0072b1 !default;
-$github-color               : #171516;
+$github-color               : #171516 !default;
-$google-plus-color          : #dd4b39;
+$google-plus-color          : #dd4b39 !default;
-$instagram-color            : #517fa4;
+$instagram-color            : #517fa4 !default;
-$lastfm-color               : #d51007;
+$lastfm-color               : #d51007 !default;
-$linkedin-color             : #007bb6;
+$linkedin-color             : #007bb6 !default;
-$pinterest-color            : #cb2027;
+$pinterest-color            : #cb2027 !default;
-$rss-color                  : #fa9b39;
+$rss-color                  : #fa9b39 !default;
-$soundcloud-color           : #ff3300;
+$soundcloud-color           : #ff3300 !default;
-$stackoverflow-color        : #fe7a15;
+$stackoverflow-color        : #fe7a15 !default;
-$tumblr-color               : #32506d;
+$tumblr-color               : #32506d !default;
-$twitter-color              : #55acee;
+$twitter-color              : #55acee !default;
-$vimeo-color                : #1ab7ea;
+$vimeo-color                : #1ab7ea !default;
-$vine-color                 : #00bf8f;
+$vine-color                 : #00bf8f !default;
-$youtube-color              : #bb0000;
+$youtube-color              : #bb0000 !default;
-$xing-color                 : #006567;
+$xing-color                 : #006567 !default;
 
 
 /* links */
-$link-color                 : $info-color;
+$link-color                 : $info-color !default;
-$link-color-hover           : mix(#000, $link-color, 25%);
+$link-color-hover           : mix(#000, $link-color, 25%) !default;
-$link-color-visited         : mix(#fff, $link-color, 25%);
+$link-color-visited         : mix(#fff, $link-color, 25%) !default;
-$masthead-link-color        : $primary-color;
+$masthead-link-color        : $primary-color !default;
-$masthead-link-color-hover  : mix(#000, $primary-color, 25%);
+$masthead-link-color-hover  : mix(#000, $primary-color, 25%) !default;
 
 
 /*
    Breakpoints
    ========================================================================== */
 
-@include breakpoint-set("to ems", true);
+$small                      : 600px !default;
-
+$medium                     : 768px !default;
-$small                      : 600px;
+$medium-wide                : 900px !default;
-$medium                     : 768px;
+$large                      : 1024px !default;
-$medium-wide                : 900px;
+$x-large                    : 1280px !default;
-$large                      : 1024px;
-$x-large                    : 1280px;
 
 
 /*
    Grid
    ========================================================================== */
 
-$right-sidebar-width-narrow : 200px;
+$right-sidebar-width-narrow : 200px !default;
-$right-sidebar-width        : 300px;
+$right-sidebar-width        : 300px !default;
-$right-sidebar-width-wide   : 400px;
+$right-sidebar-width-wide   : 400px !default;
-
-$susy: (
-  columns: 12,
-  // column-width: 90px,
-  gutters: 1/4,
-  math: fluid,
-  output: float,
-  gutter-position: after,
-  container: $large,
-  global-box-sizing: border-box,
-  // debug: (
-  //   image: show,
-  //   color: blue,
-  //   output: overlay,
-  //   toggle: top right,
-  // ),
-);
 
 
 /*
    Other
    ========================================================================== */
 
-$border-radius              : 4px;
+$border-radius              : 4px !default;
-$box-shadow                 : 0 1px 1px rgba(0, 0, 0, 0.125);
+$box-shadow                 : 0 1px 1px rgba(0, 0, 0, 0.125) !default;
-$navicon-width              : 28px;
+$navicon-width              : 28px !default;
-$navicon-height             : 4px;
+$navicon-height             : 4px !default;
-$global-transition          : all 0.2s ease-in-out;
+$global-transition          : all 0.2s ease-in-out !default;

docs/assets/css/main.scss

@@ -10,14 +10,53 @@
  *
 */
 
-@import "vendor/breakpoint/breakpoint"; // media query mixins
+/*
+   Variables
+   ========================================================================== */
+
 @import "variables";
-@import "mixins";
+
+
+/*
+   Vendor
+   ========================================================================== */
+
+/* Breakpoint - media query mixins */
+@import "vendor/breakpoint/breakpoint";
+@include breakpoint-set("to ems", true);
+
+/* Font Awesome - icon font set */
+@import "vendor/font-awesome/font-awesome";
+
+/* Magnific Popup - responsive lightbox */
+@import "vendor/magnific-popup/magnific-popup"; // Magnific Popup
+
+/* Susy - grid mixins */
+$susy: (
+  columns: 12,
+  gutters: 1/4,
+  math: fluid,
+  output: float,
+  gutter-position: after,
+  container: $large,
+  global-box-sizing: border-box,
+  // debug: (
+  //   image: show,
+  //   color: blue,
+  //   output: overlay,
+  //   toggle: top right,
+  // ),
+);
 @import "vendor/susy/susy";
 
+
+/*
+   Base
+   ========================================================================== */
+
+@import "mixins";
 @import "reset";
 @import "base";
-
 @import "utilities";
 @import "animations";
 @import "tables";
@@ -27,13 +66,14 @@
 @import "navigation";
 @import "footer";
 @import "syntax";
-
 @import "forms";
 
+
+/*
+   Layout specific
+   ========================================================================== */
+
 @import "page";
 @import "archive";
 @import "sidebar";
-
-@import "vendor/font-awesome/font-awesome";
-@import "vendor/magnific-popup/magnific-popup";
 @import "print";

minimal-mistakes-jekyll.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name                    = "minimal-mistakes-jekyll"
-  spec.version                 = "4.0.6"
+  spec.version                 = "4.0.7"
   spec.authors                 = ["Michael Rose"]
 
   spec.summary                 = %q{A flexible two-column Jekyll theme.}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimal-mistakes",
-  "version": "4.0.6",
+  "version": "4.0.7",
   "description": "Minimal Mistakes Jekyll theme npm build scripts",
   "repository": {
     "type": "git",

test/_data/navigation.yml

@@ -10,3 +10,46 @@ main:
     url: /collection-archive/
   - title: "Sitemap"
     url: /sitemap/
+
+# sidebar navigation list sample
+sidebar-sample:
+  - title: "Parent Page A"
+    children:
+      - title: "Child Page A1"
+        url: /
+      - title: "Child Page A2"
+        url: /
+      - title: "Child Page A3"
+        url: /
+      - title: "Child Page A4"
+        url: /
+  - title: "Parent Page B"
+    children:
+      - title: "Child Page B1"
+        url: /
+      - title: "Child Page B2"
+        url: /
+      - title: "Child Page B3"
+        url: /
+      - title: "Child Page B4"
+        url: /
+      - title: "Child Page B5"
+        url: /
+  - title: "Parent Page C"
+    children:
+      - title: "Child Page C1"
+        url: /
+      - title: "Child Page C2"
+        url: /
+      - title: "Child Page C3"
+        url: /
+      - title: "Child Page C4"
+        url: /
+      - title: "Child Page C5"
+        url: /
+  - title: "Parent Page D"
+    children:
+      - title: "Child Page D1"
+        url: /
+      - title: "Child Page D2"
+        url: /

test/_data/ui-text.yml

@@ -8,6 +8,7 @@ en: &DEFAULT_EN
   pagination_next            : "Next"
   breadcrumb_home_label      : "Home"
   breadcrumb_separator       : "/"
+  menu_label                 : "Toggle Menu"
   toc_label                  : "On This Page"
   ext_link_label             : "Direct Link"
   less_than                  : "less than"
@@ -41,3 +42,375 @@ en: &DEFAULT_EN
   loading_label              : "Loading..."
 en-US:
   <<: *DEFAULT_EN
+en-CA:
+  <<: *DEFAULT_EN
+en-GB:
+  <<: *DEFAULT_EN
+en-AU:
+  <<: *DEFAULT_EN
+
+# Spanish
+# --------------
+es: &DEFAULT_ES
+  page                       : "Página"
+  pagination_previous        : "Anterior"
+  pagination_next            : "Siguiente"
+  breadcrumb_home_label      : "Inicio"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Contenidos"
+  ext_link_label             : "Enlace"
+  less_than                  : "menos de"
+  minute_read                : "minuto de lectura"
+  share_on_label             : "Compartir"
+  meta_label                 :
+  tags_label                 : "Etiquetas:"
+  categories_label           : "Categorías:"
+  date_label                 : "Actualizado:"
+  comments_label             : "Comentar"
+  comments_title             :
+  more_label                 : "Ver más"
+  related_label              : "Podrías ver también"
+  follow_label               : "Seguir:"
+  feed_label                 : "Feed"
+  powered_by                 : "Powered by"
+  website_label              : "Sitio web"
+  email_label                : "Email"
+  recent_posts               : "Entradas recientes"
+  undefined_wpm              : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml"
+  comment_form_info          :
+  comment_form_comment_label :
+  comment_form_md_info       :
+  comment_form_name_label    :
+  comment_form_email_label   :
+  comment_form_website_label :
+  comment_btn_submit         :
+  comment_btn_submitted      :
+  comment_success_msg        :
+  comment_error_msg          :
+  loading_label              :
+es-ES:
+  <<: *DEFAULT_ES
+es-CO:
+  <<: *DEFAULT_ES
+
+# French
+# -----------------
+fr: &DEFAULT_FR
+  page                       : "Page"
+  pagination_previous        : "Précédent"
+  pagination_next            : "Suivant"
+  breadcrumb_home_label      : "Accueil"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Sur cette page"
+  ext_link_label             : "Lien direct"
+  less_than                  : "plus petit que"
+  minute_read                : "minute de lecture"
+  share_on_label             : "Partager sur"
+  meta_label                 :
+  tags_label                 : "Tags :"
+  categories_label           : "Catégories :"
+  date_label                 : "Mis à jour :"
+  comments_label             : "Laisser un commentaire"
+  comments_title             :
+  more_label                 : "Lire plus"
+  related_label              : "Vous pourriez aimer"
+  follow_label               : "Suivez moi"
+  feed_label                 : "Flux"
+  powered_by                 : "Propulsé par"
+  website_label              : "Site"
+  email_label                : "Email"
+  recent_posts               : "Posts récents"
+  undefined_wpm              : "Le paramètre words_per_minute n'est pas défini dans _config.yml"
+  comments_title             : "Commentaires"
+  comment_form_info          : "Votre adresse email ne sera pas visible. Les champs obligatoires sont marqués"
+  comment_form_comment_label : "Commentaire"
+  comment_form_md_info       : "Markdown est supporté."
+  comment_form_name_label    : "Nom"
+  comment_form_email_label   : "Adresse mail"
+  comment_form_website_label : "Site web (optionnel)"
+  comment_btn_submit         : "Envoyer"
+  comment_btn_submitted      : "Envoyé"
+  comment_success_msg        : "Merci pour votre comentaire, il sera visible sur le site une fois approuvé."
+  comment_error_msg          : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez."
+  loading_label              : "Chargement..."
+fr-FR:
+  <<: *DEFAULT_FR
+fr-BE:
+  <<: *DEFAULT_FR
+fr-CH:
+  <<: *DEFAULT_FR
+
+# Turkish
+# -----------------
+tr: &DEFAULT_TR
+  page                       : "Sayfa"
+  pagination_previous        : "Önceki"
+  pagination_next            : "Sonraki"
+  breadcrumb_home_label      : "Ana Sayfa"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "İçindekiler"
+  ext_link_label             : "Doğrudan Bağlantı"
+  less_than                  : "Şu süreden az: "
+  minute_read                : "dakika tahmini okuma süresi"
+  share_on_label             : "Paylaş"
+  meta_label                 :
+  tags_label                 : "Etiketler:"
+  categories_label           : "Kategoriler:"
+  date_label                 : "Güncelleme tarihi:"
+  comments_label             : "Yorum yapın"
+  comments_title             : "Yorumlar"
+  more_label                 : "Daha fazlasını öğrenin"
+  related_label              : "Bunlar ilginizi çekebilir:"
+  follow_label               : "Takip et:"
+  feed_label                 : "RSS"
+  powered_by                 : "Emeği geçenler: "
+  website_label              : "Web sayfası"
+  email_label                : "E-posta"
+  recent_posts               : "Son yazılar"
+  undefined_wpm              : "_config.yml dosyasında tanımlanmamış words_per_minute parametresi"
+  comment_form_info          : "Email adresiniz gösterilmeyecektir. Zorunlu alanlar işaretlenmiştir"
+  comment_form_comment_label : "Yorumunuz"
+  comment_form_md_info       : "Markdown desteklenmektedir."
+  comment_form_name_label    : "Adınız"
+  comment_form_email_label   : "Email adresiniz"
+  comment_form_website_label : "Websiteniz (opsiyonel)"
+  comment_btn_submit         : "Yorum Yap"
+  comment_btn_submitted      : "Gönderildi"
+  comment_success_msg        : "Yorumunuz için teşekkürler! Yorumunuz onaylandıktan sonra sitede gösterilecektir."
+  comment_error_msg          : "Maalesef bir hata oluştu. Lütfen zorunlu olan tüm alanları doldurduğunuzdan emin olun ve sonrasında tekrar deneyin."
+  loading_label              : "Yükleniyor..."
+tr-TR:
+  <<: *DEFAULT_TR
+
+# Portuguese
+# -----------------
+pt: &DEFAULT_PT
+  page                       : "Página"
+  pagination_previous        : "Anterior"
+  pagination_next            : "Seguinte"
+  breadcrumb_home_label      : "Início"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Nesta Página"
+  ext_link_label             : "Link Direto"
+  less_than                  : "menos de"
+  minute_read                : "minutos de leitura"
+  share_on_label             : "Partilhar no"
+  meta_label                 :
+  tags_label                 : "Etiquetas:"
+  categories_label           : "Categorias:"
+  date_label                 : "Atualizado:"
+  comments_label             : "Deixe um Comentário"
+  comments_title             : "Comentários"
+  more_label                 : "Saber mais"
+  related_label              : "Também pode gostar de"
+  follow_label               : "Siga:"
+  feed_label                 : "Feed"
+  powered_by                 : "Feito com"
+  website_label              : "Site"
+  email_label                : "Email"
+  recent_posts               : "Artigos Recentes"
+  undefined_wpm              : "Parâmetro words_per_minute não definido em _config.yml"
+  comment_form_info          : "O seu endereço email não será publicado. Os campos obrigatórios estão assinalados"
+  comment_form_comment_label : "Comentário"
+  comment_form_md_info       : "Markdown é suportado."
+  comment_form_name_label    : "Nome"
+  comment_form_email_label   : "Endereço Email"
+  comment_form_website_label : "Site (opcional)"
+  comment_btn_submit         : "Sumbeter Comentário"
+  comment_btn_submitted      : "Submetido"
+  comment_success_msg        : "Obrigado pelo seu comentário! Será visível no site logo que aprovado."
+  comment_error_msg          : "Lamento, ocorreu um erro na sua submissão. Por favor verifique se todos os campos obrigatórios estão corretamente preenchidos e tente novamente."
+  loading_label              : "A carregar..."
+# Brazilian Portuguese
+pt-BR:
+  page                       : "Página"
+  pagination_previous        : "Anterior"
+  pagination_next            : "Próxima"
+  breadcrumb_home_label      : "Home"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Nesta página"
+  ext_link_label             : "Link direto"
+  less_than                  : "meno que"
+  minute_read                : "minutos de leitura"
+  share_on_label             : "Compartilhe em"
+  meta_label                 :
+  tags_label                 : "Tags:"
+  categories_label           : "Categorias:"
+  date_label                 : "Atualizado em:"
+  comments_label             : "Deixe um comentário"
+  comments_title             :
+  more_label                 : "Aprenda Mais"
+  related_label              : "Você Talvez Goste Também"
+  follow_label               : "Acompanhe em"
+  feed_label                 : "Feed"
+  powered_by                 : "Feito com"
+  website_label              : "Site"
+  email_label                : "Email"
+  recent_posts               : "Postagens recentes"
+  undefined_wpm              : "Parâmetro indefinido em word_per_minute no _config.yml"
+  comment_form_info          :
+  comment_form_comment_label :
+  comment_form_md_info       :
+  comment_form_name_label    :
+  comment_form_email_label   :
+  comment_form_website_label :
+  comment_btn_submit         :
+  comment_btn_submitted      :
+  comment_success_msg        :
+  comment_error_msg          :
+  loading_label              :
+pt-PT:
+  <<: *DEFAULT_PT
+
+# Italian
+# -----------------
+it: &DEFAULT_IT
+  page                       : "Pagina"
+  pagination_previous        : "Precedente"
+  pagination_next            : "Prossima"
+  breadcrumb_home_label      : "Home"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Indice della pagina"
+  ext_link_label             : "Link"
+  less_than                  : "meno di"
+  minute_read                : "minuto/i di lettura"
+  share_on_label             : "Condividi"
+  meta_label                 :
+  tags_label                 : "Tags:"
+  categories_label           : "Categorie:"
+  date_label                 : "Aggiornato:"
+  comments_label             : "Scrivi un commento"
+  comments_title             :
+  more_label                 : "Scopri di più"
+  related_label              : "Potrebbe Piacerti Anche"
+  follow_label               : "Segui:"
+  feed_label                 : "Feed"
+  powered_by                 : "Powered by"
+  website_label              : "Website"
+  email_label                : "Email"
+  recent_posts               : "Articoli Recenti"
+  undefined_wpm              : "Parametro words_per_minute non definito in _config.yml"
+  comment_form_info          : "Il tuo indirizzo email non sarà pubblicato. Sono segnati i campi obbligatori"
+  comment_form_comment_label : "Commenta"
+  comment_form_md_info       : "Il linguaggio Markdown è supportato"
+  comment_form_name_label    : "Nome"
+  comment_form_email_label   : "Indirizzo email"
+  comment_form_website_label : "Sito Web (opzionale)"
+  comment_btn_submit         : "Invia commento"
+  comment_btn_submitted      : "Inviato"
+  comment_success_msg        : "Grazie per il tuo commento! Verrà visualizzato nel sito una volta che sarà approvato."
+  comment_error_msg          : "C'è stato un errore con il tuo invio. Assicurati che tutti i campi richiesti siano stati completati e riprova."
+  loading_label              : "Caricamento..."
+it-IT:
+  <<: *DEFAULT_IT
+
+# Chinese  (zh-CN Chinese - China)
+# -----------------
+zh: &DEFAULT_ZH
+  page                       : "页面"
+  pagination_previous        : "向前"
+  pagination_next            : "向后"
+  breadcrumb_home_label      : "首页"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "在本页上"
+  ext_link_label             : "直接链接"
+  less_than                  : "少于"
+  minute_read                : "分钟 阅读"
+  share_on_label             : "分享"
+  meta_label                 :
+  tags_label                 : "标签:"
+  categories_label           : "分类:"
+  date_label                 : "最新的:"
+  comments_label             : "留下评论"
+  comments_title             : "评论"
+  more_label                 : "了解更多"
+  related_label              : "猜您还喜欢"
+  follow_label               : "关注:"
+  feed_label                 : "Feed"
+  powered_by                 : "Powered by"
+  website_label              : "网站"
+  email_label                : "Email"
+  recent_posts               : "最新文章"
+  undefined_wpm              : "Undefined parameter words_per_minute at _config.yml"
+  comment_form_info          : "Your email address will not be published. Required fields are marked"
+  comment_form_comment_label : "Comment"
+  comment_form_md_info       : "Markdown is supported."
+  comment_form_name_label    : "Name"
+  comment_form_email_label   : "Email address"
+  comment_form_website_label : "Website (optional)"
+  comment_btn_submit         : "Submit Comment"
+  comment_btn_submitted      : "Submitted"
+  comment_success_msg        : "Thanks for your comment! It will show on the site once it has been approved."
+  comment_error_msg          : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again."
+  loading_label              : "Loading..."
+zh-CN:
+  <<: *DEFAULT_ZH
+zh-HK:
+  <<: *DEFAULT_ZH
+zh-SG:
+  <<: *DEFAULT_ZH
+zh-TW:
+  <<: *DEFAULT_ZH
+
+# German / Deutsch
+# -----------------
+de: &DEFAULT_DE
+  page                       : "Seite"
+  pagination_previous        : "Vorherige"
+  pagination_next            : "Nächste"
+  breadcrumb_home_label      : "Home"
+  breadcrumb_separator       : "/"
+  menu_label                 :
+  toc_label                  : "Auf dieser Seite"
+  ext_link_label             : "Direkter Link"
+  less_than                  : "weniger als"
+  minute_read                : "Minuten zum lesen"
+  share_on_label             : "Teilen auf"
+  meta_label                 :
+  tags_label                 : "Tags:"
+  categories_label           : "Kategorien:"
+  date_label                 : "Aktualisiert:"
+  comments_label             : "Hinterlassen sie einen Kommentar"
+  comments_title             : "Kommentare"
+  more_label                 : "Mehr anzeigen"
+  related_label              : "Ihnen gefällt vielleicht auch"
+  follow_label               : "Folgen:"
+  feed_label                 : "Feed"
+  powered_by                 : "Powered by"
+  website_label              : "Webseite"
+  email_label                : "E-Mail"
+  recent_posts               : "Aktuelle Beiträge"
+  undefined_wpm              : "Undefinierter Parameter words_per_minute in _config.yml"
+  comment_form_info          : "Ihre E-Mail Adresse wird nicht veröffentlicht. Benötigte Felder sind markiert"
+  comment_form_comment_label : "Kommentar"
+  comment_form_md_info       : "Markdown wird unterstützt."
+  comment_form_name_label    : "Name"
+  comment_form_email_label   : "E-Mail Addresse"
+  comment_form_website_label : "Webseite (optional)"
+  comment_btn_submit         : "Kommentar absenden"
+  comment_btn_submitted      : "Versendet"
+  comment_success_msg        : "Danke für ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde."
+  comment_error_msg          : "Entschuldigung, es gab einen Fehler. Bitte füllen sie alle benötigten Felder aus und versuchen sie es erneut."
+  loading_label              : "Lade..."
+de-DE:
+  <<: *DEFAULT_DE
+de-AT:
+  <<: *DEFAULT_DE
+de-CH:
+  <<: *DEFAULT_DE
+de-BE:
+  <<: *DEFAULT_DE
+de-LI:
+  <<: *DEFAULT_DE
+de-LU:
+  <<: *DEFAULT_DE
+
+# Another locale
+# --------------

test/_posts/2012-03-15-layout-sidebar-custom.md

@@ -1,6 +1,6 @@
 ---
 title: "Layout: Sidebar Custom"
-excerpt: "A post to custom sidebar content."
+excerpt: "A post with custom sidebar content."
 author_profile: false
 sidebar:
   - title: "Title"
@@ -11,7 +11,7 @@ sidebar:
     text: "More text here."
 ---
 
-This post has a custom sidebar set in the post's YAML Front Matter..
+This post has a custom sidebar set in the post's YAML Front Matter.
 
 An example of how that YAML could look is:
 

test/_posts/2012-03-15-layout-sidebar-nav-list.md

@@ -0,0 +1,62 @@
+---
+title: "Layout: Sidebar with Navigation List"
+excerpt: "A post with a sidebar navigation list."
+author_profile: false
+sidebar:
+  title: "Sample Title"
+  nav: sidebar-sample
+---
+
+This post has a custom navigation list set in the post's YAML Front Matter.
+
+```yaml
+sidebar:
+  title: "Sample Title"
+  nav: sidebar-sample
+```
+
+Along with navigation elements set in `_data/navigation.yml`.
+
+```yaml
+sidebar-sample:
+  - title: "Parent Page A"
+    children:
+      - title: "Child Page A1"
+        url: /
+      - title: "Child Page A2"
+        url: /
+      - title: "Child Page A3"
+        url: /
+      - title: "Child Page A4"
+        url: /
+  - title: "Parent Page B"
+    children:
+      - title: "Child Page B1"
+        url: /
+      - title: "Child Page B2"
+        url: /
+      - title: "Child Page B3"
+        url: /
+      - title: "Child Page B4"
+        url: /
+      - title: "Child Page B5"
+        url: /
+  - title: "Parent Page C"
+    children:
+      - title: "Child Page C1"
+        url: /
+      - title: "Child Page C2"
+        url: /
+      - title: "Child Page C3"
+        url: /
+      - title: "Child Page C4"
+        url: /
+      - title: "Child Page C5"
+        url: /
+  - title: "Parent Page D"
+    children:
+      - title: "Child Page D1"
+        url: /
+      - title: "Child Page D2"
+        url: /
+```