Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into gh-pages
Browse files Browse the repository at this point in the history
* upstream/master: (80 commits)
  Remove extraneous `</a>` and `</li>` tags
  Removing extraneous a and li tags (mmistakes#1038)
  Fix "Greek" ~> "Swedish" typo
  Fix broken Kramdown TOC link
  Update CHANGELOG and history
  Add new brand variable: $bitbucket-color (mmistakes#1009)
  Add Swedish language
  Add Swedish language (mmistakes#996)
  Update CHANGELOG and history to reflect mmistakes#972
  Update 08-ui-text.md (mmistakes#972)
  Toggle close button on `mouseleave` - Close mmistakes#975
  Bump version to 4.4.1
  Release 💎 4.4.1
  Transition “hamburger” navicon on click to “X” navicon by adding `.close` to button - Close 969
  Add link to comment
  New comment. (mmistakes#968)
  New comment. (mmistakes#967)
  Update CHANGELOG and history
  Sync `/docs` with root changes
  Update ui-text.yml (mmistakes#958)
  ...

# Conflicts:
#	.github/CONTRIBUTING.md
#	.github/ISSUE_TEMPLATE.md
#	CHANGELOG.md
#	README.md
#	_sass/minimal-mistakes/_masthead.scss
#	_sass/minimal-mistakes/_syntax.scss
#	_sass/minimal-mistakes/_variables.scss
#	docs/_config.yml
#	docs/_data/navigation.yml
#	docs/_data/ui-text.yml
#	docs/_docs/01-quick-start-guide.md
#	docs/_docs/02-structure.md
#	docs/_docs/03-installation.md
#	docs/_docs/04-upgrading.md
#	docs/_docs/05-configuration.md
#	docs/_docs/06-overriding-theme-defaults.md
#	docs/_docs/07-navigation.md
#	docs/_docs/08-ui-text.md
#	docs/_docs/09-authors.md
#	docs/_docs/10-layouts.md
#	docs/_docs/11-posts.md
#	docs/_docs/12-pages.md
#	docs/_docs/13-collections.md
#	docs/_docs/14-helpers.md
#	docs/_docs/15-utility-classes.md
#	docs/_docs/16-stylesheets.md
#	docs/_docs/17-javascript.md
#	docs/_docs/18-history.md
#	docs/_docs/19-contributing.md
#	docs/_docs/20-docs-2-2.md
#	docs/_docs/21-license.md
#	docs/_includes/comments-providers/discourse.html
#	docs/_includes/comments.html
#	docs/_includes/head.html
#	docs/_includes/masthead.html
#	docs/_includes/paginator.html
#	docs/_includes/seo.html
#	docs/_includes/video
#	docs/_layouts/default.html
#	docs/_layouts/single.html
#	docs/_layouts/splash.html
#	docs/_pages/about.md
#	docs/_pages/home.md
#	docs/_pages/terms.md
#	docs/_posts/2010-01-07-post-modified.md
#	docs/_posts/2012-03-15-layout-header-overlay-image.md
#	docs/_posts/2013-08-16-markup-syntax-highlighting.md
#	docs/_posts/2016-09-21-gemified-theme-alpha.md
#	docs/_posts/2016-10-06-gemified-theme-beta.md
#	docs/_sass/minimal-mistakes/_animations.scss
#	docs/_sass/minimal-mistakes/_archive.scss
#	docs/_sass/minimal-mistakes/_base.scss
#	docs/_sass/minimal-mistakes/_buttons.scss
#	docs/_sass/minimal-mistakes/_footer.scss
#	docs/_sass/minimal-mistakes/_forms.scss
#	docs/_sass/minimal-mistakes/_mixins.scss
#	docs/_sass/minimal-mistakes/_navigation.scss
#	docs/_sass/minimal-mistakes/_notices.scss
#	docs/_sass/minimal-mistakes/_page.scss
#	docs/_sass/minimal-mistakes/_reset.scss
#	docs/_sass/minimal-mistakes/_sidebar.scss
#	docs/_sass/minimal-mistakes/_tables.scss
#	docs/_sass/minimal-mistakes/_utilities.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_breakpoint.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_context.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_helpers.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_legacy-settings.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_no-query.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_parsers.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_respond-to.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/_settings.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/_double.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/_query.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/_resolution.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/_single.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/_triple.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_default-pair.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_default.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/double/_double-string.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/resolution/_resolution.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/single/_default.scss
#	docs/_sass/minimal-mistakes/vendor/breakpoint/parsers/triple/_default.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_animated.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_bordered-pulled.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_core.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_fixed-width.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_font-awesome.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_icons.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_larger.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_list.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_mixins.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_path.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_rotated-flipped.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_screen-reader.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_stacked.scss
#	docs/_sass/minimal-mistakes/vendor/font-awesome/_variables.scss
#	docs/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss
#	docs/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss
#	docs/_sass/minimal-mistakes/vendor/susy/_su.scss
#	docs/_sass/minimal-mistakes/vendor/susy/_susy.scss
#	docs/_sass/minimal-mistakes/vendor/susy/_susyone.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/_su.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/_susy.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/_susyone.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_background.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_bleed.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_box-sizing.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_breakpoint-plugin.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_container.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_context.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_gallery.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_grids.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_gutters.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_isolate.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_margins.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_padding.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_rows.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_settings.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_span.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susy/_validation.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_background.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_functions.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_grid.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_isolation.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_margin.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_media.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_padding.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/language/susyone/_settings.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/_float.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/_shared.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/_support.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/float/_container.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/float/_end.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/float/_isolate.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/float/_span.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_background.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_container.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_direction.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_inspect.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_margins.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_output.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/shared/_padding.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_background.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_box-sizing.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_clearfix.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_prefix.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_rem.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/output/support/_support.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/su/_grid.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/su/_settings.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/su/_utilities.scss
#	docs/_sass/minimal-mistakes/vendor/susy/susy/su/_validation.scss
#	docs/assets/css/main.scss
#	docs/assets/js/main.min.js
#	docs/assets/js/plugins/jquery.greedy-navigation.js
#	minimal-mistakes-jekyll.gemspec
#	test/_config.yml
#	test/_data/ui-text.yml
#	test/_pages/terms.md
#	test/_posts/2010-01-07-post-modified.md
#	test/_posts/2012-03-15-layout-header-overlay-image.md
#	test/_posts/2013-08-16-markup-syntax-highlighting.md
  • Loading branch information
wetty committed Jun 5, 2017
2 parents f9412d3 + 9de3cad commit 76073ec
Show file tree
Hide file tree
Showing 125 changed files with 772 additions and 208 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Michael Rose
Copyright (c) 2017 Michael Rose

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
259 changes: 258 additions & 1 deletion _data/ui-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -356,8 +356,45 @@ zh-HK:
<<: *DEFAULT_ZH
zh-SG:
<<: *DEFAULT_ZH
# Taiwan (Traditional Chinese)
zh-TW:
<<: *DEFAULT_ZH
page : "頁面"
pagination_previous : "較舊"
pagination_next : "較新"
breadcrumb_home_label : "首頁"
breadcrumb_separator : "/"
menu_label : "切換選單"
toc_label : "本頁"
ext_link_label : "外部連結"
less_than : "少於"
minute_read : "分鐘閱讀"
share_on_label : "分享到"
meta_label :
tags_label : "標籤:"
categories_label : "分類:"
date_label : "更新時間:"
comments_label : "留言"
comments_title : "留言內容"
more_label : "了解更多"
related_label : "猜您有與趣"
follow_label : "追蹤:"
feed_label : "RSS Feed"
powered_by : "Powered by"
website_label : "網站"
email_label : "電子信箱"
recent_posts : "最新文章"
undefined_wpm : "_config.yml 中未定義 words_per_minute"
comment_form_info : "您的電子信箱不會被公開. 必填部份已標記"
comment_form_comment_label : "留言內容"
comment_form_md_info : "支援Markdown語法。"
comment_form_name_label : "名字"
comment_form_email_label : "電子信箱帳號"
comment_form_website_label : "網頁 (可選填)"
comment_btn_submit : "送出留言"
comment_btn_submitted : "已送出"
comment_success_msg : "感謝您的留言! 審核後將會顯示在站上。"
comment_error_msg : "抱歉,部份資料輸入有問題。請確認資料填寫正確後再試一次。"
loading_label : "載入中..."

# German / Deutsch
# -----------------
Expand Down Expand Up @@ -411,6 +448,7 @@ de-LI:
<<: *DEFAULT_DE
de-LU:
<<: *DEFAULT_DE

# Nepali (Nepal)
# -----------------
ne: &DEFAULT_NE
Expand Down Expand Up @@ -453,5 +491,224 @@ ne: &DEFAULT_NE
loading_label : "लोड हुँदैछ ..."
ne-NP:
<<: *DEFAULT_NE

# Korean
# --------------
ko: &DEFAULT_KO
page : "페이지"
pagination_previous : "이전"
pagination_next : "다음"
breadcrumb_home_label : "Home"
breadcrumb_separator : "/"
menu_label : "토글 메뉴"
toc_label : "On This Page"
ext_link_label : "직접 링크"
less_than : "최대"
minute_read : "분 소요"
share_on_label : "공유하기"
meta_label :
tags_label : "태그:"
categories_label : "카테고리:"
date_label : "업데이트:"
comments_label : "댓글남기기"
comments_title : "댓글"
more_label : "더 보기"
related_label : "참고"
follow_label : "팔로우:"
feed_label : "피드"
powered_by : "Powered by"
website_label : "웹사이트"
email_label : "이메일"
recent_posts : "최근 포스트"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
comment_form_info : "이메일은 공개되지 않습니다. 작성 필요 필드:"
comment_form_comment_label : "댓글"
comment_form_md_info : "마크다운을 지원합니다."
comment_form_name_label : "이름"
comment_form_email_label : "이메일"
comment_form_website_label : "웹사이트(선택사항)"
comment_btn_submit : "댓글 등록"
comment_btn_submitted : "등록됨"
comment_success_msg : "감사합니다! 댓글이 머지된 후 확인하실 수 있습니다."
comment_error_msg : "댓글 등록에 문제가 있습니다. 필요 필드를 작성했는지 확인하고 다시 시도하세요."
loading_label : "로딩중..."
ko-KR:
<<: *DEFAULT_KO

# Russian / Русский
# -----------------
ru: &DEFAULT_RU
page : "Страница"
pagination_previous : "Предыдущая"
pagination_next : "Следующая"
breadcrumb_home_label : "Главная"
breadcrumb_separator : "/"
menu_label : "Выпадающее меню"
toc_label : "Содержание"
ext_link_label : "Прямая ссылка"
less_than : "менее"
minute_read : "мин на чтение"
share_on_label : "Поделиться"
meta_label :
tags_label : "Метки:"
categories_label : "Разделы:"
date_label : "Дата изменения:"
comments_label : "Оставить комментарий"
comments_title : "Комментарии"
more_label : "Читать далее"
related_label : "Вам также может понравиться"
follow_label : "Связаться со мной:"
feed_label : "RSS-лента"
powered_by : "Сайт работает на"
website_label : "Сайт"
email_label : "Электронная почта"
recent_posts : "Свежие записи"
undefined_wpm : "Не определён параметр words_per_minute в _config.yml"
comment_form_info : "Ваш адрес электронной почты не будет опубликован. Обязательные поля помечены"
comment_form_comment_label : "Комментарий"
comment_form_md_info : "Поддерживается синтаксис Markdown."
comment_form_name_label : "Имя"
comment_form_email_label : "Электронная почта"
comment_form_website_label : "Ссылка на сайт (необязательно)"
comment_btn_submit : "Оставить комментарий"
comment_btn_submitted : "Отправлено"
comment_success_msg : "Спасибо за Ваш комментарий! Он будет опубликован на сайте после проверки."
comment_error_msg : "К сожалению, произошла ошибка с отправкой комментария. Пожалуйста, убедитесь, что все обязательные поля заполнены и попытайтесь снова."
loading_label : "Отправка..."
ru-RU:
<<: *DEFAULT_RU

# Lithuanian / Lietuviškai
# -----------------
lt: &DEFAULT_LT
page : "Puslapis"
pagination_previous : "Ankstesnis"
pagination_next : "Sekantis"
breadcrumb_home_label : "Pagrindinis"
breadcrumb_separator : "/"
menu_label : "Meniu rodymas"
toc_label : "Turinys"
ext_link_label : "Tiesioginė nuoroda"
less_than : "mažiau nei"
minute_read : "min. skaitymo"
share_on_label : "Pasidalinti"
meta_label :
tags_label : "Žymės:"
categories_label : "Kategorijos:"
date_label : "Atnaujinta:"
comments_label : "Palikti komentarą"
comments_title : "Komentaras"
more_label : "Skaityti daugiau"
related_label : "Taip pat turėtų patikti"
follow_label : "Sekti:"
feed_label : "Šaltinis"
powered_by : "Sukurta su"
website_label : "Tinklapis"
email_label : "El. paštas"
recent_posts : "Naujausi įrašai"
undefined_wpm : "Nedeklaruotas parametras words_per_minute faile _config.yml"
comment_form_info : "El. pašto adresas nebus viešinamas. Būtini laukai pažymėti."
comment_form_comment_label : "Komentaras"
comment_form_md_info : "Markdown palaikomas."
comment_form_name_label : "Vardas"
comment_form_email_label : "El. paštas"
comment_form_website_label : "Tinklapis (nebūtina)"
comment_btn_submit : "Komentuoti"
comment_btn_submitted : "Įrašytas"
comment_success_msg : "Ačiū už komentarą! Jis bus parodytas kai bus patvirtintas."
comment_error_msg : "Atleiskite, įvyko netikėta klaida įrašant komentarą. Pasitikrinkite ar užpildėte visus būtinus laukus ir pamėginkite dar kartą."
loading_label : "Kraunama..."
lt-LT:
<<: *DEFAULT_LT

# Greek
# --------------
gr: &DEFAULT_GR
page : "Σελίδα"
pagination_previous : "Προηγούμενo"
pagination_next : "Επόμενo"
breadcrumb_home_label : "Κεντρική"
breadcrumb_separator : "/"
menu_label :
toc_label : "Πίνακας Περιεχομένων"
ext_link_label : "Εξωτερικός Σύνδεσμος"
less_than : "Λιγότερο από"
minute_read : "λεπτά ανάγνωσης"
share_on_label : "Μοιραστείτε το"
meta_label :
tags_label : "Ετικέτες:"
categories_label : "Κατηγορίες:"
date_label : "Ενημερώθηκε:"
comments_label : "Αφήστε ένα σχόλιο"
comments_title : "Σχόλια"
more_label : "Μάθετε περισσότερα"
related_label : "Θα σας ενδιέφερε ακόμη"
follow_label : "Ακολουθήστε:"
feed_label : "Feed"
powered_by : "Powered by"
website_label : "Ιστοσελίδα"
email_label : "Email"
recent_posts : "Τελευταίες ανακοινώσεις"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
comment_form_info : "Your email address will not be published. Required fields are marked"
comment_form_comment_label : "Σχόλιο"
comment_form_md_info : "Markdown is supported."
comment_form_name_label : "Όνομα"
comment_form_email_label : "Διεύθυνση email"
comment_form_website_label : "Ιστοσελίδα (προαιρετικό)"
comment_btn_submit : "Υπέβαλε ένα σχόλιο"
comment_btn_submitted : "Έχει υποβληθεί"
comment_success_msg : "Ευχαριστούμε για το σχόλιό σας! Θα εμφανιστεί στην ιστοσελίδα αφού εγκριθεί."
comment_error_msg : "Λυπούμαστε, παρουσιάστηκε σφάλμα με την υποβολή σας. Παρακαλούμε βεβαιωθείτε ότι έχετε όλα τα απαιτούμενα πεδία συμπληρωμένα και δοκιμάστε ξανά."
loading_label : "Φόρτωση..."
gr-GR:
<<: *DEFAULT_GR

# Swedish
# -----------------
sv: &DEFAULT_SV
page : "Sidan"
pagination_previous : "Föregående"
pagination_next : "Nästa"
breadcrumb_home_label : "Hem"
breadcrumb_separator : "/"
menu_label : "Meny ridå"
toc_label : "På denna sida"
ext_link_label : "Direkt länk"
less_than : "mindre än"
minute_read : "minut läsning"
share_on_label : "Dela på"
meta_label :
tags_label : "Taggar:"
categories_label : "Kategorier:"
date_label : "Uppdaterades:"
comments_label : "Lämna en kommentar"
comments_title : "Kommentarer"
more_label : "Lär dig mer"
related_label : "Du kanske vill även läsa:"
follow_label : "Följ:"
feed_label : "Flöde"
powered_by : "Framställd med"
website_label : "Webbsida"
email_label : "E-post"
recent_posts : "Senaste inlägg"
undefined_wpm : "Odefinerade parametrar words_per_minute i _config.yml"
comment_form_info : "Din e-post adress kommer inte att publiceras. Obligatoriska fält är markerade."
comment_form_comment_label : "Kommentar"
comment_form_md_info : "Använd Markdown för text-formateringen."
comment_form_name_label : "Namn"
comment_form_email_label : "E-post adress"
comment_form_website_label : "Webdsida (valfritt)"
comment_btn_submit : "Skicka en kommentar"
comment_btn_submitted : "Kommentaren har tagits emot"
comment_success_msg : "Tack för din kommentar! Den kommer att visas på sidan så fort den har godkännts."
comment_error_msg : "Tyvärr det har blivit något fel i en av fälten, se till att du fyller i alla rutor och försök igen."
loading_label : "Laddar..."
sv-SE:
<<: *DEFAULT_SV
sv-FI:
<<: *DEFAULT_SV

# Another locale
# --------------
#
5 changes: 4 additions & 1 deletion _includes/comments.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<div class="page__comments">
{% capture comments_label %}{{ site.data.ui-text[site.locale].comments_label | default: "Comments" }}{% endcapture %}
{% case site.comments.provider %}
{% when "discourse" %}
<h4 class="page__comments-title">{{ comments_label }}</h4>
<section id="discourse-comments"></section>
{% when "disqus" %}
<h4 class="page__comments-title">{{ comments_label }}</h4>
<section id="disqus_thread"></section>
Expand Down Expand Up @@ -77,4 +80,4 @@ <h4 class="page__comments-title">{{ site.data.ui-text[site.locale].comments_labe
{% when "custom" %}
<section id="custom-comments"></section>
{% endcase %}
</div>
</div>
15 changes: 15 additions & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,19 @@
<!-- For all browsers -->
<link rel="stylesheet" href="{{ '/assets/css/main.css' | absolute_url }}">

<!--[if lte IE 9]>
<style>
/* old IE unsupported flexbox fixes */
.greedy-nav .site-title {
padding-right: 3em;
}
.greedy-nav button {
position: absolute;
top: 0;
right: 0;
height: 100%;
}
</style>
<![endif]-->

<meta http-equiv="cleartype" content="on">
4 changes: 2 additions & 2 deletions _includes/masthead.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
<div class="masthead__inner-wrap">
<div class="masthead__menu">
<nav id="site-nav" class="greedy-nav">
<button><div class="navicon"></div></button>
<a class="site-title" href="{{ '/' | absolute_url }}">{{ site.title }}</a>
<ul class="visible-links">
<li class="masthead__menu-item masthead__menu-item--lg"><a href="{{ '/' | absolute_url }}">{{ site.title }}</a></li>
{% for link in site.data.navigation.main %}
{% if link.url contains 'http' %}
{% assign domain = '' %}
Expand All @@ -14,6 +13,7 @@
<li class="masthead__menu-item"><a href="{{ domain }}{{ link.url }}">{{ link.title }}</a></li>
{% endfor %}
</ul>
<button><div class="navicon"></div></button>
<ul class="hidden-links hidden"></ul>
</nav>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _includes/paginator.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

{% comment %} Link next page {% endcomment %}
{% if paginator.next_page %}
<li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | absolute_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li></a></li>
<li><a href="{{ site.paginate_path | replace: ':num', paginator.next_page | replace: '//', '/' | absolute_url }}">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</a></li>
{% else %}
<li><a href="#" class="disabled"><span aria-hidden="true">{{ site.data.ui-text[site.locale].pagination_next | default: "Next" }}</span></a></li>
{% endif %}
Expand Down
6 changes: 4 additions & 2 deletions _includes/seo.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<meta name="description" content="{{ seo_description }}">

{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %}
{% assign seo_author = page.author | default: page.author[0] | default: site.author.name %}
{% if seo_author %}
{% if seo_author.twitter %}
{% assign seo_author_twitter = seo_author.twitter %}
Expand All @@ -39,7 +39,9 @@
{% assign seo_author_twitter = seo_author_twitter | replace: "@", "" %}
{% endif %}

<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
<meta name="author" content="{{ seo_author }}">

<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en_US" }}">
<meta property="og:site_name" content="{{ site.title }}">
<meta property="og:title" content="{{ page.title | default: site.title | markdownify | strip_html | strip_newlines | escape_once }}">

Expand Down
2 changes: 1 addition & 1 deletion _includes/video
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- Courtesy of embedresponsively.com //-->
<div class="responsive-video-container">
{% if video_provider == "vimeo" %}
<iframe src="http://player.vimeo.com/video/{{ video_id }}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
<iframe src="https://player.vimeo.com/video/{{ video_id }}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
{% elsif video_provider == "youtube" %}
<iframe src="https://www.youtube.com/embed/{{ video_id }}" frameborder="0" allowfullscreen></iframe>
{% endif %}
Expand Down
6 changes: 6 additions & 0 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
---

<!doctype html>
<!--
Minimal Mistakes Jekyll Theme 4.4.1 by Michael Rose
Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt
-->
<html lang="{{ site.locale | slice: 0,2 | default: "en" }}" class="no-js">
<head>
{% include head.html %}
Expand Down
Loading

0 comments on commit 76073ec

Please sign in to comment.