diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 000000000000..b11f2a3960b4 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,11 @@ +# Contributing + +Having trouble working with the theme? Found a typo in the documentation? Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first. + +Minimal Mistakes has been designed as a base for you to customize and fit your site's unique needs. Please keep this in mind when requesting features and/or submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask. + +This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:. + +## Pull Requests + +To help me out try to avoid creating pull requests on `master` and instead branch off of `develop`. It's much easier for me to test, merge, and roll them into new releases this way. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 000000000000..d56b15288d8e --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,45 @@ + + +- [ ] 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 + + + +- **Minimal Mistakes version:** +- **`github-pages` or `jekyll` gem version:** +- **Operating system:** + + +--- + +## Expected behavior + + + +## Steps to reproduce the behavior + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e1ffa95ffed..87d59e769175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,362 @@ +## [3.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.3) + +### Enhancements + +- Make footer stick to the bottom of the page. + +### Bug Fixes + +- Fix `gallery` size bug [#402](https://github.com/mmistakes/minimal-mistakes/issues/402) + +### Maintenance + +- Set default `lang` to `en`. + +## [3.3.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.2) + +### Bug Fixes + +- Fix JavaScript that triggers "sticky" sidebar to avoid layout issues on screen sizes < `1024px`. [#396](https://github.com/mmistakes/minimal-mistakes/issues/396) + +## [3.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.1) + +### Enhancements + +- Enable image popup on < 500px wide screens. [#385](https://github.com/mmistakes/minimal-mistakes/issues/385) +- Indicate the relationship between component URLs in a paginated series by applying `rel="prev"` and `rel="next"` to pages that use `site.paginator`. [#253](https://github.com/mmistakes/minimal-mistakes/issues/253) +- Improve link posts in archive listings. [#276](https://github.com/mmistakes/minimal-mistakes/issues/276) + +### Maintenance + +- Update gems: `github-pages` (86), `ffi` 1.9.13, `jekyll-mentions` 1.1.3, and `rouge` 1.11.1 +- Fix note about custom sidebar content appearing below author profile. [#388](https://github.com/mmistakes/minimal-mistakes/issues/388) + +## [3.2.13](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.13) + +### Enhancements + +- Add English default UI text for Canada, Great Britain, and Australia. [#377](https://github.com/mmistakes/minimal-mistakes/issues/377) +- Switch default locale from `en-US` to `en`. + +## [3.2.12](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.12) + +### Enhancements + +- Remove window width "magic number" from sticky sidebar check in `main.js` for improved flexibility. [#375](https://github.com/mmistakes/minimal-mistakes/pull/375) + +### Bug Fixes + +- Fix author override conditional where a missing `authors.yml` would show broken sidebar content. Defaults to `site.author`. [#376](https://github.com/mmistakes/minimal-mistakes/pull/376) + +## [3.2.11](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.11) + +### Bug Fixes + +- Fix disappearing author sidebar links [#372](https://github.com/mmistakes/minimal-mistakes/issues/372) + +### Maintenance + +- Update gems: `github-pages` (84), `jekyll-github-metadata` 2.0.2, and `kramdown` 1.11.1 +- Update vendor JavaScript: jQuery 1.12.4, Stickyfill.js 1.1.4 +- Update Font Awesome 4.6.3 + +## [3.2.10](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.10) + +### Maintenance + +- Add `CONTRIBUTING.md` + +## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9) + +### Enhancements + +- Add support for [header overlay images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#header-overlay) for Open Graph images. [#358](https://github.com/mmistakes/minimal-mistakes/pull/358) + +### Bug Fixes + +- Fix `Person` typo Schema.org type [#358](https://github.com/mmistakes/minimal-mistakes/pull/358) + +### Maintenance + +- Update `github-pages` gem and dependencies. +- Remove `minutes_read` to avoid awkward reading time wording [#356](https://github.com/mmistakes/minimal-mistakes/issues/356) + +## [3.2.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.8) + +### Bug Fixes + +- Remove `cursor: pointer` that appears on white-space surrounding author side list items and links. [#354](https://github.com/mmistakes/minimal-mistakes/pull/354) + +### Maintenance + +- Add contributing information to `README.md`. [#357](https://github.com/mmistakes/minimal-mistakes/issues/357) + +## [3.2.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.7) + +### Enhancements + +- Add French localized UI text. [#346](https://github.com/mmistakes/minimal-mistakes/pull/346) + +### Bug Fixes + +- Fix branch logic for Yandex and Alexa in `seo.html`. [#348](https://github.com/mmistakes/minimal-mistakes/pull/348) + +## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6) + +### Bug Fixes + +- Fix error `Liquid Exception: divided by 0 in _includes/archive-single.html, included in _layouts/single.html` caused by null `words_per_minute` in `_config.yml`. [#345](https://github.com/mmistakes/minimal-mistakes/pull/345) + +## [3.2.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.5) + +### Bug Fixes + +- Fix link color in hero overlay to be white. +- Remove underlines from archive item titles. + +## [3.2.4](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.4) + +### Enhancements + +- Improve text alignment of masthead, hero overlay, page footer to be flush left and remove awkward white-space gaps. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342) +- Add Spanish localized UI text. [#338](https://github.com/mmistakes/minimal-mistakes/pull/338) + +### Bug Fixes + +- Fix alignment of icons in author sidebar [#341](https://github.com/mmistakes/minimal-mistakes/issues/341) + +### Maintenance + +- Add background color to page footer to set it apart from main content. [#342](https://github.com/mmistakes/minimal-mistakes/issues/342) +- Add terms and privacy policy to theme's demo site. [#343](https://github.com/mmistakes/minimal-mistakes/issues/343) +- Update screenshots found in theme documentation. + +## [3.2.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.3) + +### Enhancements + +- Add [Discourse](https://www.discourse.org/) as a commenting provider. [#335](https://github.com/mmistakes/minimal-mistakes/pull/335) + +## [3.2.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.2) + +### Enhancements + +- Add support for image captions in Magnific Popup overlays via the [`gallery`](https://mmistakes.github.io/minimal-mistakes/docs/helpers/#gallery) helper. [#334](https://github.com/mmistakes/minimal-mistakes/issues/334) + +## [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. `

