Compare commits

..
34 Commits
Author SHA1 Message Date
Michael Rose 7b7bafe3a4 Merge branch 'release/3.1.5' 2016-05-02 11:54:55 -04:00
Michael Rose ed2b26461d Update CHANGELOG for 3.1.5 2016-05-02 11:54:34 -04:00
Michael Rose 95fc1b7259 Merge branch 'feature/fix-www-author-profile' into develop 2016-05-02 11:52:47 -04:00
Michael Rose 7b070cb3ae Merge branch 'Issue-292-fix-www-in-links-to-social-media' of https://github.com/wilsonmar/minimal-mistakes into feature/fix-www-author-profile 2016-05-02 11:51:57 -04:00
Michael Rose 0109c385d7 Merge branch 'release/3.1.4' into develop 2016-05-02 11:45:37 -04:00
Michael Rose 9bfa6bbb84 Merge branch 'release/3.1.4' 2016-05-02 11:45:32 -04:00
Michael Rose 2b77f7516c Update changelog 2016-05-02 11:45:01 -04:00
Michael Rose 557fbfb059 Merge branch 'feature/overlay-filter' into develop 2016-05-02 11:42:03 -04:00
Michael Rose b59de95b62 Merge branch 'tobie-hero-filter' of https://github.com/tobie/minimal-mistakes into feature/overlay-filter 2016-05-02 11:40:47 -04:00
Tobie Langel 1edfcea306 Style fixes 2016-05-02 14:25:26 +02:00
Tobie Langel f077ec4343 Add overlay_filter param to hero headers
The `overlay_filter` param lets you darken or otherwise filter the hero header picture to make the text content pop out more.

You can use it by specifying the opacity (between 0 and 1) of a black overlay like so:

```yaml
excerpt: "This post should display a **header with an overlay image**, if the theme supports it."
header:
  overlay_image: unsplash-image-1.jpg
  overlay_filter: 0.5 # same as adding an opacity of 0.5 to a black background
  caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
  cta_label: "More Info"
  cta_url: "https://unsplash.com"
```

Or if you want to do more fancy things, go full rgba: 

