~xdavidwu/xdavidwu.link

1ed04c0079c50c50a74bf64f133c10a8d2e7f4b2 — Michael Rose 6 years ago 06e81f8 + 20aa0d8
Fix merge conflicts
5 files changed, 17 insertions(+), 14 deletions(-)

D .prettierignore
M CHANGELOG.md
M _data/ui-text.yml
M _includes/scripts.html
M _includes/seo.html
D .prettierignore => .prettierignore +0 -4
@@ 1,4 0,0 @@
_reset.scss
*.md
Gemfile.lock
package.json
\ No newline at end of file

M CHANGELOG.md => CHANGELOG.md +3 -0
@@ 13,6 13,8 @@
* 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)
* 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



@@ 23,6 25,7 @@
* 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)


M _data/ui-text.yml => _data/ui-text.yml +7 -7
@@ 403,9 403,9 @@ de: &DEFAULT_DE
  page                       : "Seite"
  pagination_previous        : "Vorherige"
  pagination_next            : "Nächste"
  breadcrumb_home_label      : "Home"
  breadcrumb_home_label      : "Start"
  breadcrumb_separator       : "/"
  menu_label                 :
  menu_label                 : "Menü ein-/ausschalten"
  toc_label                  : "Auf dieser Seite"
  ext_link_label             : "Direkter Link"
  less_than                  : "weniger als"


@@ 415,13 415,13 @@ de: &DEFAULT_DE
  tags_label                 : "Tags:"
  categories_label           : "Kategorien:"
  date_label                 : "Aktualisiert:"
  comments_label             : "Hinterlassen sie einen Kommentar"
  comments_label             : "Hinterlassen Sie einen Kommentar"
  comments_title             : "Kommentare"
  more_label                 : "Mehr anzeigen"
  related_label              : "Ihnen gefällt vielleicht auch"
  follow_label               : "Folgen:"
  feed_label                 : "Feed"
  powered_by                 : "Powered by"
  powered_by                 : "Möglich durch"
  website_label              : "Webseite"
  email_label                : "E-Mail"
  recent_posts               : "Aktuelle Beiträge"


@@ 430,12 430,12 @@ de: &DEFAULT_DE
  comment_form_comment_label : "Kommentar"
  comment_form_md_info       : "Markdown wird unterstützt."
  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_btn_submit         : "Kommentar absenden"
  comment_btn_submitted      : "Versendet"
  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_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."
  loading_label              : "Lade..."
de-DE:
  <<: *DEFAULT_DE

M _includes/scripts.html => _includes/scripts.html +1 -1
@@ 9,7 9,7 @@
  {% endfor %}
{% else %}
  <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 %}

{% if site.search == true or page.layout == "search" %}

M _includes/seo.html => _includes/seo.html +6 -2
@@ 4,8 4,12 @@
{%- endif -%}
{%- 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 -%}
  {%- 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 -%}

{%- if seo_title -%}


@@ 50,7 54,7 @@
  {%- assign og_type = "website" -%}
{%- 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 }}">

{% if author.name %}