From 192549ef25a5d2308755e8294ebc6a4abfd0a746 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 9 Aug 2017 08:30:32 -0400 Subject: [PATCH] Adjust width of `.sidebar` to match `.sidebar__right` - Use `$right-sidebar-width-narrow` and `$right-sidebar-width` Sass variables to determine width of sidebar instead of Susy `span` function --- CHANGELOG.md | 1 + _sass/minimal-mistakes/_sidebar.scss | 6 +++++- docs/_docs/18-history.md | 3 ++- docs/_sass/minimal-mistakes/_sidebar.scss | 6 +++++- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c157c43a..4f5c9431 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Fix typo `words_per_minute` typo in documentation. [#1164](https://github.com/mmistakes/minimal-mistakes/pull/1164) - Remove outside and right borders in `table`s. +- Adjust width of `.sidebar` to match `.sidebar__right`. ## [4.5.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.5.0) diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss index a66a4ae2..c9ee8db6 100644 --- a/_sass/minimal-mistakes/_sidebar.scss +++ b/_sass/minimal-mistakes/_sidebar.scss @@ -15,7 +15,7 @@ @include breakpoint($large) { float: left; - width: span(2 of 12); + width: calc(#{$right-sidebar-width-narrow} - 1em); opacity: 0.75; -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; @@ -31,6 +31,10 @@ } } + @include breakpoint($x-large) { + width: calc(#{$right-sidebar-width} - 1em); + } + h2, h3, h4, h5, h6 { margin-bottom: 0; font-family: $sans-serif-narrow; diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 028ade71..fd744b07 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,7 +4,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2017-08-09T08:20:21-04:00 +last_modified_at: 2017-08-09T08:30:18-04:00 --- ## Unreleased @@ -25,6 +25,7 @@ last_modified_at: 2017-08-09T08:20:21-04:00 - Fix typo `words_per_minute` typo in documentation. [#1164](https://github.com/mmistakes/minimal-mistakes/pull/1164) - Remove outside and right borders in `table`s. +- Adjust width of `.sidebar` to match `.sidebar__right`. ## [4.5.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.5.0) diff --git a/docs/_sass/minimal-mistakes/_sidebar.scss b/docs/_sass/minimal-mistakes/_sidebar.scss index a66a4ae2..c9ee8db6 100644 --- a/docs/_sass/minimal-mistakes/_sidebar.scss +++ b/docs/_sass/minimal-mistakes/_sidebar.scss @@ -15,7 +15,7 @@ @include breakpoint($large) { float: left; - width: span(2 of 12); + width: calc(#{$right-sidebar-width-narrow} - 1em); opacity: 0.75; -webkit-transition: opacity 0.2s ease-in-out; transition: opacity 0.2s ease-in-out; @@ -31,6 +31,10 @@ } } + @include breakpoint($x-large) { + width: calc(#{$right-sidebar-width} - 1em); + } + h2, h3, h4, h5, h6 { margin-bottom: 0; font-family: $sans-serif-narrow;