Skip to content

Commit

Permalink
Merge branch 'hotfix/3.2.1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
mmistakes committed May 31, 2016
2 parents 87baf36 + 68b02cd commit 952f7b5
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 8 deletions.
45 changes: 45 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -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.
-->
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@
### Bug Fixes
- 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)

### Enhancements
Expand Down
4 changes: 3 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@ GEM
ethon (>= 0.8.0)
tzinfo (1.2.2)
thread_safe (~> 0.1)
wdm (0.1.1)

PLATFORMS
ruby
x64-mingw32

DEPENDENCIES
github-pages
wdm (~> 0.1.0)

BUNDLED WITH
1.11.2
1.12.5
10 changes: 5 additions & 5 deletions assets/_scss/_navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -227,17 +227,17 @@
&:before {
content: "";
position: absolute;
left: 0;
bottom: 0;
height: 4px;
background: mix(#fff, $primary-color, 50%);
width: 0;
width: 100%;
transition: $global-transition;
transform: scaleX(0); // hide
}

&:hover {
&:before {
width: 100%;
}
&:hover:before {
transform: scaleX(1); // reveal
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion assets/css/main.css

Large diffs are not rendered by default.

0 comments on commit 952f7b5

Please sign in to comment.