Skip to content

Commit 7cbf67c

Browse files
mmistakesmmistakes
committed
Merge branch 'release/4.2.0'
2 parents 77db91a + d061a95 commit 7cbf67c

34 files changed

+513
-148
lines changed

‎CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
## [4.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.0)
2+
3+
### Enhancements
4+
5+
- Add `video` helper (for YouTube/Vimeo) and video headers to `single`, `archive`, and `splash` layouts. [#788](https://github.com/mmistakes/minimal-mistakes/pull/788)
6+
- Add missing simplified Chinese localized UI text strings. [#747](https://github.com/mmistakes/minimal-mistakes/pull/747)
7+
- Add Nepali (Nepalese) localized UI text strings. [#785](https://github.com/mmistakes/minimal-mistakes/pull/785)
8+
- Remove borders from table elements found in Google Custom Search Engine widget. [#759](https://github.com/mmistakes/minimal-mistakes/issues/759)
9+
10+
### Bug Fixes
11+
12+
- Remove `position: sticky` JavaScript polyfill and fallback to default positioning for browsers that don't support it. [#752](https://github.com/mmistakes/minimal-mistakes/issues/752)
13+
14+
### Maintenance
15+
16+
- Fix invalid Google Universal Analytics example in documentation. [#783](https://github.com/mmistakes/minimal-mistakes/pull/783)
17+
- Bump `jekyll-sitemap` gem dependency to (1.0).
18+
119
## [4.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.1.1)
220

321
### Enhancements

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ See what's new in the [CHANGELOG](CHANGELOG.md).
2525
- 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.
2626
- 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](https://staticman.net/), and custom).
2727
- [Google Analytics](https://www.google.com/analytics/) support.
28-
- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Spanish, and Turkish
28+
- UI localized text in English (default), Brazilian Portuguese, Chinese, French, German, Italian, Nepali (Nepalese), Spanish, and Turkish
2929

3030
## Demo Pages
3131

@@ -128,7 +128,6 @@ To test the theme, run `bundle exec rake preview` and open your browser at `http
128128
- [FitVids.JS](http://fitvidsjs.com/)
129129
- Greedy Navigation - [lukejacksonn](http://codepen.io/lukejacksonn/pen/PwmwWV)
130130
- [jQuery Smooth Scroll](https://github.com/kswedberg/jquery-smooth-scroll)
131-
- [Stickyfill](https://github.com/wilddeer/stickyfill)
132131

133132
---
134133

‎_data/ui-text.yml

+57-16
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ zh: &DEFAULT_ZH
318318
pagination_next : "向后"
319319
breadcrumb_home_label : "首页"
320320
breadcrumb_separator : "/"
321-
menu_label :
321+
menu_label : "切换菜单"
322322
toc_label : "在本页上"
323323
ext_link_label : "直接链接"
324324
less_than : "少于"
@@ -334,22 +334,22 @@ zh: &DEFAULT_ZH
334334
related_label : "猜您还喜欢"
335335
follow_label : "关注:"
336336
feed_label : "Feed"
337-
powered_by : "Powered by"
337+
powered_by : "技术来自于"
338338
website_label : "网站"
339-
email_label : "Email"
339+
email_label : "电子邮箱"
340340
recent_posts : "最新文章"
341-
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
342-
comment_form_info : "Your email address will not be published. Required fields are marked"
343-
comment_form_comment_label : "Comment"
344-
comment_form_md_info : "Markdown is supported."
345-
comment_form_name_label : "Name"
346-
comment_form_email_label : "Email address"
347-
comment_form_website_label : "Website (optional)"
348-
comment_btn_submit : "Submit Comment"
349-
comment_btn_submitted : "Submitted"
350-
comment_success_msg : "Thanks for your comment! It will show on the site once it has been approved."
351-
comment_error_msg : "Sorry, there was an error with your submission. Please make sure all required fields have been completed and try again."
352-
loading_label : "Loading..."
341+
undefined_wpm : "_config.yml配置中words_per_minute字段未定义"
342+
comment_form_info : "您的电子邮箱地址并不会被展示。请填写标记为必须的字段。"
343+
comment_form_comment_label : "评论"
344+
comment_form_md_info : "Markdown语法已支持。"
345+
comment_form_name_label : "姓名"
346+
comment_form_email_label : "电子邮箱"
347+
comment_form_website_label : "网站（可选）"
348+
comment_btn_submit : "提交评论"
349+
comment_btn_submitted : "已提交"
350+
comment_success_msg : "感谢您的评论！被批准后它会立即在此站点展示。"
351+
comment_error_msg : "很抱歉，您的提交存在错误。请确保所有必填字段都已填写正确，然后再试一次。"
352+
loading_label : "正在加载..."
353353
zh-CN:
354354
<<: *DEFAULT_ZH
355355
zh-HK:
@@ -411,6 +411,47 @@ de-LI:
411411
<<: *DEFAULT_DE
412412
de-LU:
413413
<<: *DEFAULT_DE
414-
414+
# Nepali (Nepal)
415+
# -----------------
416+
ne: &DEFAULT_NE
417+
page : "पृष्‍ठ"
418+
pagination_previous : "अघिल्लो"
419+
pagination_next : "अर्को"
420+
breadcrumb_home_label : "गृह"
421+
breadcrumb_separator : "/"
422+
menu_label : "टगल मेनु"
423+
toc_label : "यो पृष्‍ठमा"
424+
ext_link_label : "सिधा सम्पर्क"
425+
less_than : "कम्तिमा"
426+
minute_read : "मिनेट पढ्नुहोस्"
427+
share_on_label : "शेयर गर्नुहोस्"
428+
meta_label :
429+
tags_label : "ट्यागहरू:"
430+
categories_label : "वर्गहरु:"
431+
date_label : "अद्यावधिक:"
432+
comments_label : "टिप्पणी दिनुहोस्"
433+
comments_title : "टिप्पणीहरू"
434+
more_label : "अझै सिक्नुहोस्"
435+
related_label : "तपाईं रुचाउन सक्नुहुन्छ "
436+
follow_label : "पछ्याउनुहोस्:"
437+
feed_label : "फिड"
438+
powered_by : "Powered by"
439+
website_label : "वेबसाइट"
440+
email_label : "इमेल"
441+
recent_posts : "ताजा लेखहरु"
442+
undefined_wpm : "अपरिभाषित प्यारामिटर शब्दहरू_प्रति_मिनेट at _config.yml"
443+
comment_form_info : "तपाइँको इमेल ठेगाना प्रकाशित गरिने छैन।आवश्यक जानकारीहरुमा चिन्ह लगाइको छ"
444+
comment_form_comment_label : "टिप्पणी"
445+
comment_form_md_info : "मार्कडाउन समर्थित छ।"
446+
comment_form_name_label : "नाम"
447+
comment_form_email_label : "इमेल ठेगाना"
448+
comment_form_website_label : "वेबसाइट (वैकल्पिक)"
449+
comment_btn_submit : "टिप्पणी दिनुहोस् "
450+
comment_btn_submitted : "टिप्पणी भयो"
451+
comment_success_msg : "तपाईंको टिप्पणीको लागि धन्यवाद! एक पटक यो अनुमोदन गरेपछी यो साइटमा देखाउनेछ।"
452+
comment_error_msg : "माफ गर्नुहोस्, तपाईंको टिप्पणी त्रुटि थियो।सबै आवश्यक जानकारीहरु पूरा गरिएको छ भने निश्चित गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"
453+
loading_label : "लोड हुँदैछ ..."
454+
ne-NP:
455+
<<: *DEFAULT_NE
415456
# Another locale
416457
# --------------

‎_includes/page__hero_video.html

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{% capture video_id %}{{ page.header.video.id }}{% endcapture %}
2+
{% capture video_provider %}{{ page.header.video.provider }}{% endcapture %}
3+
4+
{% include video id=video_id provider=video_provider %}

‎_includes/video

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{% capture video_id %}{{ include.id }}{% endcapture %}
2+
{% capture video_provider %}{{ include.provider }}{% endcapture %}
3+
4+
<!-- Courtesy of embedresponsively.com //-->
5+
<div class="responsive-video-container">
6+
{% if video_provider == "vimeo" %}
7+
<iframe src="http://player.vimeo.com/video/{{ video_id }}" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
8+
{% elsif video_provider == "youtube" %}
9+
<iframe src="https://www.youtube.com/embed/{{ video_id }}" frameborder="0" allowfullscreen></iframe>
10+
{% endif %}
11+
</div>

‎_layouts/archive.html

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
66
{% include page__hero.html %}
7+
{% elsif page.header.video.id and page.header.video.provider %}
8+
{% include page__hero_video.html %}
79
{% endif %}
810

911
{% if page.url != "/" and site.breadcrumbs %}

‎_layouts/single.html

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
66
{% include page__hero.html %}
7+
{% elsif page.header.video.id and page.header.video.provider %}
8+
{% include page__hero_video.html %}
79
{% endif %}
810

911
{% if page.url != "/" and site.breadcrumbs %}
@@ -71,4 +73,4 @@ <h4 class="page__related-title">{{ site.data.ui-text[site.locale].related_label
7173
</div>
7274
</div>
7375
{% endif %}
74-
</div>
76+
</div>

‎_layouts/splash.html

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
{% if page.header.overlay_color or page.header.overlay_image or page.header.image %}
66
{% include page__hero.html %}
7+
{% elsif page.header.video.id and page.header.video.provider %}
8+
{% include page__hero_video.html %}
79
{% endif %}
810

911
<div id="main" role="main">

‎_sass/_utilities.scss

+37-1
Original file line numberDiff line numberDiff line change
@@ -467,4 +467,40 @@ a.reversefootnote {
467467
.required {
468468
color: $danger-color;
469469
font-weight: bold;
470-
}
470+
}
471+
472+
473+
/*
474+
Google Custom Search Engine
475+
========================================================================== */
476+
477+
.gsc-control-cse {
478+
479+
table, tr, td {
480+
border: 0; /* remove table borders widget */
481+
}
482+
}
483+
484+
/*
485+
Responsive Video Embed
486+
========================================================================== */
487+
488+
.responsive-video-container {
489+
position: relative;
490+
margin-bottom: 1em;
491+
padding-bottom: 56.25%;
492+
height: 0;
493+
overflow: hidden;
494+
max-width: 100%;
495+
496+
iframe,
497+
object,
498+
embed {
499+
position: absolute;
500+
top: 0;
501+
left: 0;
502+
width: 100%;
503+
height: 100%;
504+
}
505+
}
506+

‎assets/js/_main.js

-28
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,7 @@ $(document).ready(function(){
2525
// FitVids init
2626
$("#main").fitVids();
2727

28-
// init sticky sidebar
29-
$(".sticky").Stickyfill();
30-
31-
var stickySideBar = function(){
32-
var show = $(".author__urls-wrapper button").length === 0 ? $(window).width() > 1024 : !$(".author__urls-wrapper button").is(":visible");
33-
// console.log("has button: " + $(".author__urls-wrapper button").length === 0);
34-
// console.log("Window Width: " + windowWidth);
35-
// console.log("show: " + show);
36-
//old code was if($(window).width() > 1024)
37-
if (show) {
38-
// fix
39-
Stickyfill.rebuild();
40-
Stickyfill.init();
41-
$(".author__urls").show();
42-
} else {
43-
// unfix
44-
Stickyfill.stop();
45-
$(".author__urls").hide();
46-
}
47-
};
48-
49-
stickySideBar();
50-
51-
$(window).resize(function(){
52-
stickySideBar();
53-
});
54-
5528
// Follow menu drop down
56-
5729
$(".author__urls-wrapper button").on("click", function() {
5830
$(".author__urls").fadeToggle("fast", function() {});
5931
$(".author__urls-wrapper button").toggleClass("open");

‎assets/js/main.min.js

+4-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/plugins/stickyfill.min.js

-8
This file was deleted.

0 commit comments

Comments
 (0)