N-archive/hacks-guide-minimal-mistakes-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'release/3.3.3'

Browse source
This commit is contained in:
Michael Rose 2016-07-20 16:10:30 -04:00
commit e122808ad6
9 changed files with 55 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CHANGELOG.md
View file

@ -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) ## [3.3.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.2)
### Bug Fixes ### Bug Fixes

6
_includes/gallery
View file

@ -6,11 +6,9 @@
{% assign gallery = page.gallery %} {% assign gallery = page.gallery %}
{% endif %} {% endif %}
{% capture gallery_size %}{{ gallery | size }}{% endcapture %} {% if gallery.size == 2 %}
{% if gallery_size == '2' %}
{% assign gallery_layout = 'half' %} {% assign gallery_layout = 'half' %}
{% elsif gallery_size >= '3' %} {% elsif gallery.size >= 3 %}
{% assign gallery_layout = 'third' %} {% assign gallery_layout = 'third' %}
{% else %} {% else %}
{% assign gallery_layout = '' %} {% assign gallery_layout = '' %}

2
_layouts/default.html
View file

@ -5,7 +5,7 @@ layout: compress
{% include base_path %} {% include base_path %}
<!doctype html> <!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> <head>
{% include head.html %} {% include head.html %}
{% include head/custom.html %} {% include head/custom.html %}

6
assets/_scss/_base.scss
View file

@ -2,6 +2,12 @@
BASE ELEMENTS BASE ELEMENTS
========================================================================== */ ========================================================================== */
html {
/* sticky footer fix */
position: relative;
min-height: 100%;
}
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;

7
assets/_scss/_footer.scss
View file

@ -5,6 +5,13 @@
.page__footer { .page__footer {
@include full(); @include full();
@include clearfix; @include clearfix;
/* sticky footer fix start */
position: absolute;
bottom: 0;
width: 100%;
clear: both;
height: auto;
/* sticky footer fix end */
margin-top: 3em; margin-top: 3em;
color: mix(#fff, $gray, 25%); color: mix(#fff, $gray, 25%);
animation: intro 0.3s both; animation: intro 0.3s both;

2
assets/css/main.css
View file

File diff suppressed because one or more lines are too long

18
assets/js/_main.js
View file

@ -4,6 +4,24 @@
$(document).ready(function(){ $(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 // FitVids init
$("#main").fitVids(); $("#main").fitVids();

10
assets/js/main.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "minimal-mistakes", "name": "minimal-mistakes",
"version": "3.3.2", "version": "3.3.3",
"description": "Minimal Mistakes Jekyll theme npm build scripts", "description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": { "repository": {
"type": "git", "type": "git",