` 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) + +### Enhancements + +- 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 + +- 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) + +### Enhancements + +- 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 + +- Fixed reading time bug when `words_per_minute` wasn't set in `_config.yml` [#271](https://github.com/mmistakes/minimal-mistakes/issues/271) + +## [3.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.0) + +### Enhancements + +- Updated [Font Awesome](https://fortawesome.github.io/Font-Awesome/whats-new/) to version 4.6.1 +- Added optional GitHub and Bitbucket links to footer if set on `site.author` in `_config.yml`. + +### Bug Fixes +- Fixed Bitbucket URL typo in author sidebar. + +## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3) + +### Enhancements + +- Rebuilt the entire theme: layouts, includes, stylesheets, scripts, you name it. +- Refreshed the look and feel while staying true to the original design of the theme (author sidebar/main content). +- Replaced grid system with [Susy](http://susy.oddbird.net/). +- Replaced Grunt tasks with `npm` scripts. +- Removed Google Fonts and replaced with system fonts to improve performance (they can be [added back](https://mmistakes.github.io/minimal-mistakes/docs/stylesheets/) if desired) +- Greatly improved [theme documentation](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/). +- Increased the amount of sample posts, sample pages, and sample collections to throughly test the theme and edge-cases. +- Moved all sample content and assets out of `master` to keep it as clean as possible for forking. +- Added new layouts for `splash` pages, archives for [`jekyll-archives`](https://github.com/jekyll/jekyll-archives) if enabled, and [`compress.html`](https://github.com/penibelst/jekyll-compress-html) to improve performance. +- Added taxonomy links to posts (tags and categories). +- Added optional "reading time" meta data. +- Improved Liquid used for Twitter Cards and Open Graph data in ``. +- Improved `gallery` include helper and added `feature_row` for use with splash page layout. +- Added Keybase.io, author web URI, and Bitbucket optional links to sidebar. +- Add `feed.xml` link to footer. +- Added a [UI text data file](https://mmistakes.github.io/minimal-mistakes/docs/ui-text/) to easily change all text found in the theme. +- Added LinkedIn to optional social share buttons. +- Added Facebook, Google+, and custom commenting options in addition to Disqus. +- Added optional breadcrumb links. + +## [2.2.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.2.1) + +## [2.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.2.0) + +### Enhancements + +- Add support for Jekyll 3.0 +- Minor updates to syntax highlighting CSS and theme documentation + +## [2.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.3) + +### Enhancements + +- Cleaner print styles that remove the top navigation, social sharing buttons, and other elements not needed when printed. + +## [2.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.2) + +### Enhancements + +- Add optional CodePen icon/url to author side bar [#156](https://github.com/mmistakes/minimal-mistakes/pull/156) +- Documented Stackoverflow username explanation in `_config.yml` [#157](https://github.com/mmistakes/minimal-mistakes/pull/157) +- Simplified Liquid in `post-index.html` to better handle year listings [#166](https://github.com/mmistakes/minimal-mistakes/pull/166) + +### Bug Fixes + +- Cleanup Facebook related Open Graph meta tags [#149](https://github.com/mmistakes/minimal-mistakes/issues/149) +- Corrected minor typos [#158](https://github.com/mmistakes/minimal-mistakes/pull/158) [#175](https://github.com/mmistakes/minimal-mistakes/issues/175) + +## [2.1.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.1) + +### Enhancements + +- Add optional XING profile link to author sidebar +- Include open graph meta tags for feature image (if assigned) [#149](https://github.com/mmistakes/minimal-mistakes/issues/149) +- Create an include for feed footer + +### Bug Fixes + +- Remove http protocol from Google search form on sample 404 page +- Only show related posts if there are one or more available +- Fix alignment of email address link in author sidebar + +## [2.1.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/2.1.0) + +### Enhancements + +- Add optional social sharing buttons ([#42](https://github.com/mmistakes/minimal-mistakes/issues/42)) + +![social sharing buttons](https://cloud.githubusercontent.com/assets/1376749/5860522/d9f28a96-a22f-11e4-9b83-940a3a9a766a.png) + +- Add Soundcloud, YouTube ([#95](https://github.com/mmistakes/minimal-mistakes/pull/95)), Flickr ([#119](https://github.com/mmistakes/minimal-mistakes/pull/119)), and Weibo ([#116](https://github.com/mmistakes/minimal-mistakes/pull/116)) icons for use in author sidebar. +- Fix typos in posts and documentation and remove references to Less +- Include note about Octopress gem being optional +- Post author override support extended to the Atom feed ([#71](https://github.com/mmistakes/minimal-mistakes/pull/71)) +- Only include email address in feed if specified in `_config.yml` or author `_data` +- Wrap all page content in `#main` to harmonize article and post index styles ([#86](https://github.com/mmistakes/minimal-mistakes/issues/86)) +- Include new sample feature images for posts and pages +- Table of contents improvements: fix collapse toggle, indent nested elements, show on small screens, and create an `_include` for reusing in posts and pages. +- Include note about running Jekyll with `bundle exec` when using Bundler +- Fix home page path in top navigation +- Remove Google Authorship ([#120](https://github.com/mmistakes/minimal-mistakes/issues/120)) +- Remove duplicate author content that displayed in `div.article-author-bottom` +- Removed unused `_sass/print.scss` styles +- Improve comments in `.scss` files + +## [2.0.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/v2.0) + +## [1.3.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.3.3) + +### Enhancements + +- Added new icons and profile links for Stackoverflow, Dribbble, Pinterest, Foursquare, and Steam to the author bio sidebar. +- Cleaned up the Kramdown auto table of contents styling to be more readable +- Removed page width specific .less stylesheets and created mixins for easier updating +- Removed Modernizr since it wasn't being used +- Added pages to sitemap.xml +- Added category: to rake new_post task +- Minor typographic changes + +### Bug Fixes + +- Corrected various broken links in README and Theme Setup. + +## [1.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.3.1) + +### Enhancements + +- Cleaned up table of contents styling +- Reworked top navigation to be a better experience on small screens. Nav items now display vertically when the menu button is tapped, revealing links with larger touch targets. + +![menu animation](https://camo.githubusercontent.com/3fbd8c1326485f4b1ab32c0005c0fca7660b5d31/68747470733a2f2f662e636c6f75642e6769746875622e636f6d2f6173736574732f313337363734392f323136343037352f31653366303663322d393465372d313165332d383961612d6436623636376562306564662e676966) + ## [1.2.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/1.2.0) ### Bug Fixes diff --git a/Gemfile.lock b/Gemfile.lock index 8fcf5a4bcff8..01c019f5972b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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,36 +13,33 @@ 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) + execjs (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.10) - ffi (1.9.10-x64-mingw32) + ffi (1.9.13) + ffi (1.9.13-x64-mingw32) gemoji (2.1.0) - github-pages (69) - RedCloth (= 4.2.9) + github-pages (86) github-pages-health-check (= 1.1.0) - jekyll (= 3.0.3) + jekyll (= 3.1.6) 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-mentions (= 1.1.2) + jekyll-github-metadata (= 2.0.2) + jekyll-mentions (= 1.1.3) 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 (= 2.0.0) jekyll-sitemap (= 0.10.0) - jekyll-textile-converter (= 0.1.0) jemoji (= 0.6.2) - kramdown (= 1.10.0) + kramdown (= 1.11.1) liquid (= 3.0.6) + listen (= 3.0.6) mercenary (~> 0.3) - rdiscount (= 2.1.8) - redcarpet (= 3.3.3) - rouge (= 1.10.1) + rouge (= 1.11.1) terminal-table (~> 1.4) github-pages-health-check (1.1.0) addressable (~> 2.3) @@ -51,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.3) + jekyll (3.1.6) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -66,12 +62,13 @@ 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 (2.0.2) + jekyll (~> 3.1) octokit (~> 4.0) - jekyll-mentions (1.1.2) + jekyll-mentions (1.1.3) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-paginate (1.1.0) @@ -79,47 +76,46 @@ GEM jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-seo-tag (1.3.3) - jekyll (~> 3.0) + jekyll-seo-tag (2.0.0) + jekyll (~> 3.1) 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) jekyll (>= 3.0) json (1.8.3) - kramdown (1.10.0) + kramdown (1.11.1) liquid (3.0.6) listen (3.0.6) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9.7) mercenary (0.3.6) - mini_portile2 (2.0.0) - minitest (5.8.4) + mini_portile2 (2.1.0) + minitest (5.9.0) multipart-post (2.0.0) net-dns (0.8.0) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7.2-x64-mingw32) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + nokogiri (1.6.8-x64-mingw32) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) + pkg-config (1.1.7) public_suffix (1.5.3) 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) + rouge (1.11.1) safe_yaml (1.0.4) sass (3.4.22) sawyer (0.7.0) addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) - terminal-table (1.5.2) + terminal-table (1.6.0) thread_safe (0.3.5) typhoeus (0.8.0) ethon (>= 0.8.0) @@ -136,4 +132,4 @@ DEPENDENCIES wdm (~> 0.1.0) BUNDLED WITH - 1.11.2 + 1.12.5 diff --git a/README.md b/README.md index c3047faed574..ee330065f1dd 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,30 @@ -# Minimal Mistakes Jekyll Theme +# [Minimal Mistakes Jekyll Theme](https://mmistakes.github.io/minimal-mistakes/) + +[![GitHub release](https://img.shields.io/github/release/mmistakes/minimal-mistakes.svg)](https://github.com/mmistakes/minimal-mistakes/releases) [![GitHub license](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://raw.githubusercontent.com/mmistakes/minimal-mistakes/master/LICENSE) Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your personal site, blog, or portfolio on GitHub or self-hosting on your own server. As the name implies --- styling is purposely minimalistic to be enhanced and customized by you :smile:. +See what's new in the [CHANGELOG](CHANGELOG.md). + +[![Minimal Mistakes live preview][2]][1] + +[1]: https://mmistakes.github.io/minimal-mistakes/ +[2]: images/mm-browser-mockups.png (live preview) + The theme includes responsive layouts (`single`, `archive`, and `splash` pages) that look great on mobile and desktop browsers. -![mm-layout-examples](https://cloud.githubusercontent.com/assets/1376749/14541626/dac474f4-0258-11e6-83f6-40e752028222.png) +![layout examples](images/mm-layout-examples.png) ## [Installation and Setup](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/) / [Preview the Theme](https://mmistakes.github.io/minimal-mistakes/) ### 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. -- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, and custom) -- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom) +- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), and custom). +- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom). #### Demo Pages @@ -42,15 +51,37 @@ For even more demo pages check the [posts archive][year-archive]. --- -### Credits +## Contributing + +Having trouble working with the theme? Found a typo in the documentation? Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first. + +Minimal Mistakes has been designed as a base for you to customize and fit your site's unique needs. Please keep this in mind when requesting features and/or submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask. + +This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:. + +### Pull Requests + +To help me out try to avoid creating pull requests on `master` and instead branch off of `develop`. It's much easier for me to test, merge, and roll them into new releases this way. + +--- + +## Credits -#### Icons + Demo Images: +### Creator + +**Michael Rose** + +- +- +- + +### Icons + Demo Images: - [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam) - [Font Awesome](http://fortawesome.github.io/Font-Awesome/) - [Unsplash](https://unsplash.com/) -#### Other: +### Other: - [Jekyll](http://jekyllrb.com/) - [jQuery](http://jquery.com/) @@ -64,6 +95,8 @@ For even more demo pages check the [posts archive][year-archive]. --- +## License + The MIT License (MIT) Copyright (c) 2016 Michael Rose diff --git a/_config.yml b/_config.yml index 57ff92c8f28f..59b438b8922f 100644 --- a/_config.yml +++ b/_config.yml @@ -1,3 +1,16 @@ +defaults: + # _posts + - scope: + path: "" + type: posts + values: + layout: single + author_profile: true + read_time: true + comments: true + share: true + related: true + # Welcome to Jekyll! # # This config file is meant for settings that affect your entire site, values @@ -6,21 +19,23 @@ # `jekyll serve`. If you change this file, please restart the server process. # Site Settings -locale : "en-US" -title : "Site Title" -title_separator : "-" -name : "Your Name" -description : "An amazing website." -url : # the base hostname & protocol for your site e.g. "https://github.io.mmistakes" -baseurl : # the subpath of your site, e.g. "/blog" +locale : "it" +title : "Riflessioni di uno Psicologo Online a Milano" +title_separator : "|" +name : "Dr Ivan Ferrero" +description : "Della Psicologia Online, della Vita Digitale, e di Tutto il Resto." +url : "https://ivanpsy.github.io" # the base hostname & protocol for your site e.g. "https://mmistakes.github.io" +baseurl : "/ivanferreroit" # the subpath of your site, e.g. "/blog" gh_repo : teaser : # filename of teaser fallback teaser image placed in /images/, .e.g. "500x300.png" -# breadcrumbs : false # true, false (default) -# words_per_minute : 200 +# breadcrumbs : false # true, false (default) +words_per_minute : 200 comments: - provider : # false (default), "disqus", "facebook", "google-plus", custom" + provider : # false (default), "disqus", "discourse", "facebook", "google-plus", custom" disqus: shortname : # https://help.disqus.com/customer/portal/articles/466208-what-s-a-shortname- + discourse: + server : # https://meta.discourse.org/t/embedding-discourse-comments-via-javascript/31963 , e.g.: meta.discourse.org facebook: # https://developers.facebook.com/docs/plugins/comments appid : @@ -35,7 +50,7 @@ yandex_site_verification : # Social Sharing twitter: - username : + username : "ivanpsy" facebook: username : app_id : @@ -61,34 +76,34 @@ google_ad_slot : # Site Author author: - name : "Your Name" - avatar : "bio-photo.jpg" - bio : "I am an amazing person." - location : "Somewhere" - email : + name : "Dr Ivan Ferrero" + avatar : "Ivan_Ferrero_Avatar_Rounded_Medium.png" + bio : "Psicoterapeuta, Psicologo Online" + location : "via Felice Bisleri - 20148 Milano Italy" + email : "ivan.ferrero1975@gmail.com" uri : bitbucket : codepen : dribbble : flickr : - facebook : + facebook : "https://www.facebook.com/Doctor-Ivan-Ferrero-Digital-Psychologist-153352994732266" foursquare : github : - google_plus : + google_plus : "https://plus.google.com/collection/A-kjX" keybase : - instagram : + instagram : "https://www.instagram.com/ivanpsy" lastfm : - linkedin : + linkedin : "https://www.linkedin.com/in/ivanpsy" pinterest : soundcloud : - stackoverflow : # http://stackoverflow.com/users/123456/username + stackoverflow : steam : tumblr : - twitter : + twitter : "https://twitter.com/IvanPsy" vine : weibo : xing : - youtube : + youtube : "https://www.youtube.com/channel/UCwtpXynvhq5PG7K22q55-Qg" # Reading Files @@ -179,10 +194,10 @@ whitelist: # - /tags/my-awesome-tag/index.html ~> path: /tags/ # - path: /categories/ # - path: / -categories: +category_archive: type: liquid path: /categories/ -tags: +tag_archive: type: liquid path: /tags/ # https://github.com/jekyll/jekyll-archives diff --git a/_data/navigation.yml b/_data/navigation.yml index fee066fc33c2..a471cd2b7b1a 100644 --- a/_data/navigation.yml +++ b/_data/navigation.yml @@ -1,16 +1,10 @@ # main links links main: - - title: "Quick-Start Guide" - url: https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/ + - title: "Inizia QUI" + url: https://mmistakes.github.io/minimal-mistakes/docs/navigation/ - - title: "About" - url: https://mmistakes.github.io/minimal-mistakes/ + - title: "Chi sono" + url: https://mmistakes.github.io/minimal-mistakes/docs/navigation/ - - title: "Sample Posts" - url: https://mmistakes.github.io/minimal-mistakes/year-archive/ - - - title: "Sample Pages" - url: https://mmistakes.github.io/minimal-mistakes/page-archive/ - - - title: "Sample Collections" - url: https://mmistakes.github.io/minimal-mistakes/collection-archive/ \ No newline at end of file + - title: "Contattami" + url: / diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 54f7de3d87c8..7f1428ff693d 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -12,7 +12,6 @@ en: &DEFAULT_EN ext_link_label : "Direct Link" less_than : "less than" minute_read : "minute read" - minutes_read : "minutes read" share_on_label : "Share on" meta_label : tags_label : "Tags:" @@ -26,10 +25,112 @@ en: &DEFAULT_EN powered_by : "Powered by" website_label : "Website" email_label : "Email" + recent_posts : "Recent Posts" + undefined_wpm : "Undefined parameter words_per_minute at _config.yml" en-US: <<: *DEFAULT_EN -en-UK: +en-CA: <<: *DEFAULT_EN +en-GB: + <<: *DEFAULT_EN +en-AU: + <<: *DEFAULT_EN + +# Spanish +# -------------- +es: &DEFAULT_ES + page : "Página" + pagination_previous : "Anterior" + pagination_next : "Siguiente" + breadcrumb_home_label : "Inicio" + breadcrumb_separator : "/" + toc_label : "Contenidos" + ext_link_label : "Enlace" + less_than : "menos de" + minute_read : "minuto de lectura" + share_on_label : "Compartir" + meta_label : + tags_label : "Etiquetas:" + categories_label : "Categorías:" + date_label : "Actualizado:" + comments_label : "Comentar" + more_label : "Ver más" + related_label : "Podrías ver también" + follow_label : "Seguir:" + feed_label : "Feed" + powered_by : "Powered by" + website_label : "Sitio web" + email_label : "Email" + recent_posts : "Entradas recientes" + undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml" +es-ES: + <<: *DEFAULT_ES +es-CO: + <<: *DEFAULT_ES + +# French +# ----------------- +fr: &DEFAULT_FR + page : "Page" + pagination_previous : "Précédent" + pagination_next : "Suivant" + breadcrumb_home_label : "Accueil" + breadcrumb_separator : "/" + toc_label : "Sur cette page" + ext_link_label : "Lien direct" + less_than : "plus petit que" + minute_read : "minute de lecture" + share_on_label : "Partager sur" + meta_label : + tags_label : "Tags :" + categories_label : "Catégories :" + date_label : "Mis à jour :" + comments_label : "Laisser un commentaire" + more_label : "Lire plus" + related_label : "Vous pourriez aimer" + follow_label : "Suivez moi" + feed_label : "Flux" + powered_by : "Propulsé par" + website_label : "Site" + email_label : "Email" + recent_posts : "Posts récents" + undefined_wpm : "Le paramètre words_per_minute n'est pas défini dans _config.yml" +fr-FR: + <<: *DEFAULT_FR +fr-BE: + <<: *DEFAULT_FR +fr-CH: + <<: *DEFAULT_FR # Another locale -# -------------- \ No newline at end of file +# -------------- + +# Italian +# ----------------- +it: &DEFAULT_IT + page : "Pagina" + pagination_previous : "Precedente" + pagination_next : "Prossima" + breadcrumb_home_label : "Home" + breadcrumb_separator : "/" + toc_label : "Indice della pagina" + ext_link_label : "Link" + less_than : "meno di" + minute_read : "minuto/i di lettura" + share_on_label : "Condividi" + meta_label : + tags_label : "Tags:" + categories_label : "Categorie:" + date_label : "Aggiornato:" + comments_label : "Scrivi un commento" + more_label : "Scopri di più" + related_label : "Potrebbe Piacerti Anche" + follow_label : "Segui:" + feed_label : "Feed" + powered_by : "Powered by" + website_label : "Website" + email_label : "Email" + recent_posts : "Articoli Recenti" + undefined_wpm : "Parametro words_per_minute non definito in _config.yml" +it-IT: + <<: *DEFAULT_IT diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 60b63f91cc41..6b5eb494d1fd 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -6,29 +6,35 @@ {% capture teaser %}{{ site.teaser }}{% endcapture %} {% endif %} +{% if post.id %} + {% assign title = post.title | markdownify | remove: "

