Merge branch 'hotfix/3.2.1'

This commit is contained in:
Michael Rose 2016-05-31 12:32:04 -04:00
commit 15f4ac9641
5 changed files with 54 additions and 8 deletions

45
.github/ISSUE_TEMPLATE.md vendored Normal file
View file

@ -0,0 +1,45 @@
<!--
Before submitting please search open and closed issues at
https://github.com/mmistakes/minimal-mistakes/issues to avoid duplication.
Feel free to use the following as a template and remove or add fields as you see fit. You can convert `[ ]` into `[x]` to check boxes.
-->
- [ ] This is a question about using the theme.
- [ ] I believe this to be a bug with the theme --- not Jekyll, GitHub Pages or one of the bundled plugins.
- [ ] This is a feature request.
- [ ] I have updated all gems with `bundle update`.
- [ ] I have tested locally with `bundle exec jekyll build`.
---
## Environment informations
<!--
Please include theme version, `github-pages --version`, and the operating system you are on or tested with.
-->
- **Minimal Mistakes version:**
- **`github-pages` or `jekyll` gem version:**
- **Operating system:**
---
## Expected behavior
<!--
Describe the intended output or what you expected to see.
-->
## Steps to reproduce the behavior
<!--
Include a link to a public repository or ZIP file so that they can more easily be reproduced. Being able to see your actual files helps troubleshooting as most issues stem from missing YAML Front Matter, a mis-configured `_config.sys` file, or `_posts` content.
Describe the steps you took for this problem to exist. Such as you cloned the theme, customized `_config.yml`, added your own posts, and started up a Jekyll server locally.
If an error occurred on GitHub Pages when pushing, please build locally and provide a complete log by running `bundle exec jekyll --trace --verbose` and including this output in the filed issue.
Screenshots can also be included if they help illustrate a behavior.
-->

View file

@ -86,7 +86,6 @@
### Bug Fixes ### Bug Fixes
- Fixed Bitbucket URL typo in author sidebar. - Fixed Bitbucket URL typo in author sidebar.
>>>>>>> release/3.1.0
## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3) ## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3)
### Enhancements ### Enhancements

View file

@ -117,6 +117,7 @@ GEM
ethon (>= 0.8.0) ethon (>= 0.8.0)
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
wdm (0.1.1)
PLATFORMS PLATFORMS
ruby ruby
@ -124,6 +125,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
github-pages github-pages
wdm (~> 0.1.0)
BUNDLED WITH BUNDLED WITH
1.11.2 1.12.5

View file

@ -227,17 +227,17 @@
&:before { &:before {
content: ""; content: "";
position: absolute; position: absolute;
left: 0;
bottom: 0; bottom: 0;
height: 4px; height: 4px;
background: mix(#fff, $primary-color, 50%); background: mix(#fff, $primary-color, 50%);
width: 0; width: 100%;
transition: $global-transition; transition: $global-transition;
transform: scaleX(0); // hide
} }
&:hover { &:hover:before {
&:before { transform: scaleX(1); // reveal
width: 100%;
}
} }
} }
} }

File diff suppressed because one or more lines are too long