Merge branch 'release/4.2.2' into develop
This commit is contained in:
commit
943bf19fc5
22 changed files with 241 additions and 126 deletions
20
CHANGELOG.md
20
CHANGELOG.md
|
@ -1,3 +1,23 @@
|
|||
## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
|
||||
|
||||
### Enhancements
|
||||
|
||||
- Update [Greedy Navigation](https://github.com/lukejacksonn/GreedyNav) to flexbox version to make it more flexible when dealing with long site titles (`site.title`). [#836](https://github.com/mmistakes/minimal-mistakes/issues/836)
|
||||
- Adjust `box-shadow` in navigation and author sidebar. [#576](https://github.com/mmistakes/minimal-mistakes/pull/576)
|
||||
- Add Russian, Korean, and zh-TW localized UI text. [#815](https://github.com/mmistakes/minimal-mistakes/issues/815) [#834](https://github.com/mmistakes/minimal-mistakes/pull/834) [#838](https://github.com/mmistakes/minimal-mistakes/pull/838)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Fix Discourse embedded comments bug. [#823](https://github.com/mmistakes/minimal-mistakes/issues/823)
|
||||
- Fix `seo_author` default value in `seo.html` and add `author` meta. [#858](https://github.com/mmistakes/minimal-mistakes/pull/858)
|
||||
|
||||
### Maintenance
|
||||
|
||||
- Add theme meta info to `_layouts/default.html` and `main.css`.
|
||||
- Update README.
|
||||
- Improve the pagination and taxonomy archive documentation. [#826](https://github.com/mmistakes/minimal-mistakes/pull/826)
|
||||
- Add comments to `/docs/_config.yml` to clarify use of YAML references. [#847](https://github.com/mmistakes/minimal-mistakes/pull/847)
|
||||
|
||||
## [4.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.1)
|
||||
|
||||
### Enhancements
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
---
|
||||
|
||||
<!doctype html>
|
||||
<!--
|
||||
Minimal Mistakes Jekyll Theme 4.2.2 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 %}
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
---
|
||||
---
|
||||
|
||||
/*
|
||||
* Minimal Mistakes Jekyll Theme
|
||||
*
|
||||
* - Michael Rose
|
||||
* - mademistakes.com
|
||||
* - https://twitter.com/mmistakes
|
||||
*
|
||||
/*!
|
||||
* Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
|
||||
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
|
||||
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
|
@ -4,9 +4,29 @@ permalink: /docs/history/
|
|||
excerpt: "Change log of enhancements and bug fixes made to the theme."
|
||||
sidebar:
|
||||
nav: docs
|
||||
modified: 2017-01-24T10:55:37-05:00
|
||||
modified: 2017-02-21T10:35:32-05:00
|
||||
---
|
||||
|
||||
## [4.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2)
|
||||
|
||||
### Enhancements
|
||||
|
||||
- Update [Greedy Navigation](https://github.com/lukejacksonn/GreedyNav) to flexbox version to make it more flexible when dealing with long site titles (`site.title`). [#836](https://github.com/mmistakes/minimal-mistakes/issues/836)
|
||||
- Adjust `box-shadow` in navigation and author sidebar. [#576](https://github.com/mmistakes/minimal-mistakes/pull/576)
|
||||
- Add Russian, Korean, and zh-TW localized UI text. [#815](https://github.com/mmistakes/minimal-mistakes/issues/815) [#834](https://github.com/mmistakes/minimal-mistakes/pull/834) [#838](https://github.com/mmistakes/minimal-mistakes/pull/838)
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Fix Discourse embedded comments bug. [#823](https://github.com/mmistakes/minimal-mistakes/issues/823)
|
||||
- Fix `seo_author` default value in `seo.html` and add `author` meta. [#858](https://github.com/mmistakes/minimal-mistakes/pull/858)
|
||||
|
||||
### Maintenance
|
||||
|
||||
- Add theme meta info to `_layouts/default.html` and `main.css`.
|
||||
- Update README.
|
||||
- Improve the pagination and taxonomy archive documentation. [#826](https://github.com/mmistakes/minimal-mistakes/pull/826)
|
||||
- Add comments to `/docs/_config.yml` to clarify use of YAML references. [#847](https://github.com/mmistakes/minimal-mistakes/pull/847)
|
||||
|
||||
## [4.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.1)
|
||||
|
||||
### Enhancements
|
||||
|
|
|
@ -9,5 +9,5 @@
|
|||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Please enable JavaScript to view the comments powered by [Discourse](http://forum.beta-europe.org/c/beta/website).</a></noscript>
|
||||
<noscript>Please enable JavaScript to view the comments powered by <a href="https://www.discourse.org/">Discourse.</a></noscript>
|
||||
{% endif %}
|
|
@ -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>
|
||||
|
|
|
@ -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">
|
|
@ -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 = '' %}
|
||||
|
@ -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>
|
||||
|
|
|
@ -23,7 +23,9 @@
|
|||
{% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %}
|
||||
{% endif %}
|
||||
|
||||
{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %}
|
||||
<meta name="description" content="{{ seo_description }}">
|
||||
|
||||
{% 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 %}
|
||||
|
@ -37,6 +39,8 @@
|
|||
{% assign seo_author_twitter = seo_author_twitter | replace: "@", "" %}
|
||||
{% endif %}
|
||||
|
||||
<meta name="author" content="{{ seo_author }}">
|
||||
|
||||
<meta property="og:locale" content="{{ site.locale | replace: "-", "_" | default: "en" }}">
|
||||
<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 }}">
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
---
|
||||
|
||||
<!doctype html>
|
||||
<!--
|
||||
Minimal Mistakes Jekyll Theme 4.2.2 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 %}
|
||||
|
|
|
@ -7,7 +7,7 @@ header:
|
|||
cta_label: "<i class='fa fa-download'></i> Install Now"
|
||||
cta_url: "/docs/quick-start-guide/"
|
||||
caption:
|
||||
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.1">Latest release v4.2.1</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
|
||||
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.2.2">Latest release v4.2.2</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
|
||||
feature_row:
|
||||
- image_path: /assets/images/mm-customizable-feature.png
|
||||
alt: "customizable"
|
||||
|
@ -30,7 +30,7 @@ feature_row:
|
|||
github:
|
||||
- excerpt: '{::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
|
||||
intro:
|
||||
- excerpt: 'Get notified when I add new stuff [<i class="fa fa-twitter"></i> @mmistakes](https://twitter.com/mmistakes){: .btn .btn--twitter}'
|
||||
- excerpt: 'Get notified when I add new stuff [<i class="fa fa-twitter"></i> @mmistakes](https://twitter.com/mmistakes){: .btn .btn--twitter} [<i class="fa fa-paypal"></i> Tip Me](https://www.paypal.me/mmistakes){: .btn}'
|
||||
---
|
||||
|
||||
{% include feature_row id="intro" type="center" %}
|
||||
|
|
|
@ -14,6 +14,10 @@
|
|||
&__inner-wrap {
|
||||
@include container;
|
||||
@include clearfix;
|
||||
display: -webkit-box;
|
||||
display: flex;
|
||||
-webkit-box-pack: justify;
|
||||
justify-content: space-between;
|
||||
padding: 1em 1em 1em;
|
||||
font-family: $sans-serif-narrow;
|
||||
|
||||
|
@ -31,7 +35,27 @@
|
|||
}
|
||||
}
|
||||
|
||||
.site-title {
|
||||
display: -webkit-box;
|
||||
display: flex;
|
||||
padding: 0.5rem 0;
|
||||
align-self: stretch;
|
||||
-webkit-box-align: center;
|
||||
align-items: center;
|
||||
font-weight: bold;
|
||||
z-index: 20;
|
||||
}
|
||||
|
||||
.masthead__menu {
|
||||
width: 100%;
|
||||
|
||||
.site-nav {
|
||||
margin-left: 0;
|
||||
|
||||
@include breakpoint($small) {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
|
||||
ul {
|
||||
margin: 0;
|
||||
|
|
|
@ -175,7 +175,10 @@
|
|||
|
||||
.greedy-nav {
|
||||
position: relative;
|
||||
min-width: 250px;
|
||||
display: -webkit-box;
|
||||
display: flex;
|
||||
-webkit-box-align: center;
|
||||
align-items: center;
|
||||
background: $background-color;
|
||||
|
||||
a {
|
||||
|
@ -188,34 +191,35 @@
|
|||
&:hover {
|
||||
color: $masthead-link-color-hover;
|
||||
}
|
||||
|
||||
&.site-title {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
button {
|
||||
position: absolute;
|
||||
height: 100%;
|
||||
right: 0;
|
||||
padding: 0 0.5rem;
|
||||
align-self: stretch;
|
||||
border: 0;
|
||||
outline: none;
|
||||
background-color: $primary-color;
|
||||
color: #fff;
|
||||
background-color: $primary-color;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.visible-links {
|
||||
display: table;
|
||||
display: -webkit-box;
|
||||
display: flex;
|
||||
-webkit-box-pack: end;
|
||||
justify-content: flex-end;
|
||||
-webkit-box-flex: 1;
|
||||
flex: 1;
|
||||
padding-right: 2rem;
|
||||
overflow: hidden;
|
||||
|
||||
li {
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
|
||||
&:first-child {
|
||||
font-weight: bold;
|
||||
|
||||
a {
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
-webkit-box-flex: 0;
|
||||
flex: none;
|
||||
|
||||
&:last-child {
|
||||
a {
|
||||
|
@ -238,14 +242,13 @@
|
|||
-webkit-transition: $global-transition;
|
||||
transition: $global-transition;
|
||||
-webkit-transform: scaleX(0) translate3d(0, 0 , 0);
|
||||
-ms-transform: scaleX(0) translate3d(0, 0 , 0);
|
||||
transform: scaleX(0) translate3d(0, 0 , 0); /* hide*/
|
||||
}
|
||||
|
||||
&:hover:before {
|
||||
-webkit-transform: scaleX(1);
|
||||
-ms-transform: scaleX(1);
|
||||
transform: scaleX(1); /* reveal*/
|
||||
-ms-transform: scaleX(1);
|
||||
transform: scaleX(1); /* reveal*/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -259,7 +262,11 @@
|
|||
border: 1px solid $border-color;
|
||||
border-radius: $border-radius;
|
||||
background: #fff;
|
||||
box-shadow: 0 0 10px rgba(#000, 0.25);
|
||||
box-shadow: 0 2px 4px 0 rgba(#000, 0.16), 0 2px 10px 0 rgba(#000, 0.12);
|
||||
|
||||
&.hidden {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a {
|
||||
margin: 0;
|
||||
|
@ -348,11 +355,14 @@
|
|||
height: 0.125em;
|
||||
line-height: 1;
|
||||
background-color: $gray;
|
||||
-webkit-transition: 0.2s ease-out;
|
||||
transition: 0.2s ease-out;
|
||||
}
|
||||
|
||||
&:after {
|
||||
transform: rotate(90deg);
|
||||
-webkit-transform: rotate(90deg);
|
||||
-ms-transform: rotate(90deg);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
&:hover {
|
||||
|
@ -378,13 +388,17 @@
|
|||
}
|
||||
}
|
||||
|
||||
// on hover show expand
|
||||
/* on hover show expand*/
|
||||
label:hover:after {
|
||||
transform: rotate(90deg);
|
||||
-webkit-transform: rotate(90deg);
|
||||
-ms-transform: rotate(90deg);
|
||||
transform: rotate(90deg);
|
||||
}
|
||||
|
||||
input:checked + label:hover:after {
|
||||
transform: rotate(0);
|
||||
-webkit-transform: rotate(0);
|
||||
-ms-transform: rotate(0);
|
||||
transform: rotate(0);
|
||||
}
|
||||
|
||||
ul {
|
||||
|
@ -438,8 +452,8 @@
|
|||
-webkit-transition: 0.3s ease-in-out;
|
||||
transition: 0.3s ease-in-out;
|
||||
-webkit-transform: translate(0, 10%);
|
||||
-ms-transform: translate(0, 10%);
|
||||
transform: translate(0, 10%);
|
||||
-ms-transform: translate(0, 10%);
|
||||
transform: translate(0, 10%);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -447,13 +461,13 @@
|
|||
.nav__list input:checked ~ .nav__items {
|
||||
-webkit-transition: 0.5s ease-in-out;
|
||||
transition: 0.5s ease-in-out;
|
||||
max-height: 9999px; // exaggerate max-height to accommodate tall lists
|
||||
max-height: 9999px; /* exaggerate max-height to accommodate tall lists*/
|
||||
overflow: visible;
|
||||
opacity: 1;
|
||||
margin-top: 1em;
|
||||
-webkit-transform: translate(0, 0);
|
||||
-ms-transform: translate(0, 0);
|
||||
transform: translate(0, 0);
|
||||
-ms-transform: translate(0, 0);
|
||||
transform: translate(0, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -8,8 +8,10 @@
|
|||
margin-top: 2em;
|
||||
padding-left: 1em;
|
||||
padding-right: 1em;
|
||||
animation: intro 0.3s both;
|
||||
animation-delay: 0.35s;
|
||||
-webkit-animation: intro 0.3s both;
|
||||
animation: intro 0.3s both;
|
||||
-webkit-animation-delay: 0.35s;
|
||||
animation-delay: 0.35s;
|
||||
|
||||
@include breakpoint($x-large) {
|
||||
max-width: $x-large;
|
||||
|
@ -111,8 +113,10 @@
|
|||
position: relative;
|
||||
margin-bottom: 2em;
|
||||
@include clearfix;
|
||||
animation: intro 0.3s both;
|
||||
animation-delay: 0.25s;
|
||||
-webkit-animation: intro 0.3s both;
|
||||
animation: intro 0.3s both;
|
||||
-webkit-animation-delay: 0.25s;
|
||||
animation-delay: 0.25s;
|
||||
|
||||
&--overlay {
|
||||
position: relative;
|
||||
|
@ -122,8 +126,10 @@
|
|||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
animation: intro 0.3s both;
|
||||
animation-delay: 0.25s;
|
||||
-webkit-animation: intro 0.3s both;
|
||||
animation: intro 0.3s both;
|
||||
-webkit-animation-delay: 0.25s;
|
||||
animation-delay: 0.25s;
|
||||
|
||||
a {
|
||||
color: #fff;
|
||||
|
@ -297,6 +303,7 @@
|
|||
.page__comments-form {
|
||||
padding: 1em;
|
||||
background: $lighter-gray;
|
||||
-webkit-transition: $global-transition;
|
||||
transition: $global-transition;
|
||||
|
||||
&.disabled {
|
||||
|
|
|
@ -163,7 +163,7 @@
|
|||
border-radius: $border-radius;
|
||||
background: #fff;
|
||||
z-index: -1;
|
||||
box-shadow: 0 0 10px rgba(#000, 0.25);
|
||||
box-shadow: 0 2px 4px 0 rgba(#000, 0.16), 0 2px 10px 0 rgba(#000, 0.12);
|
||||
cursor: default;
|
||||
|
||||
@include breakpoint($large) {
|
||||
|
|
|
@ -46,7 +46,7 @@ figure.highlight {
|
|||
padding: 5px;
|
||||
border: 0;
|
||||
|
||||
// line numbers
|
||||
/* line numbers*/
|
||||
&.gutter {
|
||||
padding-right: 1em;
|
||||
color: $light-gray;
|
||||
|
|
|
@ -123,6 +123,6 @@ $right-sidebar-width-wide : 400px !default;
|
|||
|
||||
$border-radius : 4px !default;
|
||||
$box-shadow : 0 1px 1px rgba(0, 0, 0, 0.125) !default;
|
||||
$navicon-width : 28px !default;
|
||||
$navicon-height : 4px !default;
|
||||
$navicon-width : 1.5rem !default;
|
||||
$navicon-height : 0.25rem !default;
|
||||
$global-transition : all 0.2s ease-in-out !default;
|
|
@ -1,13 +1,10 @@
|
|||
---
|
||||
---
|
||||
|
||||
/*
|
||||
* Minimal Mistakes Jekyll Theme
|
||||
*
|
||||
* - Michael Rose
|
||||
* - mademistakes.com
|
||||
* - https://twitter.com/mmistakes
|
||||
*
|
||||
/*!
|
||||
* Minimal Mistakes Jekyll Theme 4.2.2 by Michael Rose
|
||||
* Copyright 2017 Michael Rose - mademistakes.com | @mmistakes
|
||||
* Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt)
|
||||
*/
|
||||
|
||||
/*
|
||||
|
|
8
docs/assets/js/main.min.js
vendored
8
docs/assets/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,72 +1,74 @@
|
|||
/*
|
||||
* Greedy Navigation
|
||||
*
|
||||
* http://codepen.io/lukejacksonn/pen/PwmwWV
|
||||
*
|
||||
GreedyNav.js - https://github.com/lukejacksonn/GreedyNav
|
||||
Licensed under the MIT license - http://opensource.org/licenses/MIT
|
||||
Copyright (c) 2015 Luke Jackson
|
||||
*/
|
||||
|
||||
var $nav = $('#site-nav');
|
||||
var $btn = $('#site-nav button');
|
||||
var $vlinks = $('#site-nav .visible-links');
|
||||
var $hlinks = $('#site-nav .hidden-links');
|
||||
$(document).ready(function(){
|
||||
|
||||
var breaks = [];
|
||||
var $btn = $('nav.greedy-nav button');
|
||||
var $vlinks = $('nav.greedy-nav .visible-links');
|
||||
var $hlinks = $('nav.greedy-nav .hidden-links');
|
||||
|
||||
function updateNav() {
|
||||
var numOfItems = 0;
|
||||
var totalSpace = 0;
|
||||
var closingTime = 1000;
|
||||
var breakWidths = [];
|
||||
|
||||
var availableSpace = $btn.hasClass('hidden') ? $nav.width() : $nav.width() - $btn.width() - 30;
|
||||
// Get initial state
|
||||
$vlinks.children().outerWidth(function(i, w) {
|
||||
totalSpace += w;
|
||||
numOfItems += 1;
|
||||
breakWidths.push(totalSpace);
|
||||
});
|
||||
|
||||
// The visible list is overflowing the nav
|
||||
if($vlinks.width() > availableSpace) {
|
||||
var availableSpace, numOfVisibleItems, requiredSpace, timer;
|
||||
|
||||
// Record the width of the list
|
||||
breaks.push($vlinks.width());
|
||||
function check() {
|
||||
|
||||
// Move item to the hidden list
|
||||
$vlinks.children().last().prependTo($hlinks);
|
||||
// Get instant state
|
||||
availableSpace = $vlinks.width() - 10;
|
||||
numOfVisibleItems = $vlinks.children().length;
|
||||
requiredSpace = breakWidths[numOfVisibleItems - 1];
|
||||
|
||||
// Show the dropdown btn
|
||||
if($btn.hasClass('hidden')) {
|
||||
$btn.removeClass('hidden');
|
||||
}
|
||||
|
||||
// The visible list is not overflowing
|
||||
} else {
|
||||
|
||||
// There is space for another item in the nav
|
||||
if(availableSpace > breaks[breaks.length-1]) {
|
||||
|
||||
// Move the item to the visible list
|
||||
// There is not enough space
|
||||
if (requiredSpace > availableSpace) {
|
||||
$vlinks.children().last().prependTo($hlinks);
|
||||
numOfVisibleItems -= 1;
|
||||
check();
|
||||
// There is more than enough space
|
||||
} else if (availableSpace > breakWidths[numOfVisibleItems]) {
|
||||
$hlinks.children().first().appendTo($vlinks);
|
||||
breaks.pop();
|
||||
numOfVisibleItems += 1;
|
||||
check();
|
||||
}
|
||||
|
||||
// Hide the dropdown btn if hidden list is empty
|
||||
if(breaks.length < 1) {
|
||||
// Update the button accordingly
|
||||
$btn.attr("count", numOfItems - numOfVisibleItems);
|
||||
if (numOfVisibleItems === numOfItems) {
|
||||
$btn.addClass('hidden');
|
||||
} else $btn.removeClass('hidden');
|
||||
}
|
||||
|
||||
// Window listeners
|
||||
$(window).resize(function() {
|
||||
check();
|
||||
});
|
||||
|
||||
$btn.on('click', function() {
|
||||
$hlinks.toggleClass('hidden');
|
||||
clearTimeout(timer);
|
||||
});
|
||||
|
||||
$hlinks.on('mouseleave', function() {
|
||||
// Mouse has left, start the timer
|
||||
timer = setTimeout(function() {
|
||||
$hlinks.addClass('hidden');
|
||||
}
|
||||
}
|
||||
}, closingTime);
|
||||
}).on('mouseenter', function() {
|
||||
// Mouse is back, cancel the timer
|
||||
clearTimeout(timer);
|
||||
})
|
||||
|
||||
// Keep counter updated
|
||||
$btn.attr("count", breaks.length);
|
||||
check();
|
||||
|
||||
// Recur if the visible list is still overflowing the nav
|
||||
if($vlinks.width() > availableSpace) {
|
||||
updateNav();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Window listeners
|
||||
|
||||
$(window).resize(function() {
|
||||
updateNav();
|
||||
});
|
||||
|
||||
$btn.on('click', function() {
|
||||
$hlinks.toggleClass('hidden');
|
||||
$(this).toggleClass('close');
|
||||
});
|
||||
|
||||
updateNav();
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
Gem::Specification.new do |spec|
|
||||
spec.name = "minimal-mistakes-jekyll"
|
||||
spec.version = "4.2.1"
|
||||
spec.version = "4.2.2"
|
||||
spec.authors = ["Michael Rose"]
|
||||
|
||||
spec.summary = %q{A flexible two-column Jekyll theme.}
|
||||
|
@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
|
|||
spec.add_runtime_dependency "jekyll-paginate", "~> 1.1"
|
||||
spec.add_runtime_dependency "jekyll-sitemap", "~> 1.0"
|
||||
spec.add_runtime_dependency "jekyll-gist", "~> 1.4"
|
||||
spec.add_runtime_dependency "jekyll-feed", "~> 0.8"
|
||||
spec.add_runtime_dependency "jemoji", "~> 0.7"
|
||||
spec.add_runtime_dependency "jekyll-feed", "~> 0.9.1"
|
||||
spec.add_runtime_dependency "jemoji", "~> 0.8"
|
||||
|
||||
spec.add_development_dependency "bundler", "~> 1.12"
|
||||
spec.add_development_dependency "rake", "~> 10.0"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "minimal-mistakes",
|
||||
"version": "4.2.1",
|
||||
"version": "4.2.2",
|
||||
"description": "Minimal Mistakes Jekyll theme npm build scripts",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
Loading…
Reference in a new issue