Skip to content

Commit

Permalink
Merge branch 'release/3.1.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
mmistakes committed May 16, 2016
2 parents d285f9d + 8e5d47d commit 3812f70
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## [3.1.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.8)

### Bug Fixes

- Fix `Liquid Exception: undefined method 'gsub' for nil:NilClass in _layouts/single.html` error when `page.title` is null. `<h1>` element is now conditional if `title: ` is not set for a `page` or collection item. [#312](https://github.com/mmistakes/minimal-mistakes/issues/312)

### Maintenance

- Remove duplicate `fa-twitter` and `fa-twitter-square` classes from `_utilities.scss`. [#302](https://github.com/mmistakes/minimal-mistakes/issues/302)

- Document installing additional Jekyll gem dependencies when using `gem "jekyll"` instead of `gem "github-pages"` to avoid any errors on run. [#305](https://github.com/mmistakes/minimal-mistakes/issues/305)

## [3.1.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.7)

### Enhancement
Expand All @@ -6,7 +18,7 @@

### Maintenance

- Small fix to avoid underlying the whitespace between icons and related text when hovering.[#303](https://github.com/mmistakes/minimal-mistakes/pull/303)
- Small fix to avoid underlying the whitespace between icons and related text when hovering. [#303](https://github.com/mmistakes/minimal-mistakes/pull/303)

## [3.1.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.6)

Expand Down
2 changes: 1 addition & 1 deletion _layouts/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<div class="page__inner-wrap">
{% unless page.header.overlay_color or page.header.overlay_image %}
<header>
<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>
{% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
{% if page.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
Expand Down
5 changes: 0 additions & 5 deletions assets/_scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@ body:hover .visually-hidden button {
color: $facebook-color;
}

.fa-twitter,
.fa-twitter-square {
color: $twitter-color;
}

.fa-flickr {
color: $flickr-color;
}
Expand Down
4 changes: 2 additions & 2 deletions assets/css/main.css

Large diffs are not rendered by default.

0 comments on commit 3812f70

Please sign in to comment.