Compare commits

...
18 Commits
Author SHA1 Message Date
Michael Rose 3812f708fa Merge branch 'release/3.1.8' 2016-05-16 09:57:04 -04:00
Michael Rose 8e5d47d82f Update CHANGELOG 2016-05-16 09:56:47 -04:00
Michael Rose 86d08455e8 Remove duplicate fa-twitter and fa-twitter-square classes from _utilities.scss
- Fixes #302
2016-05-16 09:48:16 -04:00
Michael Rose 55efbd1782 Make page.title conditional in <h1>
- Fix #312
2016-05-16 09:42:16 -04:00
Michael Rose 6a3d24dac9 Merge branch 'release/3.1.7' into develop 2016-05-13 10:43:07 -04:00
Michael Rose d285f9d7bd Merge branch 'release/3.1.7' 2016-05-13 10:43:03 -04:00
Michael Rose 22a232365a Update CHANGELOG 2016-05-13 10:42:47 -04:00
Michael Rose c1a37c72c9 Merge branch 'feature/translate-recent-posts-title' into develop 2016-05-13 10:40:01 -04:00
Michael Rose ab2f7043b1 Merge branch 'master' of https://github.com/flohw/minimal-mistakes into feature/translate-recent-posts-title 2016-05-13 10:38:29 -04:00
Michael Rose 500ed4453f Merge branch 'feature/underline-fix' into develop 2016-05-13 10:37:41 -04:00
Michael Rose cfc32ac5e5 Merge branch 'fix-ws' of https://github.com/tobie/minimal-mistakes into feature/underline-fix 2016-05-13 10:33:47 -04:00
Flohw ee25653da2 Translate index page title 2016-05-13 07:24:06 +02:00
Michael Rose d80c24629f Merge branch 'release/3.1.6' into develop 2016-05-10 08:27:04 -04:00
Michael Rose aceb6cdd7f Merge branch 'release/3.1.6' 2016-05-10 08:27:01 -04:00
Michael Rose 5385a84205 Bump version to 3.1.6 2016-05-10 08:26:45 -04:00
Michael Rose 188e0e8911 Update dependencies 2016-05-10 08:24:26 -04:00
Tobie Langel 9582a1b117 Fix whitespace issue using CSS. 2016-05-05 23:43:04 +02:00
Michael Rose efb4d14248 Merge branch 'release/3.1.5' into develop 2016-05-02 11:55:00 -04:00
7 changed files with 48 additions and 31 deletions
+28
View File
@@ -1,3 +1,31 @@
## [3.1.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.8)
### Bug Fixes
- Fix `Liquid Exception: undefined method 'gsub' for nil:NilClass in _layouts/single.html` error when `page.title` is null. `<h1>` element is now conditional if `title: ` is not set for a `page` or collection item. [#312](https://github.com/mmistakes/minimal-mistakes/issues/312)
### Maintenance
- Remove duplicate `fa-twitter` and `fa-twitter-square` classes from `_utilities.scss`. [#302](https://github.com/mmistakes/minimal-mistakes/issues/302)
- Document installing additional Jekyll gem dependencies when using `gem "jekyll"` instead of `gem "github-pages"` to avoid any errors on run. [#305](https://github.com/mmistakes/minimal-mistakes/issues/305)
## [3.1.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.7)
### Enhancement
- Add translation key for "Recent Posts" used in home page `index.html`. [#316](https://github.com/mmistakes/minimal-mistakes/pull/316)
### Maintenance
- Small fix to avoid underlying the whitespace between icons and related text when hovering. [#303](https://github.com/mmistakes/minimal-mistakes/pull/303)
## [3.1.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.6)
### Maintenance
- Update gem dependencies. Run `bundle` to update `Gemfile.lock`.
## [3.1.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.5)
### Maintenance
+13 -21
View File
@@ -1,7 +1,6 @@
GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
@@ -14,7 +13,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colorator (0.1)
ethon (0.8.1)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.6.0)
faraday (0.9.2)
@@ -22,27 +21,24 @@ GEM
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
gemoji (2.1.0)
github-pages (69)
RedCloth (= 4.2.9)
github-pages (78)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.3)
jekyll (= 3.0.5)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.4.0)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 1.11.0)
jekyll-github-metadata (= 1.11.1)
jekyll-mentions (= 1.1.2)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.10.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.3.3)
jekyll-seo-tag (= 1.4.0)
jekyll-sitemap (= 0.10.0)
jekyll-textile-converter (= 0.1.0)
jemoji (= 0.6.2)
kramdown (= 1.10.0)
liquid (= 3.0.6)
listen (= 3.0.6)
mercenary (~> 0.3)
rdiscount (= 2.1.8)
redcarpet (= 3.3.3)
rouge (= 1.10.1)
terminal-table (~> 1.4)
github-pages-health-check (1.1.0)
@@ -55,7 +51,7 @@ GEM
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.3)
jekyll (3.0.5)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
@@ -66,10 +62,10 @@ GEM
safe_yaml (~> 1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-feed (0.4.0)
jekyll-feed (0.5.1)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-github-metadata (1.11.0)
jekyll-github-metadata (1.11.1)
octokit (~> 4.0)
jekyll-mentions (1.1.2)
html-pipeline (~> 2.3)
@@ -79,13 +75,11 @@ GEM
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.3.3)
jekyll-seo-tag (1.4.0)
jekyll (~> 3.0)
jekyll-sitemap (0.10.0)
jekyll-textile-converter (0.1.0)
RedCloth (~> 4.0)
jekyll-watch (1.3.1)
listen (~> 3.0)
jekyll-watch (1.4.0)
listen (~> 3.0, < 3.1)
jemoji (0.6.2)
gemoji (~> 2.0)
html-pipeline (~> 2.2)
@@ -111,8 +105,6 @@ GEM
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rdiscount (2.1.8)
redcarpet (3.3.3)
rouge (1.10.1)
safe_yaml (1.0.4)
sass (3.4.22)
+2 -1
View File
@@ -26,10 +26,11 @@ en: &DEFAULT_EN
powered_by : "Powered by"
website_label : "Website"
email_label : "Email"
recent_posts : "Recent Posts"
en-US:
<<: *DEFAULT_EN
en-UK:
<<: *DEFAULT_EN
# Another locale
# --------------
# --------------
+1 -1
View File
@@ -26,7 +26,7 @@ layout: default
<div class="page__inner-wrap">
{% unless page.header.overlay_color or page.header.overlay_image %}
<header>
<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>
{% if page.title %}<h1 class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
{% if page.read_time %}
<p class="page__meta"><i class="fa fa-clock-o" aria-hidden="true"></i> {% include read-time.html %}</p>
{% endif %}
+1 -5
View File
@@ -184,6 +184,7 @@ body:hover .visually-hidden button {
.social-icons {
.fa {
color: #000;
display: initial;
}
.fa-behance,
@@ -200,11 +201,6 @@ body:hover .visually-hidden button {
color: $facebook-color;
}
.fa-twitter,
.fa-twitter-square {
color: $twitter-color;
}
.fa-flickr {
color: $flickr-color;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -5,10 +5,10 @@ author_profile: true
{% include base_path %}
<h3 class="archive__subtitle">Recent Posts</h3>
<h3 class="archive__subtitle">{{ site.data.ui-text[site.locale].recent_posts }}</h3>
{% for post in paginator.posts %}
{% include archive-single.html %}
{% endfor %}
{% include paginator.html %}
{% include paginator.html %}