diff --git a/.github/stale.yml b/.github/stale.yml index 2d8120fa..3aa2e79c 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -6,7 +6,6 @@ daysUntilClose: 7 exemptLabels: - "Status: Accepted" - "Status: Under Consideration" - - "Status: Review Needed" # Label to use when marking an issue as stale staleLabel: "Status: Stale" # Comment to post when marking an issue as stale. Set to `false` to disable diff --git a/CHANGELOG.md b/CHANGELOG.md index 0493e95e..eb0d330d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,41 @@ +## Unreleased + +### Enhancements + +* Add missing French localized UI text strings. [#1769](https://github.com/mmistakes/minimal-mistakes/pull/1769) +* Update Font Awesome to version [`5.2.0`](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md). [#1754](https://github.com/mmistakes/minimal-mistakes/pull/1754) +* Add documentation note to update root `Gemfile` when forking theme. +* Add missing French translations. [#1741](https://github.com/mmistakes/minimal-mistakes/pull/1741) + +### Bug Fixes + +* Remove slash at the beginning of `path` in staticman.yml example. [#1772](https://github.com/mmistakes/minimal-mistakes/pull/1772) +* Fix `read_time` logic in header image overlay. [#1756](https://github.com/mmistakes/minimal-mistakes/pull/1756) + +## [4.12.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.12.0) + +### Enhancements + +* Add Hungarian localized UI text strings. [#1682](https://github.com/mmistakes/minimal-mistakes/pull/1682) +* DRY `tags_max` calculation in tags.html layout. [#1696](https://github.com/mmistakes/minimal-mistakes/pull/1696) +* DRY `categories_max` calculation in categories.html layout. +* Add support for ["sticking" table of contents](https://mmistakes.github.io/minimal-mistakes/layout-table-of-contents-sticky/) to top of page via `toc_sticky: true` YAML Front Matter. +* Add support for captioning images in feature row helper via `image_caption` YAML Front Matter. [#1440](https://github.com/mmistakes/minimal-mistakes/issues/1440) +* Add [Google Custom Search Engine](https://cse.google.com/cse) support. [#1652](https://github.com/mmistakes/minimal-mistakes/issues/1652) +* Update Font Awesome to version [`5.1.13`](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md) +* Add "Pets" sample archive page to documentation site. [#1664](https://github.com/mmistakes/minimal-mistakes/pull/1664) +* Add GitLab social icon brand color. [#1653](https://github.com/mmistakes/minimal-mistakes/issues/1653) +* Prevent line breaks between FontAwesome icon and text in footer social links. [#1659](https://github.com/mmistakes/minimal-mistakes/issues/1659) + +### Bug Fixes + +* Set default `title_separator`. [#1701](https://github.com/mmistakes/minimal-mistakes/pull/1701) +* Fix `naver_site_verification` typo in /_includes/seo.html. [#1687](https://github.com/mmistakes/minimal-mistakes/pull/1687) +* Fix table of contents missing borders. [#1675](https://github.com/mmistakes/minimal-mistakes/issues/1675) +* Fix link to "Recipes" sample archive on documentation site. [#1664](https://github.com/mmistakes/minimal-mistakes/pull/1664) +* Update example Reddit social share interpolation syntax in documentation. [#1656](https://github.com/mmistakes/minimal-mistakes/issues/1656) +* Fix "Back to Top" links on pages that use [header overlays](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#header-overlay). + ## [4.11.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.11.2) ### Enhancements diff --git a/README.md b/README.md index 42145772..b8692560 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your - Optional [header images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#headers), [custom sidebars](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#sidebars), [table of contents](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#table-of-contents), [galleries](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery), related posts, [breadcrumb links](https://mmistakes.github.io/minimal-mistakes/docs/configuration/#breadcrumb-navigation-beta), [navigation lists](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list), and more. - Commenting support (powered by [Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), static-based via [Staticman v1 and v2](https://staticman.net/), and custom). - [Google Analytics](https://www.google.com/analytics/) support. -- UI localized text in English (default), Brazilian Portuguese (Português brasileiro), Chinese, Danish, Dutch, French (Français), German (Deutsch), Greek, Indonesian, Italian (Italiano), Japanese, Korean, Nepali (Nepalese), Polish, Russian, Slovak, Spanish (Español), Swedish, Turkish (Türkçe), and Vietnamese. +- UI localized text in English (default), Brazilian Portuguese (Português brasileiro), Chinese, Danish, Dutch, French (Français), German (Deutsch), Greek, Hungarian, Indonesian, Italian (Italiano), Japanese, Korean, Nepali (Nepalese), Polish, Russian, Slovak, Spanish (Español), Swedish, Turkish (Türkçe), and Vietnamese. ## Skins (Color Variations) diff --git a/_config.yml b/_config.yml index 2afe7c0e..4bfe5574 100644 --- a/_config.yml +++ b/_config.yml @@ -60,13 +60,15 @@ atom_feed: path : # blank (default) uses feed.xml search : # true, false (default) search_full_content : # true, false (default) -search_provider : # lunr (default), algolia +search_provider : # lunr (default), algolia, google algolia: application_id : # YOUR_APPLICATION_ID index_name : # YOUR_INDEX_NAME search_only_api_key : # YOUR_SEARCH_ONLY_API_KEY powered_by : # true (default), false - +google: + search_engine_id : # YOUR_SEARCH_ENGINE_ID + instant_search : # false (default), true # SEO Related google_site_verification : bing_site_verification : diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 51692d82..7177db4f 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -105,18 +105,18 @@ fr: &DEFAULT_FR pagination_next : "Suivant" breadcrumb_home_label : "Accueil" breadcrumb_separator : "/" - menu_label : + menu_label : "Menu" toc_label : "Sur cette page" ext_link_label : "Lien direct" less_than : "moins de" - minute_read : "minute de lecture" + minute_read : "minute(s) de lecture" share_on_label : "Partager sur" meta_label : tags_label : "Tags :" categories_label : "Catégories :" date_label : "Mis à jour :" comments_label : "Laisser un commentaire" - comments_title : + comments_title : "Commentaires" more_label : "Lire plus" related_label : "Vous pourriez aimer aussi" follow_label : "Contact" @@ -126,7 +126,6 @@ fr: &DEFAULT_FR email_label : "Email" recent_posts : "Posts récents" undefined_wpm : "Le paramètre words_per_minute n'est pas défini dans _config.yml" - comments_title : "Commentaires" comment_form_info : "Votre adresse email ne sera pas visible. Les champs obligatoires sont marqués" comment_form_comment_label : "Commentaire" comment_form_md_info : "Markdown est supporté." @@ -138,6 +137,9 @@ fr: &DEFAULT_FR comment_success_msg : "Merci pour votre commentaire, il sera visible sur le site une fois approuvé." comment_error_msg : "Désolé, une erreur est survenue lors de la soumission. Vérifiez que les champs obligatoires ont été remplis et réessayez." loading_label : "Chargement..." + search_placeholder_text : "Entrez votre recherche..." + results_found : "Aucun résultat trouvé" + back_to_top : "Retour en haut" fr-FR: <<: *DEFAULT_FR fr-BE: @@ -1029,6 +1031,52 @@ sk: &DEFAULT_SK sk-SK: <<: *DEFAULT_SK +# Hungarian +# ----------------- +hu: &DEFAULT_HU + page : "Oldal" + pagination_previous : "Előző" + pagination_next : "Következő" + breadcrumb_home_label : "Kezdőlap" + breadcrumb_separator : "/" + menu_label : "Menü nyit/zár" + toc_label : "Ezen az oldalon" + ext_link_label : "Közvetlen Link" + less_than : "kevesebb mint" + minute_read : "eltöltött percek" + share_on_label : "Megosztás" + meta_label : + tags_label : "Tagek:" + categories_label : "Kategóriák:" + date_label : "Frissítve:" + comments_label : "Szólj hozzá!" + comments_title : "Hozzászólások" + more_label : "Tovább" + related_label : "Ajánlások" + follow_label : "Követés:" + feed_label : "Folyam" + powered_by : "Powered by" + website_label : "Honlap" + email_label : "Email" + recent_posts : "Friss cikkek" + undefined_wpm : "Ismeretlen paraméter words_per_minute : _config.yml" + comment_form_info : "Az e-mail címed nem lesz publikus. A csillagozott mezők kitöltése kötelező." + comment_form_comment_label : "Hozzászólás" + comment_form_md_info : "Támogatott formázási mód: Markdown" + comment_form_name_label : "Név" + comment_form_email_label : "Email cím" + comment_form_website_label : "Honlap (nem kötelező):" + comment_btn_submit : "Hozzászólás elküldése" + comment_btn_submitted : "Hozzászólás elküldve" + comment_success_msg : "Köszönjük a Hozzászólást! A Hozzászólások csak előzetes moderáció után lesznek publikusak." + comment_error_msg : "Hoppá, hiba történt a beküldés közben. Kérlek ellenőrizd hogy minden kötelező mező ki van-e töltve." + loading_label : "Betöltés..." + search_placeholder_text : "Keresendő szöveg..." + results_found : "Találatok:" + back_to_top : "Oldal tetejére" +hu-HU: + <<: *DEFAULT_HU + # Another locale # -------------- # diff --git a/_includes/feature_row b/_includes/feature_row index e953cd06..89dfc1b4 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -25,6 +25,9 @@ "{{ f.image_path | relative_url }}" {% endif %} alt="{% if f.alt %}{{ f.alt }}{% endif %}"> + {% if f.image_caption %} + {{ f.image_caption | markdownify | remove: "

