Skip to content

Commit

Permalink
Merge tag '4.4.1'
Browse files Browse the repository at this point in the history
* tag '4.4.1': (33 commits)
  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. (#968)
  New comment. (#967)
  Update CHANGELOG and history
  Sync `/docs` with root changes
  Update ui-text.yml (#958)
  fix(includes/video): use https always (#945)
  Update history
  Release 💎 4.4.0
  Move SCSS partials to `/_sass/minimal-mistakes` for easier CSS customization
  Fixed link errors in docs (#946)
  Add closing `}`
  Fix `.masthead` and `.page__footer` overlapping full screen video elements. - Close #933
  Update CHANGELOG and history
  Add ProTip about installing unreleased version on `master`
  Replace modified with last_modified_at (#930)
  Update CHANGELOG and history
  Add Lithuanian language/locale (#924)
  ...

 Conflicts:
	.github/CONTRIBUTING.md
	.github/ISSUE_TEMPLATE.md
	CHANGELOG.md
	README.md
	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/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/_masthead.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/_syntax.scss
	docs/_sass/minimal-mistakes/_tables.scss
	docs/_sass/minimal-mistakes/_utilities.scss
	docs/_sass/minimal-mistakes/_variables.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/_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
NicolasT committed May 30, 2017
2 parents a08771f + 9361c53 commit 1fbb0cf
Show file tree
Hide file tree
Showing 119 changed files with 390 additions and 106 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
89 changes: 88 additions & 1 deletion _data/ui-text.yml
Original file line number Diff line number Diff line change
Expand Up @@ -578,5 +578,92 @@ ru: &DEFAULT_RU
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

# Another locale
# --------------
# --------------
#
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
2 changes: 1 addition & 1 deletion _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<!doctype html>
<!--
Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
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
Expand Down
10 changes: 4 additions & 6 deletions _layouts/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
{% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
{% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
{% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date: "%B %d, %Y" }}">{% endif %}
{% if page.modified %}<meta itemprop="dateModified" content="{{ page.modified | date: "%B %d, %Y" }}">{% endif %}
{% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}

<div class="page__inner-wrap">
{% unless page.header.overlay_color or page.header.overlay_image %}
Expand All @@ -43,8 +43,8 @@
<h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4>
{% endif %}
{% include page__taxonomy.html %}
{% if page.modified %}
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.modified | date: "%Y-%m-%d" }}">{{ page.modified | date: "%B %d, %Y" }}</time></p>
{% if page.last_modified_at %}
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.last_modified_at | date: "%Y-%m-%d" }}">{{ page.last_modified_at | date: "%B %d, %Y" }}</time></p>
{% elsif page.date %}
<p class="page__date"><strong><i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ site.data.ui-text[site.locale].date_label | default: "Updated:" }}</strong> <time datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: "%B %d, %Y" }}</time></p>
{% endif %}
Expand All @@ -63,9 +63,7 @@ <h4 class="page__meta-title">{{ site.data.ui-text[site.locale].meta_label }}</h4
{% comment %}<!-- only show related on a post page when not disabled -->{% endcomment %}
{% if page.id and page.related and site.related_posts.size > 0 %}
<div class="page__related">
{% if site.data.ui-text[site.locale].related_label %}
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
{% endif %}
<h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}</h4>
<div class="grid__wrapper">
{% for post in site.related_posts limit:4 %}
{% include archive-single.html type="grid" %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/splash.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% if page.title %}<meta itemprop="headline" content="{{ page.title | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
{% if page.excerpt %}<meta itemprop="description" content="{{ page.excerpt | markdownify | strip_html | strip_newlines | escape_once }}">{% endif %}
{% if page.date %}<meta itemprop="datePublished" content="{{ page.date | date: "%B %d, %Y" }}">{% endif %}
{% if page.modified %}<meta itemprop="dateModified" content="{{ page.modified | date: "%B %d, %Y" }}">{% endif %}
{% if page.last_modified_at %}<meta itemprop="dateModified" content="{{ page.last_modified_at | date: "%B %d, %Y" }}">{% endif %}

<section class="page__content" itemprop="text">
{{ content }}
Expand Down
18 changes: 0 additions & 18 deletions _sass/_print.scss

This file was deleted.

40 changes: 40 additions & 0 deletions _sass/minimal-mistakes.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*!
* Minimal Mistakes Jekyll Theme 4.4.1 by Michael Rose
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
*/

/* Variables */
@import "minimal-mistakes/variables";

/* Mixins and functions */
@import "minimal-mistakes/vendor/breakpoint/breakpoint";
@include breakpoint-set("to ems", true);
@import "minimal-mistakes/vendor/font-awesome/font-awesome";
@import "minimal-mistakes/vendor/magnific-popup/magnific-popup"; // Magnific Popup
@import "minimal-mistakes/vendor/susy/susy";
@import "minimal-mistakes/mixins";

/* Core CSS */
@import "minimal-mistakes/reset";
@import "minimal-mistakes/base";
@import "minimal-mistakes/forms";
@import "minimal-mistakes/tables";
@import "minimal-mistakes/animations";

/* Components */
@import "minimal-mistakes/buttons";
@import "minimal-mistakes/notices";
@import "minimal-mistakes/masthead";
@import "minimal-mistakes/navigation";
@import "minimal-mistakes/footer";
@import "minimal-mistakes/syntax";

/* Utility classes */
@import "minimal-mistakes/utilities";

/* Layout specific */
@import "minimal-mistakes/page";
@import "minimal-mistakes/archive";
@import "minimal-mistakes/sidebar";
@import "minimal-mistakes/print";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion _sass/_page.scss → _sass/minimal-mistakes/_page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
text-align: right;
z-index: 5;
opacity: 0.5;
border-radius: $border-radius 0 $border-radius 0;
border-radius: $border-radius 0 0 0;

@include breakpoint($large) {
padding: 5px 10px;
Expand Down
Loading

0 comments on commit 1fbb0cf

Please sign in to comment.