Skip to content

Commit 15f4ac9

Browse files
committed
Merge branch 'hotfix/3.2.1'
2 parents 02f0e8c + 68b02cd commit 15f4ac9

File tree

5 files changed

+54
-8
lines changed

5 files changed

+54
-8
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<!--
2+
Before submitting please search open and closed issues at
3+
https://github.com/mmistakes/minimal-mistakes/issues to avoid duplication.
4+
5+
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.
6+
-->
7+
8+
- [ ] This is a question about using the theme.
9+
- [ ] I believe this to be a bug with the theme --- not Jekyll, GitHub Pages or one of the bundled plugins.
10+
- [ ] This is a feature request.
11+
- [ ] I have updated all gems with `bundle update`.
12+
- [ ] I have tested locally with `bundle exec jekyll build`.
13+
14+
---
15+
16+
## Environment informations
17+
18+
<!--
19+
Please include theme version, `github-pages --version`, and the operating system you are on or tested with.
20+
-->
21+
22+
- **Minimal Mistakes version:**
23+
- **`github-pages` or `jekyll` gem version:**
24+
- **Operating system:**
25+
26+
27+
---
28+
29+
## Expected behavior
30+
31+
<!--
32+
Describe the intended output or what you expected to see.
33+
-->
34+
35+
## Steps to reproduce the behavior
36+
37+
<!--
38+
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.
39+
40+
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.
41+
42+
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.
43+
44+
Screenshots can also be included if they help illustrate a behavior.
45+
-->

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
### Bug Fixes
8787
- Fixed Bitbucket URL typo in author sidebar.
8888

89-
>>>>>>> release/3.1.0
9089
## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3)
9190

9291
### Enhancements

Gemfile.lock

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,15 @@ GEM
117117
ethon (>= 0.8.0)
118118
tzinfo (1.2.2)
119119
thread_safe (~> 0.1)
120+
wdm (0.1.1)
120121

121122
PLATFORMS
122123
ruby
123124
x64-mingw32
124125

125126
DEPENDENCIES
126127
github-pages
128+
wdm (~> 0.1.0)
127129

128130
BUNDLED WITH
129-
1.11.2
131+
1.12.5

assets/_scss/_navigation.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,17 +227,17 @@
227227
&:before {
228228
content: "";
229229
position: absolute;
230+
left: 0;
230231
bottom: 0;
231232
height: 4px;
232233
background: mix(#fff, $primary-color, 50%);
233-
width: 0;
234+
width: 100%;
234235
transition: $global-transition;
236+
transform: scaleX(0); // hide
235237
}
236238

237-
&:hover {
238-
&:before {
239-
width: 100%;
240-
}
239+
&:hover:before {
240+
transform: scaleX(1); // reveal
241241
}
242242
}
243243
}

assets/css/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)