" | remove: "

" }} + {% endif %} {% endif %} diff --git a/_includes/page__hero.html b/_includes/page__hero.html index d32db519..c05b346b 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -35,7 +35,7 @@ > {% if page.header.overlay_color or page.header.overlay_image %}
-

+

{% if paginator and site.paginate_show_page_num %} {{ site.title }}{% unless paginator.page == 1 %} {{ site.data.ui-text[site.locale].page | default: "Page" }} {{ paginator.page }}{% endunless %} {% else %} @@ -45,7 +45,7 @@ {% if page.header.show_overlay_excerpt != false and page.excerpt %}

{{ page.excerpt | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% if site.read_time and page.read_time %} + {% if page.read_time %}

{% include read-time.html %}

{% endif %} {% if page.header.cta_url %} diff --git a/_includes/scripts.html b/_includes/scripts.html index d3052647..4c15d325 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -9,7 +9,7 @@ {% endfor %} {% else %} - + {% endif %} {% if site.search == true or page.layout == "search" %} @@ -17,6 +17,8 @@ {%- case search_provider -%} {%- when "lunr" -%} {% include search/lunr-search-scripts.html %} + {%- when "google" -%} + {% include search/google-search-scripts.html %} {%- when "algolia" -%} {% include search/algolia-search-scripts.html %} {%- endcase -%} diff --git a/_includes/search/google-search-scripts.html b/_includes/search/google-search-scripts.html new file mode 100644 index 00000000..4af7423b --- /dev/null +++ b/_includes/search/google-search-scripts.html @@ -0,0 +1,30 @@ + \ No newline at end of file diff --git a/_includes/search/search_form.html b/_includes/search/search_form.html index 3058f6b1..329c30d1 100644 --- a/_includes/search/search_form.html +++ b/_includes/search/search_form.html @@ -4,6 +4,13 @@ {%- when "lunr" -%}
+ {%- when "google" -%} +
+ +
+
+ +
{%- when "algolia" -%}
diff --git a/_includes/seo.html b/_includes/seo.html index 2ac0b649..5acd622c 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -4,9 +4,7 @@ {%- endif -%} {%- assign seo_url = seo_url | default: site.github.url -%} -{% if site.title_separator %} - {% assign title_separator = site.title_separator | default: '-' | replace: '|', '|' %} -{% endif %} +{% assign title_separator = site.title_separator | default: '-' | replace: '|', '|' %} {%- if page.title -%} {%- assign seo_title = page.title | append: " " | append: title_separator | append: " " | append: site.title -%} @@ -160,7 +158,7 @@ {% if site.yandex_site_verification %} {% endif %} -{% if site.naver-site-verification %} - +{% if site.naver_site_verification %} + {% endif %} diff --git a/_layouts/categories.html b/_layouts/categories.html index 0c7521f3..aa2c6e80 100644 --- a/_layouts/categories.html +++ b/_layouts/categories.html @@ -4,13 +4,14 @@ layout: archive {{ content }} +{% assign categories_max = 0 %} +{% for category in site.categories %} + {% if category[1].size > categories_max %} + {% assign categories_max = category[1].size %} + {% endif %} +{% endfor %} + -{% assign categories_max = 0 %} -{% for category in site.categories %} - {% if category[1].size > categories_max %} - {% assign categories_max = category[1].size %} - {% endif %} -{% endfor %} - {% for i in (1..categories_max) reversed %} {% for category in site.categories %} {% if category[1].size == i %} diff --git a/_layouts/default.html b/_layouts/default.html index b6c2e3a8..822e24eb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@