Merge branch 'release/3.3.7'

mmistakes · Aug 8, 2016 · 24878a3 · 24878a3
2 parents e3bdd10 + 5e0e568
commit 24878a3
Show file tree

Hide file tree

Showing 114 changed files with 162 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [3.3.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.7)
+
+### Bug Fixes
+
+- Re-enabled Jekyll plugins in `_config.yml` in case they aren't autoloaded in `Gemfile`. [#417](https://github.com/mmistakes/minimal-mistakes/issues/417)
+
+### Enhancements
+
+- Fallback to `site.github.url` for use in `{{ base_path }}` when `site.url` is `nil`.
+- Replace Sass and Autoprefixer `npm` build scripts with [Jekyll's built-in asset support](https://jekyllrb.com/docs/assets/). [#333](https://github.com/mmistakes/minimal-mistakes/issues/333)
+
+### Maintenance
+
+- Document `site.repository` and its role with [`github-metadata`](https://github.com/jekyll/github-metadata) gem.
+- Add sample [archive page with content](https://mmistakes.github.io/minimal-mistakes/archive-layout-with-content/) for testing styles on demo site.
+
 ## [3.3.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.6)
 
 ### Bug Fixes

diff --git a/README.md b/README.md
@@ -20,6 +20,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
 ### Notable Features
 
 - Compatible with Jekyll 3.x and GitHub Pages
+- Support for Jekyll's built-in Sass/SCSS preprocessor
 - Several layout options (single, archive, splash pages)
 - SEO optimized with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data
 - Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more.

diff --git a/_config.yml b/_config.yml
@@ -145,6 +145,12 @@ kramdown:
   enable_coderay: false
 
 
+# Sass/SCSS
+sass:
+  sass_dir: _sass
+  style: compressed # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
+
+
 # Outputting
 permalink: /:categories/:title/
 paginate: 5 # amount of posts to show
@@ -153,20 +159,20 @@ timezone: # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
 
 
 # Plugins
-# gems:
-#   - jekyll-paginate
-#   - jekyll-sitemap
-#   - jekyll-gist
-#   - jekyll-feed
-#   - jemoji
+gems:
+  - jekyll-paginate
+  - jekyll-sitemap
+  - jekyll-gist
+  - jekyll-feed
+  - jemoji
 
 # mimic GitHub Pages with --safe
-# whitelist:
-#   - jekyll-paginate
-#   - jekyll-sitemap
-#   - jekyll-gist
-#   - jekyll-feed
-#   - jemoji
+whitelist:
+  - jekyll-paginate
+  - jekyll-sitemap
+  - jekyll-gist
+  - jekyll-feed
+  - jemoji
 
 
 # Archives

diff --git a/_includes/base_path b/_includes/base_path
@@ -1 +1,5 @@
-{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
+{% if site.url %}
+  {% assign base_path = site.url | append: site.baseurl %}
+{% else %}
+  {% assign base_path = site.github.url %}
+{% endif %}
diff --git a/assets/_scss/_animations.scss → _sass/_animations.scss b/assets/_scss/_animations.scss → _sass/_animations.scss
@@ -2,6 +2,15 @@
    ANIMATIONS
    ========================================================================== */
 
+@-webkit-keyframes intro {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
 @keyframes intro {
   0% {
     opacity: 0;

diff --git a/assets/_scss/_archive.scss → _sass/_archive.scss b/assets/_scss/_archive.scss → _sass/_archive.scss
@@ -41,7 +41,7 @@
   }
 }
 
-// remove border
+/* remove border*/
 .page__content {
 
   .archive__item-title {
@@ -129,8 +129,8 @@
   }
 
   @include breakpoint($medium) {
-    margin-left: 0; // reset before mixin does its thing
-    margin-right: 0; // reset before mixin does its thing
+    margin-left: 0; /* reset before mixin does its thing*/
+    margin-right: 0; /* reset before mixin does its thing*/
     @include gallery(2.5 of 10);
 
     .archive__item-teaser {

diff --git a/assets/_scss/_base.scss → _sass/_base.scss b/assets/_scss/_base.scss → _sass/_base.scss
@@ -129,7 +129,7 @@ tt, code, kbd, samp, pre {
 }
 
 pre {
-  overflow-x: auto; // add scrollbars to wide code blocks
+  overflow-x: auto; /* add scrollbars to wide code blocks*/
 }
 
 p > code,
@@ -147,7 +147,7 @@ td > code {
 
   &:before, &:after {
     letter-spacing: -0.2em;
-    content: "\00a0"; // non-breaking space
+    content: "\00a0"; /* non-breaking space*/
   }
 }
 
@@ -179,9 +179,12 @@ li ol {
 /* Figures and images */
 
 figure {
+  display: -webkit-box;
   display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
+  -webkit-box-pack: justify;
+          justify-content: space-between;
+  -webkit-box-align: start;
+          align-items: flex-start;
   flex-wrap: wrap;
   margin: 2em 0;
 
@@ -194,6 +197,7 @@ figure {
   img {
     width: 100%;
     border-radius: $border-radius;
+    -webkit-transition: $global-transition;
     transition: $global-transition;
   }
 
@@ -240,6 +244,7 @@ figcaption {
     color: inherit;
     text-decoration: none;
     border-bottom: 1px solid $light-gray;
+    -webkit-transition: $global-transition;
     transition: $global-transition;
 
     &:hover {
@@ -305,5 +310,6 @@ nav {
    ========================================================================== */
 
 b, i, strong, em, blockquote, p, q, span, figure, img, h1, h2, header, input, a, tr, td, form button, input[type="submit"], .btn, .highlight, .archive__item-teaser {
+  -webkit-transition: $global-transition;
   transition: $global-transition;
 }
diff --git a/assets/_scss/_buttons.scss → _sass/_buttons.scss b/assets/_scss/_buttons.scss → _sass/_buttons.scss
@@ -31,7 +31,7 @@
   }
 
   .icon + .hidden {
-    margin-left: -0.5em; // override for hidden text
+    margin-left: -0.5em; /* override for hidden text*/
   }
 
   /* fills width of parent container */
@@ -49,7 +49,7 @@
 
   &--inverse {
     color: $gray !important;
-    border: 1px solid $light-gray !important; // override
+    border: 1px solid $light-gray !important; /* override*/
     background-color: #fff;
 
     &:hover {
@@ -61,7 +61,7 @@
   /* light outline */
 
   &--light-outline {
-    border: 1px solid #fff !important; // override
+    border: 1px solid #fff !important; /* override*/
     background-color: transparent;
   }
 
@@ -111,7 +111,6 @@
     pointer-events: none;
     cursor: not-allowed;
     filter: alpha(opacity=65);
-    -webkit-box-shadow: none;
     box-shadow: none;
     opacity: 0.65;
   }

diff --git a/assets/_scss/_footer.scss → _sass/_footer.scss b/assets/_scss/_footer.scss → _sass/_footer.scss
@@ -14,8 +14,10 @@
   /* sticky footer fix end */
   margin-top: 3em;
   color: mix(#fff, $gray, 25%);
-  animation: intro 0.3s both;
-  animation-delay: 0.45s;
+  -webkit-animation: intro 0.3s both;
+          animation: intro 0.3s both;
+  -webkit-animation-delay: 0.45s;
+          animation-delay: 0.45s;
   background-color: $lighter-gray;
   border-top: 1px solid $light-gray;
 

diff --git a/assets/_scss/_forms.scss → _sass/_forms.scss b/assets/_scss/_forms.scss → _sass/_forms.scss
diff --git a/assets/_scss/_masthead.scss → _sass/_masthead.scss b/assets/_scss/_masthead.scss → _sass/_masthead.scss
@@ -5,8 +5,10 @@
 .masthead {
   position: relative;
   border-bottom: 1px solid $border-color;
-  animation: intro 0.3s both;
-  animation-delay: 0.15s;
+  -webkit-animation: intro 0.3s both;
+          animation: intro 0.3s both;
+  -webkit-animation-delay: 0.15s;
+          animation-delay: 0.15s;
   z-index: 20;
 
   &__inner-wrap {

diff --git a/assets/_scss/_mixins.scss → _sass/_mixins.scss b/assets/_scss/_mixins.scss → _sass/_mixins.scss
@@ -3,9 +3,9 @@
    ========================================================================== */
 
 %tab-focus {
-  // Default
+  /* Default*/
   outline: thin dotted $warning-color;
-  // Webkit
+  /* Webkit*/
   outline: 5px auto $warning-color;
   outline-offset: -2px;
 }
@@ -23,21 +23,24 @@
    Bourbon clearfix
    ========================================================================== */
 
-// Provides an easy way to include a clearfix for containing floats.
-//
-// @link http://cssmojo.com/latest_new_clearfix_so_far/
-//
-// @example scss - Usage
-//   .element {
-//     @include clearfix;
-//   }
-//
-// @example css - CSS Output
-//   .element::after {
-//     clear: both;
-//     content: "";
-//     display: table;
-//   }
+/*
+  * Provides an easy way to include a clearfix for containing floats.
+  * link http://cssmojo.com/latest_new_clearfix_so_far/
+  *
+  * example scss - Usage
+  *
+  * .element {
+  *   @include clearfix;
+  * }
+  *
+  * example css - CSS Output
+  *
+  * .element::after {
+  *   clear: both;
+  *   content: "";
+  *   display: table;
+  * }
+*/
 
 @mixin clearfix {
   clear: both;

diff --git a/assets/_scss/_navigation.scss → _sass/_navigation.scss b/assets/_scss/_navigation.scss → _sass/_navigation.scss
@@ -14,8 +14,10 @@
   padding-left: 2em;
   padding-right: 2em;
   font-family: $sans-serif;
-  animation: intro 0.3s both;
-  animation-delay: 0.30s;
+  -webkit-animation: intro 0.3s both;
+          animation: intro 0.3s both;
+  -webkit-animation-delay: 0.30s;
+          animation-delay: 0.30s;
 
   @include breakpoint($large) {
     padding-left: 1em;
@@ -232,12 +234,17 @@
         height: 4px;
         background: mix(#fff, $primary-color, 50%);
         width: 100%;
+        -webkit-transition: $global-transition;
         transition: $global-transition;
-        transform: scaleX(0); // hide
+        -webkit-transform: scaleX(0);
+            -ms-transform: scaleX(0);
+                transform: scaleX(0); /* hide*/
       }
 
       &:hover:before {
-        transform: scaleX(1); // reveal
+        -webkit-transform: scaleX(1);
+            -ms-transform: scaleX(1);
+                transform: scaleX(1); /* reveal*/
       }
     }
   }
@@ -414,7 +421,7 @@
     font-weight: normal;
   }
 
-  // hide sub sub links on small screens
+  /* hide sub sub links on small screens*/
   li > ul li {
     display: none;
 

diff --git a/assets/_scss/_notices.scss → _sass/_notices.scss b/assets/_scss/_notices.scss → _sass/_notices.scss
@@ -11,34 +11,34 @@
  */
 
 @mixin notice($notice-color) {
-  margin: 2em 0 !important;  // override
+  margin: 2em 0 !important;  /* override*/
   padding: 1em;
   font-family: $global-font-family;
   font-size: $type-size-6 !important;
-  text-indent: initial; // override
+  text-indent: initial; /* override*/
   background-color: mix(#fff, $notice-color, 90%);
   border-radius: $border-radius;
   box-shadow: 0 1px 1px rgba($notice-color, 0.25);
 
   h4 {
-    margin-top: 0 !important; // override
+    margin-top: 0 !important; /* override*/
     margin-bottom: 0.75em;
   }
 
   @at-root .page__content #{&} h4 {
-    // using at-root to override .page-content h4 font size
+    /* using at-root to override .page-content h4 font size*/
     margin-bottom: 0;
     font-size: 1em;
   }
 
   p {
     &:last-child {
-      margin-bottom: 0 !important; // override
+      margin-bottom: 0 !important; /* override*/
     }
   }
 
   h4 + p {
-    // remove space above paragraphs that appear directly after notice headline
+    /* remove space above paragraphs that appear directly after notice headline*/
     margin-top: 0;
     padding-top: 0;
   }
@@ -57,7 +57,7 @@
 
   ul {
     &:last-child {
-      margin-bottom: 0; // override
+      margin-bottom: 0; /* override*/
     }
   }
 }