Merge branch 'release/3.3.3'
This commit is contained in:
commit
e122808ad6
9 changed files with 55 additions and 12 deletions
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -1,3 +1,17 @@
|
|||
## [3.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.3)
|
||||
|
||||
### Enhancements
|
||||
|
||||
- Make footer stick to the bottom of the page.
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- Fix `gallery` size bug [#402](https://github.com/mmistakes/minimal-mistakes/issues/402)
|
||||
|
||||
### Maintenance
|
||||
|
||||
- Set default `lang` to `en`.
|
||||
|
||||
## [3.3.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.2)
|
||||
|
||||
### Bug Fixes
|
||||
|
|
|
@ -6,11 +6,9 @@
|
|||
{% assign gallery = page.gallery %}
|
||||
{% endif %}
|
||||
|
||||
{% capture gallery_size %}{{ gallery | size }}{% endcapture %}
|
||||
|
||||
{% if gallery_size == '2' %}
|
||||
{% if gallery.size == 2 %}
|
||||
{% assign gallery_layout = 'half' %}
|
||||
{% elsif gallery_size >= '3' %}
|
||||
{% elsif gallery.size >= 3 %}
|
||||
{% assign gallery_layout = 'third' %}
|
||||
{% else %}
|
||||
{% assign gallery_layout = '' %}
|
||||
|
|
|
@ -5,7 +5,7 @@ layout: compress
|
|||
{% include base_path %}
|
||||
|
||||
<!doctype html>
|
||||
<html lang="{{ site.locale | slice: 0,2 }}" class="no-js">
|
||||
<html lang="{{ site.locale | slice: 0,2 | default: "en" }}" class="no-js">
|
||||
<head>
|
||||
{% include head.html %}
|
||||
{% include head/custom.html %}
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
BASE ELEMENTS
|
||||
========================================================================== */
|
||||
|
||||
html {
|
||||
/* sticky footer fix */
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
|
|
@ -5,6 +5,13 @@
|
|||
.page__footer {
|
||||
@include full();
|
||||
@include clearfix;
|
||||
/* sticky footer fix start */
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
clear: both;
|
||||
height: auto;
|
||||
/* sticky footer fix end */
|
||||
margin-top: 3em;
|
||||
color: mix(#fff, $gray, 25%);
|
||||
animation: intro 0.3s both;
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -4,6 +4,24 @@
|
|||
|
||||
$(document).ready(function(){
|
||||
|
||||
// Sticky footer
|
||||
var bumpIt = function() {
|
||||
$('body').css('margin-bottom', $('.page__footer').outerHeight(true));
|
||||
},
|
||||
didResize = false;
|
||||
|
||||
bumpIt();
|
||||
|
||||
$(window).resize(function() {
|
||||
didResize = true;
|
||||
});
|
||||
setInterval(function() {
|
||||
if(didResize) {
|
||||
didResize = false;
|
||||
bumpIt();
|
||||
}
|
||||
}, 250);
|
||||
|
||||
// FitVids init
|
||||
$("#main").fitVids();
|
||||
|
||||
|
|
10
assets/js/main.min.js
vendored
10
assets/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "minimal-mistakes",
|
||||
"version": "3.3.2",
|
||||
"version": "3.3.3",
|
||||
"description": "Minimal Mistakes Jekyll theme npm build scripts",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
|
Loading…
Reference in a new issue