steffen/website
1
0
Fork 0
Code Actions Packages Releases Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Michael Rose
2018-02-01 14:35:27 -05:00
parent ed533591d0 264bc75963
commit be68ed4259
11 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/_docs/18-history.md
View File

@@ -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: 2018-01-23T15:59:05-05:00
last_modified_at: 2018-02-01T07:32:00-05:00
toc: true
---
@@ -23,7 +23,8 @@ toc: true
* Remove `base_path` include from `/test` pages.
* Reduce font-size of page meta in list/grid items.
* Improve feature row styling when used with `archive` layout. [#1484](https://github.com/mmistakes/minimal-mistakes/issues/1484)
* Fix `border-bottom` for Gist line numbers.
* Improve German translations. [#1511](https://github.com/mmistakes/minimal-mistakes/pull/1511)
* Update Font Awesome to `5.0.6`. [#1513](https://github.com/mmistakes/minimal-mistakes/pull/1513)
### Bug Fixes
@@ -33,6 +34,8 @@ toc: true
* Remove misleading underline hover state on feature row items.
* Properly escape quotes in `site.social.name` and `site.name`. [#1485](https://github.com/mmistakes/minimal-mistakes/pull/1485)
* Fix typo in upgrading documentation. [#1487](https://github.com/mmistakes/minimal-mistakes/pull/1487)
* Fix `border-bottom` for Gist line numbers.
* Replace `|` with HTML entity when used as title separator. [#760](https://github.com/mmistakes/minimal-mistakes/issues/760)
## [4.9.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.9.0)

2
docs/_pages/archive-layout-with-content.md
View File

@@ -207,7 +207,7 @@ Getting our science styling on with H<sub>2</sub>O, which should push the "2" do
### Superscript Tag
Still sticking with science and Isaac Newton's E = MC<sup>2</sup>, which should lift the 2 up.
Still sticking with science and Albert Einstein's E = MC<sup>2</sup>, which should lift the 2 up.
### Variable Tag

2
docs/_posts/2013-01-11-markup-html-tags-and-formatting.md
View File

@@ -242,7 +242,7 @@ Getting our science styling on with H<sub>2</sub>O, which should push the "2" do
### Superscript Tag
Still sticking with science and Isaac Newton's E = MC<sup>2</sup>, which should lift the 2 up.
Still sticking with science and Albert Einstein's E = MC<sup>2</sup>, which should lift the 2 up.
### Variable Tag