" | remove: "

" %} +{% else %} + {% assign title = post.title %} +{% endif %} +
- {% if post.link %} - - {% else %} - - {% endif %} -
- {% if include.type == "grid" and teaser != blank %} -
- -
- {% endif %} -

{% if post.id %}{{ post.title | markdownify | remove: "

" | remove: "

" }}{% else %}{{ post.title }}{% endif %}{% if post.link %}{% endif %}

- {% if post.read_time %} -

{% include read-time.html %}

+ - +

+ {% if post.read_time %} +

{% include read-time.html %}

+ {% endif %} + {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %} + \ No newline at end of file diff --git a/_includes/author-profile.html b/_includes/author-profile.html index 40ae6d4db224..d07979f39d19 100644 --- a/_includes/author-profile.html +++ b/_includes/author-profile.html @@ -1,13 +1,13 @@ {% include base_path %} -{% if page.author %} +{% if page.author and site.data.authors[page.author] %} {% assign author = site.data.authors[page.author] %}{% else %}{% assign author = site.author %} {% endif %}
- {% if author.avatar contains "http" %} + {% if author.avatar contains "://" %} {{ author.name }} {% else %} {{ author.name }} @@ -35,64 +35,64 @@

{{ author.name }}

  • Keybase
    • {% endif %} {% if author.twitter %} -
  • Twitter
    • +
  • Twitter
    • {% endif %} {% if author.facebook %} -
  • Facebook
    • +
  • Facebook
    • {% endif %} {% if author.google_plus %} -
  • Google+
    • +
  • Google+
    • {% endif %} {% if author.linkedin %} -
  • LinkedIn
    • +
  • LinkedIn
    • {% endif %} {% if author.xing %} -
  • XING
    • +
  • XING
    • {% endif %} {% if author.instagram %} -
  • Instagram
    • +
  • Instagram
    • {% endif %} {% if author.tumblr %} -
  • Tumblr
    • +
  • Tumblr
    • {% endif %} {% if author.bitbucket %} -
  • Bitbucket
    • +
  • Bitbucket
    • {% endif %} {% if author.github %} -
  • Github
    • +
  • Github
    • {% endif %} {% if author.stackoverflow %} -
  • Stackoverflow
    • +
  • Stackoverflow
    • {% endif %} {% if author.lastfm %} -
  • Last.fm
    • +
  • Last.fm
    • {% endif %} {% if author.dribbble %} -
  • Dribbble
    • +
  • Dribbble
    • {% endif %} {% if author.pinterest %} -
  • Pinterest
    • +
  • Pinterest
    • {% endif %} {% if author.foursquare %} -
  • Foursquare
    • +
  • Foursquare
    • {% endif %} {% if author.steam %} -
  • Steam
    • +
  • Steam
    • {% endif %} {% if author.youtube %} -
  • Youtube
    • +
  • YouTube
    • {% endif %} {% if author.soundcloud %} -
  • Soundcloud
    • +
  • Soundcloud
    • {% endif %} {% if author.weibo %} -
  • Weibo
    • +
  • Weibo
    • {% endif %} {% if author.flickr %} -
  • Flickr
    • +
  • Flickr
    • {% endif %} {% if author.codepen %} -
  • CodePen
    • +
  • CodePen
    • {% endif %} {% if author.vine %}
  • Vine
    • diff --git a/_includes/category-list.html b/_includes/category-list.html index 2347133fb2f3..77b135475faa 100644 --- a/_includes/category-list.html +++ b/_includes/category-list.html @@ -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 %} @@ -23,7 +23,7 @@ {% for hash in category_hashes %} {% assign keyValue = hash | split: '#' %} {% capture category_word %}{{ keyValue[1] | strip_newlines }}{% endcapture %} - {% unless forloop.last %}, {% endunless %} + {% unless forloop.last %}, {% endunless %} {% endfor %}

    diff --git a/_includes/comments-providers/discourse.html b/_includes/comments-providers/discourse.html new file mode 100644 index 000000000000..1d23b6f21e05 --- /dev/null +++ b/_includes/comments-providers/discourse.html @@ -0,0 +1,14 @@ +{% if site.comments.discourse.server %} +{% include base_path %} +{% capture canonical %}{{ base_path }}{% if site.permalink contains '.html' %}{{ page.url }}{% else %}{{ page.url | remove:'index.html' | strip_slash }}{% endif %}{% endcapture %} + + +{% endif %} \ No newline at end of file diff --git a/_includes/comments-providers/disqus.html b/_includes/comments-providers/disqus.html index b80be9efd06e..c6fc691ded36 100644 --- a/_includes/comments-providers/disqus.html +++ b/_includes/comments-providers/disqus.html @@ -19,4 +19,4 @@ }()); -{% endif %} +{% endif %} \ No newline at end of file diff --git a/_includes/comments-providers/google-plus.html b/_includes/comments-providers/google-plus.html index cd582c3ddd6a..0b4ff6b7e0ec 100644 --- a/_includes/comments-providers/google-plus.html +++ b/_includes/comments-providers/google-plus.html @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html index df699fc5507f..0da90c5d56a2 100644 --- a/_includes/comments-providers/scripts.html +++ b/_includes/comments-providers/scripts.html @@ -3,6 +3,8 @@ {% case site.comments.provider %} {% when "disqus" %} {% include /comments-providers/disqus.html %} +{% when "discourse" %} + {% include /comments-providers/discourse.html %} {% when "facebook" %} {% include /comments-providers/facebook.html %} {% when "google-plus" %} diff --git a/_includes/feature_row b/_includes/feature_row index 798ac44e7b24..10592b7e5fb5 100644 --- a/_includes/feature_row +++ b/_includes/feature_row @@ -10,7 +10,7 @@ {% for f in feature_row %} - {% if f.url contains "http" %} + {% if f.url contains "://" %} {% capture f_url %}{{ f.url }}{% endcapture %} {% else %} {% capture f_url %}{{ f.url | prepend: base_path }}{% endcapture %} @@ -21,7 +21,7 @@ {% if f.image_path %}
    Facebook {% endif %} + {% if site.author.github %} +
  • GitHub
    • + {% endif %} + {% if site.author.bitbucket %} +
  • Bitbucket
    • + {% endif %}
  • {{ site.data.ui-text[site.locale].feed_label }}
    • -
    © {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by }} Jekyll & Minimal Mistakes.
    +
    © {{ site.time | date: '%Y' }} {{ site.name | default: site.title }}. {{ site.data.ui-text[site.locale].powered_by }} Jekyll & Minimal Mistakes.
    \ No newline at end of file diff --git a/_includes/gallery b/_includes/gallery index 9e6f31ea7397..4d271ee92b80 100644 --- a/_includes/gallery +++ b/_includes/gallery @@ -6,11 +6,9 @@ {% assign gallery = page.gallery %} {% endif %} -{% capture gallery_size %}{{ gallery | size }}{% endcapture %} - -{% if gallery_size == '2' %} +{% if gallery.size == 2 %} {% assign gallery_layout = 'half' %} -{% elsif gallery_size >= '3' %} +{% elsif gallery.size >= 3 %} {% assign gallery_layout = 'third' %} {% else %} {% assign gallery_layout = '' %} @@ -20,28 +18,29 @@ {% for img in gallery %} {% if img.url %} {% if img.alt %}{{ img.alt }}{% endif %} + alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% else %} {% if img.alt %}{{ img.alt }}{% endif %} + alt="{% if img.alt %}{{ img.alt }}{% endif %}"> {% endif %} {% endfor %} {% if include.caption %} diff --git a/_includes/group-by-array b/_includes/group-by-array index 33af7555d0bc..251302c70bb1 100644 --- a/_includes/group-by-array +++ b/_includes/group-by-array @@ -20,28 +20,28 @@ {% assign __names = __names | sort %} {% for name in __names | sort %} - - {% unless name == previous %} + +{% unless name == previous %} - - {% assign group_names = group_names | push: name %} - {% endunless %} + +{% assign group_names = group_names | push: name %} +{% endunless %} - {% assign previous = name %} +{% assign previous = name %} {% endfor %} {% for name in group_names %} - - {% assign __item = __empty_array %} - {% for __element in include.collection %} - {% if __element[include.field] contains name %} - {% assign __item = __item | push: __element %} - {% endif %} - {% endfor %} - - - {% assign group_items = group_items | push: __item %} + +{% assign __item = __empty_array %} +{% for __element in include.collection %} +{% if __element[include.field] contains name %} +{% assign __item = __item | push: __element %} +{% endif %} {% endfor %} + + +{% assign group_items = group_items | push: __item %} +{% endfor %} \ No newline at end of file diff --git a/_includes/nav_list b/_includes/nav_list index 352856f7cb52..91228ba8eff3 100644 --- a/_includes/nav_list +++ b/_includes/nav_list @@ -1,21 +1,42 @@ {% include base_path %} -{% assign navigation = site.data.navigation[page.sidebar.nav] %} +{% assign navigation = site.data.navigation[include.nav] %}