From bf959c2ff09150fdecbaca490a468c9300a68ba8 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 17 Nov 2016 16:00:12 -0500 Subject: [PATCH 1/2] Fix active state --- _sass/_navigation.scss | 18 +++++++++--------- docs/_sass/_navigation.scss | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/_sass/_navigation.scss b/_sass/_navigation.scss index 30a216c7..48bd3f6d 100644 --- a/_sass/_navigation.scss +++ b/_sass/_navigation.scss @@ -404,6 +404,15 @@ } } } +} + +.nav__list .nav__items { + margin: 0; + font-size: 1.25rem; + + a { + color: inherit; + } .active { margin-left: -0.5em; @@ -418,15 +427,6 @@ color: #fff; } } -} - -.nav__list .nav__items { - margin: 0; - font-size: 1.25rem; - - a { - color: inherit; - } @include breakpoint(max-width $large) { position: relative; diff --git a/docs/_sass/_navigation.scss b/docs/_sass/_navigation.scss index 9dca0916..3607ebbb 100644 --- a/docs/_sass/_navigation.scss +++ b/docs/_sass/_navigation.scss @@ -404,6 +404,15 @@ text-decoration: underline; } } +} + +.nav__list .nav__items { + margin: 0; + font-size: 1.25rem; + + a { + color: inherit; + } .active { margin-left: -0.5em; @@ -418,15 +427,6 @@ color: #fff; } } -} - -.nav__list .nav__items { - margin: 0; - font-size: 1.25rem; - - a { - color: inherit; - } @include breakpoint(max-width $large) { position: relative; From 028371c709867edaf5629ce4661376d12295fc9e Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 17 Nov 2016 16:01:39 -0500 Subject: [PATCH 2/2] Update CHANGELOG.md and bump version to 4.0.7 --- CHANGELOG.md | 15 +++++++++++++++ docs/_docs/18-history.md | 17 ++++++++++++++++- docs/_pages/home.md | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e4e1209..7557b075 100644 --- 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/docs/_docs/18-history.md b/docs/_docs/18-history.md index 20330adc..bff8a451 100644 --- a/docs/_docs/18-history.md +++ b/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 diff --git a/docs/_pages/home.md b/docs/_pages/home.md index 663abe12..42917d02 100644 --- a/docs/_pages/home.md +++ b/docs/_pages/home.md @@ -7,7 +7,7 @@ header: cta_label: " 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.
Latest release v4.0.6

{::nomarkdown} {:/nomarkdown}' +excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.
Latest release v4.0.7

{::nomarkdown} {:/nomarkdown}' feature_row: - image_path: /assets/images/mm-customizable-feature.png alt: "customizable" diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index 77125d9a..65d9894e 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/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.} diff --git a/package.json b/package.json index 120db144..8295bf80 100644 --- a/package.json +++ b/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",