Compare commits

..
19 Commits
Author SHA1 Message Date
Michael Rose b7185c8155 Add support for gallery image captions in Magnific Popup overlays
- Apply optional `title` attribute to image anchors that trigger Magnific Popup overlays
- Close #334
2016-06-01 21:26:14 -04:00
Michael Rose 9fa7b23507 Update CHANGELOG 2016-05-31 12:37:41 -04:00
Michael Rose 952f7b500b Merge branch 'hotfix/3.2.1' into develop 2016-05-31 12:32:09 -04:00
Michael Rose 68b02cd8d8 Use CSS3 transform instead of change in width for masthead menu underline effect 2016-05-31 12:31:39 -04:00
Michael Rose 213e2fe3f3 Update gems 2016-05-31 12:22:57 -04:00
Michael Rose cec8d40bc1 Add issue template for GitHub 2016-05-31 11:57:10 -04:00
Michael Rose 63aa6104a8 Remove >>>>>> conflict text from CHANGELOG 2016-05-31 11:03:27 -04:00
Michael Rose 87baf36b3a Merge branch 'release/3.2.0' into develop 2016-05-29 21:16:16 -04:00
Michael Rose 02f0e8c6c4 Merge branch 'release/3.2.0' 2016-05-29 21:16:16 -04:00
Michael Rose 9a8eea6e14 Update CHANGELOG 2016-05-29 21:15:54 -04:00
Michael Rose f1a7470d3b Merge branch 'feature/update-dependencies' into develop 2016-05-29 21:13:09 -04:00
Michael Rose 45f3a7a8ee Rename tag/category archive variables to avoid possible conflicts with site.tags and site.categories
- Fixes #329
2016-05-29 21:12:24 -04:00
Michael Rose 21d15c9cf9 Update gems 2016-05-29 20:44:33 -04:00
Michael Rose 28f85dfc4d Merge branch 'release/3.1.8' into develop 2016-05-16 09:57:08 -04:00
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
12 changed files with 102 additions and 34 deletions
+45
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.
-->
+29 -2
View File
@@ -1,3 +1,31 @@
## [3.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.1)
### Bug Fixes
- Remove need for "double tapping" masthead menu links on iOS devices. [#315](https://github.com/mmistakes/minimal-mistakes/issues/315)
### Maintenance
- Add `ISSUE_TEMPLATE.md` for improve issue submission process.
## [3.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.0)
### Bug Fixes
- Fix missing category/tag links in post footer due to possible conflict with `site.tags` and `site.categories`. [#329](https://github.com/mmistakes/minimal-mistakes/issues/329#issuecomment-222375568)
## [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
@@ -6,7 +34,7 @@
### Maintenance
- Small fix to avoid underlying the whitespace between icons and related text when hovering.[#303](https://github.com/mmistakes/minimal-mistakes/pull/303)
- 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)
@@ -68,7 +96,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
+7 -7
View File
@@ -15,15 +15,15 @@ GEM
colorator (0.1)
ethon (0.9.0)
ffi (>= 1.3.0)
execjs (2.6.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
gemoji (2.1.0)
github-pages (78)
github-pages (80)
github-pages-health-check (= 1.1.0)
jekyll (= 3.0.5)
jekyll (= 3.1.6)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
@@ -47,11 +47,11 @@ GEM
octokit (~> 4.0)
public_suffix (~> 1.4)
typhoeus (~> 0.7)
html-pipeline (2.4.0)
html-pipeline (2.4.1)
activesupport (>= 2, < 5)
nokogiri (>= 1.4)
i18n (0.7.0)
jekyll (3.0.5)
jekyll (3.1.6)
colorator (~> 0.1)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
@@ -92,7 +92,7 @@ GEM
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.0.0)
minitest (5.8.4)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
@@ -128,4 +128,4 @@ DEPENDENCIES
wdm (~> 0.1.0)
BUNDLED WITH
1.11.2
1.12.5
+2 -2
View File
@@ -179,10 +179,10 @@ whitelist:
# - <base_path>/tags/my-awesome-tag/index.html ~> path: /tags/
# - <base_path/categories/my-awesome-category/index.html ~> path: /categories/
# - <base_path/my-awesome-category/index.html ~> path: /
categories:
category_archive:
type: liquid
path: /categories/
tags:
tag_archive:
type: liquid
path: /tags/
# https://github.com/jekyll/jekyll-archives
+3 -3
View File
@@ -2,14 +2,14 @@
{% include base_path %}
{% case site.categories.type %}
{% case site.category_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
{% if site.categories.path %}
{% if site.category_archive.path %}
{% comment %}
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@@ -23,7 +23,7 @@
{% for hash in category_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.categories.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
<a href="{{ base_path }}{{ category_word | slugify | prepend: path_type | prepend: site.category_archive.path }}" class="page__taxonomy-item" rel="tag">{{ category_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %}
</span>
</p>
+3 -2
View File
@@ -25,6 +25,7 @@
{% else %}
"{{ img.url | prepend: "/images/" | prepend: base_path }}"
{% endif %}
{% if img.title %}title="{{ img.title }}"{% endif %}
>
<img src=
{% if img.image_path contains "http" %}
@@ -32,7 +33,7 @@
{% else %}
"{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
</a>
{% else %}
<img src=
@@ -41,7 +42,7 @@
{% else %}
"{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
{% endif %}
{% endfor %}
{% if include.caption %}
+2 -2
View File
@@ -1,9 +1,9 @@
{% include base_path %}
{% if site.tags.type and page.tags[0] %}
{% if site.tag_archive.type and page.tags[0] %}
{% include tag-list.html %}
{% endif %}
{% if site.categories.type and page.categories[0] %}
{% if site.category_archive.type and page.categories[0] %}
{% include category-list.html %}
{% endif %}
+3 -3
View File
@@ -1,13 +1,13 @@
{% include base_path %}
{% case site.tags.type %}
{% case site.tag_archive.type %}
{% when "liquid" %}
{% assign path_type = "#" %}
{% when "jekyll-archives" %}
{% assign path_type = nil %}
{% endcase %}
{% if site.tags.path %}
{% if site.tag_archive.path %}
{% comment %}
<!-- Sort alphabetically regardless of case e.g. a B c d E -->
<!-- modified from http://www.codeofclimber.ru/2015/sorting-site-tags-in-jekyll/ -->
@@ -21,7 +21,7 @@
{% for hash in tag_hashes %}
{% assign keyValue = hash | split: '#' %}
{% capture tag_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %}
<a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tags.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
<a href="{{ base_path }}{{ tag_word | slugify | prepend: path_type | prepend: site.tag_archive.path }}" class="page__taxonomy-item" rel="tag">{{ tag_word }}</a>{% unless forloop.last %}<span class="sep">, </span>{% endunless %}
{% endfor %}
</span>
</p>
+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 %}
+5 -5
View File
@@ -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
}
}
}
-5
View File
@@ -201,11 +201,6 @@ body:hover .visually-hidden button {
color: $facebook-color;
}
.fa-twitter,
.fa-twitter-square {
color: $twitter-color;
}
.fa-flickr {
color: $flickr-color;
}
+2 -2
View File
File diff suppressed because one or more lines are too long