N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/stale.yml vendored
View file

@ -6,6 +6,7 @@ daysUntilClose: 7
exemptLabels: exemptLabels:
- "Status: Accepted" - "Status: Accepted"
- "Status: Under Consideration" - "Status: Under Consideration"
- "Status: Review Needed"
# Label to use when marking an issue as stale # Label to use when marking an issue as stale
staleLabel: "Status: Stale" staleLabel: "Status: Stale"
# Comment to post when marking an issue as stale. Set to `false` to disable # Comment to post when marking an issue as stale. Set to `false` to disable

4
.prettierignore
View file

@ -1,4 +0,0 @@
_reset.scss
*.md
Gemfile.lock
package.json

3
CHANGELOG.md
View file

@ -13,6 +13,8 @@
* Remove `base_path` include from `/test` pages. * Remove `base_path` include from `/test` pages.
* Reduce font-size of page meta in list/grid items. * 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) * Improve feature row styling when used with `archive` layout. [#1484](https://github.com/mmistakes/minimal-mistakes/issues/1484)
* 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 ### Bug Fixes
@ -23,6 +25,7 @@
* Properly escape quotes in `site.social.name` and `site.name`. [#1485](https://github.com/mmistakes/minimal-mistakes/pull/1485) * 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 typo in upgrading documentation. [#1487](https://github.com/mmistakes/minimal-mistakes/pull/1487)
* Fix `border-bottom` for Gist line numbers. * 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) ## [4.9.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.9.0)

14
_data/ui-text.yml
View file

@ -403,9 +403,9 @@ de: &DEFAULT_DE
page : "Seite" page : "Seite"
pagination_previous : "Vorherige" pagination_previous : "Vorherige"
pagination_next : "Nächste" pagination_next : "Nächste"
breadcrumb_home_label : "Home" breadcrumb_home_label : "Start"
breadcrumb_separator : "/" breadcrumb_separator : "/"
menu_label : menu_label : "Menü ein-/ausschalten"
toc_label : "Auf dieser Seite" toc_label : "Auf dieser Seite"
ext_link_label : "Direkter Link" ext_link_label : "Direkter Link"
less_than : "weniger als" less_than : "weniger als"
@ -415,13 +415,13 @@ de: &DEFAULT_DE
tags_label : "Tags:" tags_label : "Tags:"
categories_label : "Kategorien:" categories_label : "Kategorien:"
date_label : "Aktualisiert:" date_label : "Aktualisiert:"
comments_label : "Hinterlassen sie einen Kommentar" comments_label : "Hinterlassen Sie einen Kommentar"
comments_title : "Kommentare" comments_title : "Kommentare"
more_label : "Mehr anzeigen" more_label : "Mehr anzeigen"
related_label : "Ihnen gefällt vielleicht auch" related_label : "Ihnen gefällt vielleicht auch"
follow_label : "Folgen:" follow_label : "Folgen:"
feed_label : "Feed" feed_label : "Feed"
powered_by : "Powered by" powered_by : "Möglich durch"
website_label : "Webseite" website_label : "Webseite"
email_label : "E-Mail" email_label : "E-Mail"
recent_posts : "Aktuelle Beiträge" recent_posts : "Aktuelle Beiträge"
@ -430,12 +430,12 @@ de: &DEFAULT_DE
comment_form_comment_label : "Kommentar" comment_form_comment_label : "Kommentar"
comment_form_md_info : "Markdown wird unterstützt." comment_form_md_info : "Markdown wird unterstützt."
comment_form_name_label : "Name" comment_form_name_label : "Name"
comment_form_email_label : "E-Mail Addresse" comment_form_email_label : "E-Mail-Addresse"
comment_form_website_label : "Webseite (optional)" comment_form_website_label : "Webseite (optional)"
comment_btn_submit : "Kommentar absenden" comment_btn_submit : "Kommentar absenden"
comment_btn_submitted : "Versendet" comment_btn_submitted : "Versendet"
comment_success_msg : "Danke für ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde." comment_success_msg : "Danke für Ihren Kommentar! Er wird auf der Seite angezeigt, nachdem er geprüft wurde."
comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte füllen sie alle benötigten Felder aus und versuchen sie es erneut." comment_error_msg : "Entschuldigung, es gab einen Fehler. Bitte füllen Sie alle benötigten Felder aus und versuchen Sie es erneut."
loading_label : "Lade..." loading_label : "Lade..."
de-DE: de-DE:
<<: *DEFAULT_DE <<: *DEFAULT_DE

2
_includes/scripts.html
View file

@ -9,7 +9,7 @@
{% endfor %} {% endfor %}
{% else %} {% else %}
<script src="{{ '/assets/js/main.min.js' | absolute_url }}"></script> <script src="{{ '/assets/js/main.min.js' | absolute_url }}"></script>
<script src="https://use.fontawesome.com/releases/v5.0.2/js/all.js"></script> <script src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
{% endif %} {% endif %}
{% if site.search == true or page.layout == "search" %} {% if site.search == true or page.layout == "search" %}

8
_includes/seo.html
View file

@ -4,8 +4,12 @@
{%- endif -%} {%- endif -%}
{%- assign seo_url = seo_url | default: site.github.url -%} {%- assign seo_url = seo_url | default: site.github.url -%}
{% if site.title_separator %}
{% assign title_separator = site.title_separator | default: '-' | replace: '|', '&#124;' %}
{% endif %}
{%- if page.title -%} {%- if page.title -%}
{%- assign seo_title = page.title | append: " " | append: site.title_separator | append: " " | append: site.title -%} {%- assign seo_title = page.title | append: " " | append: title_separator | append: " " | append: site.title -%}
{%- endif -%} {%- endif -%}
{%- if seo_title -%} {%- if seo_title -%}
@ -50,7 +54,7 @@
{%- assign og_type = "website" -%} {%- assign og_type = "website" -%}
{%- endif -%} {%- endif -%}
<title>{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %}</title> <title>{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ title_separator }} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %}{% endif %}</title>
<meta name="description" content="{{ seo_description }}"> <meta name="description" content="{{ seo_description }}">
{% if author.name %} {% if author.name %}

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." excerpt: "Change log of enhancements and bug fixes made to the theme."
sidebar: sidebar:
nav: docs nav: docs
last_modified_at: 2018-01-23T15:59:05-05:00 last_modified_at: 2018-02-01T07:32:00-05:00
toc: true toc: true
--- ---
@ -23,7 +23,8 @@ toc: true
* Remove `base_path` include from `/test` pages. * Remove `base_path` include from `/test` pages.
* Reduce font-size of page meta in list/grid items. * 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) * 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 ### Bug Fixes
@ -33,6 +34,8 @@ toc: true
* Remove misleading underline hover state on feature row items. * 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) * 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 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) ## [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 ### 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 ### 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 ### 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 ### Variable Tag

2
test/_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 ### 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 ### Variable Tag

2
test/_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 ### 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 ### Variable Tag