```yaml
excerpt: "This post should display a **header with an overlay image**, if the theme supports it."
header:
  overlay_image: unsplash-image-1.jpg
  overlay_filter: rgba(255, 0, 0, 0.5)
  caption: "Photo credit: [**Unsplash**](https://unsplash.com)"
  cta_label: "More Info"
  cta_url: "https://unsplash.com"
```
2016-05-02 13:59:31 +02:00
Wilson Mar cd795c44a2 Update author-profile.html for issue 292
This changes some http to https and add www.
All to avoid extra redirect that slows display.
Link to YouTube also added.
2016-04-28 09:28:51 -06:00
Wilson Mar c7c5d9888f Update author-profile.html 2016-04-28 09:21:28 -06:00
Michael Rose d584eb42d2 Merge branch 'release/3.1.3' into develop 2016-04-27 10:58:11 -04:00
Michael Rose b0e9c10ecb Merge branch 'release/3.1.3' 2016-04-27 10:58:08 -04:00
Michael Rose 0103da2e7d Update CHANGELOG notes to version 3.1.3 2016-04-27 10:57:47 -04:00
Michael Rose b33dc25323 Merge branch 'feature/artokai-patch-1' into develop 2016-04-27 10:44:09 -04:00
Michael Rose 767539927f Merge branch 'patch-1' of https://github.com/artokai/minimal-mistakes into feature/artokai-patch-1 2016-04-27 10:43:32 -04:00
Michael Rose b459af2120 Fix SEO author bug
- If `twitter.username` is set and `author.twitter` is nil bad things happen.
- Close #289
2016-04-27 10:19:00 -04:00
Michael Rose 5c8506088c Allow author_profile to be toggled in a _layout (eg. archive-taxonomy.html)
- Close #285
2016-04-27 10:15:42 -04:00
Michael Rose 0259611085 Remove white space as it was causing issues with Markdown and parsing as code blocks
- Close #279
2016-04-27 10:09:24 -04:00
Arto Kaitosaari d463b26a83 Fix "build:all" npm script
The script "build:all" was missing the "npm run" section for the "build:js" part.
2016-04-25 11:41:17 +03:00
Michael Rose 5bba54da0b Fix site.og_image URL by appending /images/ the path
- Close #277
2016-04-19 08:43:21 -04:00
Michael Rose 157dcbbec6 Update README 2016-04-18 16:40:02 -04:00
Michael Rose 2e67f66bdc Update README 2016-04-18 16:39:01 -04:00
Michael Rose 0c5996c904 Merge branch 'release/3.1.2' into develop 2016-04-18 16:33:26 -04:00
Michael Rose 7be5c973db Merge branch 'release/3.1.2' 2016-04-18 16:33:22 -04:00
Michael Rose 3e33585340 Update CHANGELOG 2016-04-18 16:33:03 -04:00
Michael Rose 3e0527fa78 Improve nav_list helper to be used with any type of navigation list defined in navigation.yml data file
- Close #272
2016-04-18 16:22:53 -04:00
Michael Rose 8cba6c6c41 Merge branch 'feature/related-posts-alignment' into develop 2016-04-18 16:18:28 -04:00
Michael Rose c3e28b3754 Decrease left/right page padding on small screens to give more space for content. 2016-04-18 16:18:12 -04:00
Michael Rose a8201afaae Fix related posts alignment
- Close #273
2016-04-18 16:16:38 -04:00
Michael Rose 0bf2d67635 Fix alignment of "Follow" button in author profile
- Close #274
2016-04-18 16:13:53 -04:00
Michael Rose 1325e666ef Merge branch 'hotfix/3.1.1' into develop 2016-04-16 21:51:20 -04:00
14 changed files with 128 additions and 77 deletions
+38
View File
@@ -1,3 +1,41 @@
## [3.1.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.5)
### Maintenance
- Fix `www` and `https` links in author profile include [#293](https://github.com/mmistakes/minimal-mistakes/pull/293)
## [3.1.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.4)
### Enhancements
- Add overlay_filter param to hero headers [#298](https://github.com/mmistakes/minimal-mistakes/pull/298)
## [3.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.3)
### Enhancements
- Improve `site.locale` documentation [#284](https://github.com/mmistakes/minimal-mistakes/issues/284)
- Remove ProTip note about protocol-less `site.url` as it is an anti-pattern [#288](https://github.com/mmistakes/minimal-mistakes/issues/288)
### Bug Fixes
- Fix `og_image` URL in seo.html [#277](https://github.com/mmistakes/minimal-mistakes/issues/277)
- Fix `author_profile` toggle when assigned in a `_layout` [#285](https://github.com/mmistakes/minimal-mistakes/issues/285)
- Fix typo in `build:all` npm script [#283](https://github.com/mmistakes/minimal-mistakes/pull/283)
- Fix URL typo documentation [#287](https://github.com/mmistakes/minimal-mistakes/issues/287)
- SEO author bug. If `twitter.username` is set and `author.twitter` is `nil` bad things happen. [#289](https://github.com/mmistakes/minimal-mistakes/issues/289)
## [3.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.2)
### Enhancement
- Explain how to use `nav_list` helper in [documentation](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#navigation-list).
- Reduce left/right padding on smaller screens to increase width of main content column.
### Bug Fixes
- Fix alignment issues with related posts [#273](https://github.com/mmistakes/minimal-mistakes/issues/273) and "Follow" button in author profile [#274](https://github.com/mmistakes/minimal-mistakes/issues/274).
## [3.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.1)
### Bug Fix
+1 -1
View File
@@ -15,7 +15,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
### Notable Features
- Compatible with GitHub Pages
- Compatible with Jekyll 3.x and GitHub Pages
- Several layout options (single, archive, splash pages)
- SEO optimized with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data
- Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more.
+20 -20
View File
@@ -35,64 +35,64 @@
<li><a href="https://keybase.io/{{ author.keybase }}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> Keybase</a></li>
{% endif %}
{% if author.twitter %}
<li><a href="http://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
<li><a href="https://twitter.com/{{ author.twitter }}"><i class="fa fa-fw fa-twitter-square" aria-hidden="true"></i> Twitter</a></li>
{% endif %}
{% if author.facebook %}
<li><a href="http://facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
<li><a href="https://www.facebook.com/{{ author.facebook }}"><i class="fa fa-fw fa-facebook-square" aria-hidden="true"></i> Facebook</a></li>
{% endif %}
{% if author.google_plus %}
<li><a href="http://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
<li><a href="https://plus.google.com/+{{ author.google_plus }}"><i class="fa fa-fw fa-google-plus-square" aria-hidden="true"></i> Google+</a></li>
{% endif %}
{% if author.linkedin %}
<li><a href="http://linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
<li><a href="https://www.linkedin.com/in/{{ author.linkedin }}"><i class="fa fa-fw fa-linkedin-square" aria-hidden="true"></i> LinkedIn</a></li>
{% endif %}
{% if author.xing %}
<li><a href="http://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
<li><a href="https://www.xing.com/profile/{{ author.xing }}"><i class="fa fa-fw fa-xing-square" aria-hidden="true"></i> XING</a></li>
{% endif %}
{% if author.instagram %}
<li><a href="http://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
<li><a href="https://instagram.com/{{ author.instagram }}"><i class="fa fa-fw fa-instagram" aria-hidden="true"></i> Instagram</a></li>
{% endif %}
{% if author.tumblr %}
<li><a href="http://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
<li><a href="https://{{ author.tumblr }}.tumblr.com"><i class="fa fa-fw fa-tumblr-square" aria-hidden="true"></i> Tumblr</a></li>
{% endif %}
{% if author.bitbucket %}
<li><a href="http://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
<li><a href="https://bitbucket.org/{{ author.bitbucket }}"><i class="fa fa-fw fa-bitbucket" aria-hidden="true"></i> Bitbucket</a></li>
{% endif %}
{% if author.github %}
<li><a href="http://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
<li><a href="https://github.com/{{ author.github }}"><i class="fa fa-fw fa-github" aria-hidden="true"></i> Github</a></li>
{% endif %}
{% if author.stackoverflow %}
<li><a href="http://stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
<li><a href="https://www.stackoverflow.com/users/{{ author.stackoverflow }}"><i class="fa fa-fw fa-stack-overflow" aria-hidden="true"></i> Stackoverflow</a></li>
{% endif %}
{% if author.lastfm %}
<li><a href="http://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
<li><a href="https://lastfm.com/user/{{ author.lastfm }}"><i class="fa fa-fw fa-lastfm-square" aria-hidden="true"></i> Last.fm</a></li>
{% endif %}
{% if author.dribbble %}
<li><a href="http://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
<li><a href="https://dribbble.com/{{ author.dribbble }}"><i class="fa fa-fw fa-dribbble" aria-hidden="true"></i> Dribbble</a></li>
{% endif %}
{% if author.pinterest %}
<li><a href="http://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
<li><a href="https://www.pinterest.com/{{ author.pinterest }}"><i class="fa fa-fw fa-pinterest" aria-hidden="true"></i> Pinterest</a></li>
{% endif %}
{% if author.foursquare %}
<li><a href="http://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
<li><a href="https://foursquare.com/{{ author.foursquare }}"><i class="fa fa-fw fa-foursquare" aria-hidden="true"></i> Foursquare</a></li>
{% endif %}
{% if author.steam %}
<li><a href="http://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
<li><a href="https://steamcommunity.com/id/{{ author.steam }}"><i class="fa fa-fw fa-steam-square" aria-hidden="true"></i> Steam</a></li>
{% endif %}
{% if author.youtube %}
<li><a href="https://youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> Youtube</a></li>
<li><a href="https://www.youtube.com/user/{{ author.youtube }}"><i class="fa fa-fw fa-youtube-square" aria-hidden="true"></i> YouTube</a></li>
{% endif %}
{% if author.soundcloud %}
<li><a href="http://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
<li><a href="https://soundcloud.com/{{ author.soundcloud }}"><i class="fa fa-fw fa-soundcloud" aria-hidden="true"></i> Soundcloud</a></li>
{% endif %}
{% if author.weibo %}
<li><a href="http://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
<li><a href="https://www.weibo.com/{{ author.weibo }}"><i class="fa fa-fw fa-weibo" aria-hidden="true"></i> Weibo</a></li>
{% endif %}
{% if author.flickr %}
<li><a href="http://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
<li><a href="https://www.flickr.com/{{ author.flickr }}"><i class="fa fa-fw fa-flickr" aria-hidden="true"></i> Flickr</a></li>
{% endif %}
{% if author.codepen %}
<li><a href="http://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
<li><a href="https://codepen.io/{{ author.codepen }}"><i class="fa fa-fw fa-codepen" aria-hidden="true"></i> CodePen</a></li>
{% endif %}
{% if author.vine %}
<li><a href="https://vine.co/u/{{ author.vine }}"><i class="fa fa-fw fa-vine" aria-hidden="true"></i> Vine</a></li>
+16 -16
View File
@@ -20,28 +20,28 @@
{% assign __names = __names | sort %}
{% for name in __names | sort %}
<!-- If not equal to previous then it must be unique as sorted -->
{% unless name == previous %}
<!-- If not equal to previous then it must be unique as sorted -->
{% unless name == previous %}
<!-- Push to group_names -->
{% assign group_names = group_names | push: name %}
{% endunless %}
<!-- Push to group_names -->
{% assign group_names = group_names | push: name %}
{% endunless %}
{% assign previous = name %}
{% assign previous = name %}
{% endfor %}
<!-- group_items -->
{% for name in group_names %}
<!-- Collect if contains -->
{% assign __item = __empty_array %}
{% for __element in include.collection %}
{% if __element[include.field] contains name %}
{% assign __item = __item | push: __element %}
{% endif %}
{% endfor %}
<!-- Push to group_items -->
{% assign group_items = group_items | push: __item %}
<!-- Collect if contains -->
{% assign __item = __empty_array %}
{% for __element in include.collection %}
{% if __element[include.field] contains name %}
{% assign __item = __item | push: __element %}
{% endif %}
{% endfor %}
<!-- Push to group_items -->
{% assign group_items = group_items | push: __item %}
{% endfor %}
+29 -6
View File
@@ -1,25 +1,48 @@
{% include base_path %}
{% assign navigation = site.data.navigation[page.sidebar.nav] %}
{% assign navigation = site.data.navigation[include.nav] %}
<nav class="nav__list">
{% if page.sidebar.title %}<header><h4 class="nav__title" style="padding: 0;">{{ page.sidebar.title }}</h4></header>{% endif %}
<ul>
{% for nav in navigation %}
<li><span class="nav__sub-title">{{ nav.title }}</span>
<li>
{% if nav.url %}
{% comment %}internal/external URL check{% endcomment %}
{% if nav.url contains "http" %}
{% assign domain = "" %}
{% else %}
{% assign domain = base_path %}
{% endif %}
<a href="{{ domain }}{{ nav.url }}"><span class="nav__sub-title">{{ nav.title }}</span></a>
{% else %}
<span class="nav__sub-title">{{ nav.title }}</span>
{% endif %}
{% if nav.children != null %}
<ul>
{% for child in nav.children %}
{% assign nav_url = child.path | prepend: "/" | prepend: page.sidebar.nav | prepend: "/" | append: "/" %}
{% if nav_url == page.url %}
{% comment %}internal/external URL check{% endcomment %}
{% if child.url contains "http" %}
{% assign domain = "" %}
{% else %}
{% assign domain = base_path %}
{% endif %}
{% comment %}set "active" class on current page{% endcomment %}
{% if child.url == page.url %}
{% assign active = "active" %}
{% else %}
{% assign active = "" %}
{% endif %}
<li><a href="{{ nav_url | prepend: base_path }}" class="{{ active }}">{{ child.title }}</a></li>
<li><a href="{{ domain }}{{ child.url }}" class="{{ active }}">{{ child.title }}</a></li>
{% endfor %}
</ul>
{% endif %}
</li>
{% endfor %}
</ul>
</nav>
</nav>
+8 -2
View File
@@ -18,8 +18,14 @@
{% capture overlay_img_path %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endcapture %}
{% endif %}
{% if page.header.overlay_filter contains "rgba" %}
{% capture overlay_filter %}{{ page.header.overlay_filter }}{% endcapture %}
{% elsif page.header.overlay_filter %}
{% capture overlay_filter %}rgba(0, 0, 0, {{ page.header.overlay_filter }}){% endcapture %}
{% endif %}
<div class="page__hero{% if page.header.overlay_color or page.header.overlay_image %}--overlay{% endif %}"
style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: url('{{ overlay_img_path }}');{% endif %}"
style="{% if page.header.overlay_color %}background-color: {{ page.header.overlay_color | default: 'transparent' }};{% endif %} {% if overlay_img_path %}background-image: {% if overlay_filter %}linear-gradient({{ overlay_filter }}, {{ overlay_filter }}), {% endif %}url('{{ overlay_img_path }}');{% endif %}"
>
{% if page.header.overlay_color or page.header.overlay_image %}
<div class="wrapper">
@@ -46,4 +52,4 @@
{% if page.header.caption %}
<span class="page__hero-caption">{{ page.header.caption | markdownify | remove: "<p>" | remove: "</p>" }}</span>
{% endif %}
</div>
</div>
+2 -2
View File
@@ -25,7 +25,7 @@
{% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %}
{% endif %}
{% assign seo_author = page.author | default: page.authors[0] | default: site.author %}
{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %}
{% if seo_author %}
{% if seo_author.twitter %}
{% assign seo_author_twitter = seo_author.twitter %}
@@ -104,7 +104,7 @@
"@context": "http://schema.org",
"@type": "Organization",
"url": {{ seo_url | jsonify }},
"logo": {{ site.og_image | prepend: "/" | prepend: seo_url | jsonify }}
"logo": {{ site.og_image | prepend: "/images/" | prepend: base_path | jsonify }}
}
</script>
{% endif %}
+3 -3
View File
@@ -1,8 +1,8 @@
{% include base_path %}
{% if page.author_profile or page.sidebar %}
{% if page.author_profile or layout.author_profile or page.sidebar %}
<div class="sidebar sticky">
{% if page.author_profile %}{% include author-profile.html %}{% endif %}
{% if page.author_profile or layout.author_profile %}{% include author-profile.html %}{% endif %}
{% if page.sidebar %}
{% for s in page.sidebar %}
{% if s.image %}
@@ -18,7 +18,7 @@
{% if s.text %}{{ s.text | markdownify }}{% endif %}
{% endfor %}
{% if page.sidebar.nav %}
{% include nav_list items=page.sidebar.nav %}
{% include nav_list nav=page.sidebar.nav %}
{% endif %}
{% endif %}
</div>
+1 -6
View File
@@ -6,16 +6,11 @@
@include container;
@include clearfix;
margin-top: 3em;
padding: 0 2em 3em;
padding: 0 1em 3em;
color: mix(#fff, $gray, 25%);
animation: intro 0.3s both;
animation-delay: 0.45s;
@include breakpoint($large) {
padding-left: 1em;
padding-right: 1em;
}
@include breakpoint($x-large) {
max-width: $x-large;
}
+1 -6
View File
@@ -12,16 +12,11 @@
&__inner-wrap {
@include container;
@include clearfix;
padding: 1em 2em 1em;
padding: 1em 1em 1em;
font-family: $sans-serif-narrow;
font-weight: 700;
text-transform: uppercase;
@include breakpoint($large) {
padding-left: 1em;
padding-right: 1em;
}
@include breakpoint($x-large) {
max-width: $x-large;
}
+2 -11
View File
@@ -6,16 +6,11 @@
@include container;
@include clearfix;
margin-top: 2em;
padding-left: 2em;
padding-right: 2em;
padding-left: 1em;
padding-right: 1em;
animation: intro 0.3s both;
animation-delay: 0.35s;
@include breakpoint($large) {
padding-left: 1em;
padding-right: 1em;
}
@include breakpoint($x-large) {
max-width: $x-large;
}
@@ -295,10 +290,6 @@
float: left;
@include breakpoint($large) {
@include pre(2 of 12);
}
@include breakpoint($x-large) {
@include pre(2.5 of 12);
}
+5 -2
View File
@@ -127,7 +127,7 @@
.author__urls-wrapper {
position: relative;
display: table-cell;
vertical-align: top;
vertical-align: middle;
font-family: $sans-serif;
z-index: 10;
position: relative;
@@ -142,7 +142,10 @@
@include breakpoint($large) {
display: block;
}
.btn {
button {
margin-bottom: 0;
@include breakpoint($large) {
display: none;
}
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -37,6 +37,6 @@
"watch:all": "npm-run-all --parallel watch:css watch:js",
"build:css": "npm run scss && npm run autoprefixer",
"build:js": "npm run uglify",
"build:all": "npm run build:css && build:js"
"build:all": "npm run build:css && npm run build:js"
}
}