Merge branch 'release/4.0.7'

mmistakes · Nov 17, 2016 · afb1ed4 · afb1ed4
2 parents ef7aeeb + 028371c
commit afb1ed4
Show file tree

Hide file tree

Showing 36 changed files with 1,152 additions and 270 deletions.
diff --git a/CHANGELOG.md b/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

diff --git a/_data/ui-text.yml b/_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"

diff --git a/_includes/comments.html b/_includes/comments.html
@@ -11,7 +11,7 @@ <h4 class="page__comments-title">{{ comments_label }}</h4>
     <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 @@ <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_labe
       {% endif %}
     </section>
   {% when "custom" %}
-    <section id="comments"></section>
+    <section id="custom-comments"></section>
   {% endcase %}
 </div>
diff --git a/_includes/nav_list b/_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 %}
-  <ul>
+  {% if page.sidebar.title %}<h3 class="nav__title" style="padding-left: 0;">{{ page.sidebar.title }}</h3>{% endif %}
+  <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 %}

diff --git a/_sass/_archive.scss b/_sass/_archive.scss
@@ -235,4 +235,4 @@
       }
     }
   }
-}
+}
diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss
@@ -314,21 +314,105 @@
    ========================================================================== */
 
 .nav__list {
-  font-size: 1.25rem;
+  margin-bottom: 1.5em;
 
-  ul {
-    margin-bottom: 1em;
+  input[type="checkbox"],
+  label {
+    display: none;
   }
 
-  a {
-    display: block;
-    padding: 0.125em 0;
-    color: inherit;
+  @include breakpoint(max-width $large) {
 
-    &:hover {
-      text-decoration: underline;
+    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;
+    }
+
+    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 {
     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;
+    overflow: visible;
+    opacity: 1;
+    margin-top: 1em;
+    -webkit-transform: translate(0, 0);
+        -ms-transform: translate(0, 0);
+            transform: translate(0, 0);
+  }
 }
 
 .nav__title {

diff --git a/_sass/_print.scss b/_sass/_print.scss
@@ -15,4 +15,4 @@
   .page__footer {
     display: none;
   }
-}
+}
diff --git a/_sass/_reset.scss b/_sass/_reset.scss
@@ -184,4 +184,4 @@ input[type="search"]::-webkit-search-cancel-button {
 textarea {
   overflow: auto; /* remove vertical scrollbar in IE6-9*/
   vertical-align: top; /* readability and alignment cross-browser*/
-}
+}
diff --git a/_sass/_sidebar.scss b/_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;

diff --git a/_sass/_utilities.scss b/_sass/_utilities.scss
@@ -467,4 +467,4 @@ a.reversefootnote {
 .required {
   color: $danger-color;
   font-weight: bold;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -235,4 +235,4 @@ @@
           }
         }
       }
-    }
+    }