diff --git a/example/_config.yml b/example/_config.yml index e216f756a4..3639c1482e 100644 --- a/example/_config.yml +++ b/example/_config.yml @@ -9,6 +9,11 @@ baseurl: "/minima" twitter_username: jekyllrb github_username: jekyll +# Minima date format +# refer to http://shopify.github.io/liquid/filters/date/ if you want to customize this +minima: + date_format: "%b %-d, %Y" + # If you want to link only specific pages in your header, uncomment # this and add the path to the pages in order as they should show up #header_pages: From cd8c3e0ebad408fe54e1129031a463ae933d3520 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 7 Apr 2017 12:31:23 -0400 Subject: [PATCH 11/26] Update history to reflect merge of #70 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index e78a1ed171..1754ab76d5 100644 --- a/History.markdown +++ b/History.markdown @@ -6,6 +6,7 @@ * Close #55: Improve mobile user experience (#62) * Remove incomplete status from spec summary (#63) + * Use date_format if set in configuration (#70) ### Development Fixes From edada62d9f544b9b96b4b16d309a72ed77809c66 Mon Sep 17 00:00:00 2001 From: Mario Lopez Date: Fri, 7 Apr 2017 12:32:55 -0400 Subject: [PATCH 12/26] Corrected misspelled word (#72) Merge pull request 72 --- script/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build b/script/build index 645006f11a..c935a65eb7 100755 --- a/script/build +++ b/script/build @@ -2,5 +2,5 @@ set -e -echo "Buidling the example site..." +echo "Building the example site..." bundle exec jekyll build --source example From c27c0b14acb85be13805dc81984ff9d1e03ed07e Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 7 Apr 2017 12:32:56 -0400 Subject: [PATCH 13/26] Update history to reflect merge of #72 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1754ab76d5..7b4b0cf790 100644 --- a/History.markdown +++ b/History.markdown @@ -7,6 +7,7 @@ * Close #55: Improve mobile user experience (#62) * Remove incomplete status from spec summary (#63) * Use date_format if set in configuration (#70) + * Corrected misspelled word (#72) ### Development Fixes From a1cb7c4148901adab06e43c6984e3c554de1f30d Mon Sep 17 00:00:00 2001 From: Sebastian Wiesner Date: Fri, 7 Apr 2017 18:33:52 +0200 Subject: [PATCH 14/26] Scale headings relative to base-font-size (#78) Merge pull request 78 --- _sass/minima/_layout.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_sass/minima/_layout.scss b/_sass/minima/_layout.scss index 11b04583ac..1e2b36b518 100644 --- a/_sass/minima/_layout.scss +++ b/_sass/minima/_layout.scss @@ -98,7 +98,7 @@ } .footer-heading { - font-size: 18px; + font-size: $base-font-size * 1.125; margin-bottom: $spacing-unit / 2; } @@ -167,7 +167,7 @@ } .page-heading { - font-size: 20px; + font-size: $base-font-size * 1.25; } .post-list { From b065efef52ca9402e15606e5168b033dfd1559f3 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 7 Apr 2017 12:33:53 -0400 Subject: [PATCH 15/26] Update history to reflect merge of #78 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7b4b0cf790..28202a460a 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ * Remove incomplete status from spec summary (#63) * Use date_format if set in configuration (#70) * Corrected misspelled word (#72) + * Scale headings relative to base-font-size (#78) ### Development Fixes From 09c6de709f42a7390c1fb3eef66c18f3e71e229d Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 7 Apr 2017 18:35:31 +0200 Subject: [PATCH 16/26] Remove 2.0 post-install message (#82) Merge pull request 82 --- minima.gemspec | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/minima.gemspec b/minima.gemspec index d2d9047d70..4a08ba8120 100644 --- a/minima.gemspec +++ b/minima.gemspec @@ -19,22 +19,6 @@ Gem::Specification.new do |spec| spec.bindir = "exe" spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } - spec.post_install_message = <<-msg - ----------------------------------------------- -Thank you for installing minima 2.0! - -Minima 2.0 comes with a breaking change that -renders '/css/main.scss' redundant. -That file is now bundled with this gem as -'/assets/main.scss'. - -More Information: -https://github.com/jekyll/minima#customization ----------------------------------------------- - -msg - spec.add_runtime_dependency "jekyll", "~> 3.3" spec.add_development_dependency "bundler", "~> 1.12" From 74400b7b9b7278950695fe3c36ff5a3d304fe48a Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 7 Apr 2017 12:35:32 -0400 Subject: [PATCH 17/26] Update history to reflect merge of #82 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 28202a460a..f73dea2639 100644 --- a/History.markdown +++ b/History.markdown @@ -9,6 +9,7 @@ * Use date_format if set in configuration (#70) * Corrected misspelled word (#72) * Scale headings relative to base-font-size (#78) + * Remove 2.0 post-install message (#82) ### Development Fixes From 21d83fade020d25fadda63e9b810f171afc162df Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Fri, 7 Apr 2017 22:08:53 +0530 Subject: [PATCH 18/26] Update README with theme content description (#91) Merge pull request 91 --- README.md | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f1181c62e7..34fd15bc0e 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,48 @@ theme: minima And then execute: $ bundle - + + +## Contents At-A-Glance + +Minima has been scaffolded by the `jekyll new-theme` command and therefore has all the necessary files and directories to have a new Jekyll site up and running with zero-configuration. + +### Layouts + +Refers to files within the `_layouts` directory, that define the markup for your theme. + + - `default.html` — The base layout that lays the foundation for subsequent layouts. The derived layouts inject their contents into this file at the line that says ` {{ content }} ` and are linked to this file via [FrontMatter](https://jekyllrb.com/docs/frontmatter/) declaration `layout: default`. + - `home.html` — The layout for your landing-page / home-page / index-page. + - `page.html` — The layout for your documents that contain FrontMatter, but are not posts. + - `post.html` — The layout for your posts. + +### Includes + +Refers to snippets of code within the `_includes` directory that can be inserted in multiple layouts (and another include-file as well) within the same theme-gem. + + - `disqus_comments.html` — Code to markup disqus comment box. + - `footer.html` — Defines the site's footer section. + - `google-analytics.html` — Inserts Google Analytics module (active only in production environment). + - `head.html` — Code-block that defines the `` in *default* layout. + - `header.html` — Defines the site's main header section. + - `icon-* files` — Inserts github and twitter ids with respective icons. + +### Sass + +Refers to `.scss` files within the `_sass` directory that define the theme's styles. + + - `minima.scss` — The core file imported by preprocessed `main.scss`, it defines the variable defaults for the theme and also further imports sass partials to supplement itself. + - `minima/_base.scss` — Resets and defines base styles for various HTML elements. + - `minima/_layout.scss` — Defines the visual style for various layouts. + - `minima/_syntax-highlighting.scss` — Defines the styles for syntax-highlighting. + +### Assets + +Refers to various asset files within the `assets` directory. +Contains the `main.scss` that imports sass files from within the `_sass` directory. This `main.scss` is what gets processed into the theme's main stylesheet `main.css` called by `_layouts/default.html` via `_includes/head.html`. + +This directory can include sub-directories to manage assets of similar type, and will be copied over as is, to the final transformed site directory. + ## Usage From a9e0ccccc1fb80710fc3d69e76c49efaff56b272 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 7 Apr 2017 12:38:54 -0400 Subject: [PATCH 19/26] Update history to reflect merge of #91 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index f73dea2639..2420cb89d3 100644 --- a/History.markdown +++ b/History.markdown @@ -15,6 +15,10 @@ * Remove duplicate .sass-cache (#71) +### Documentation + + * Update README with theme content description (#91) + ## 2.1.0 / 2016-11-15 ### Minor Enhancements From 1cc1286fc2ae7d0d769b2c3829f8a89228751fb5 Mon Sep 17 00:00:00 2001 From: Adrian Ghiuta Date: Fri, 7 Apr 2017 19:48:37 +0300 Subject: [PATCH 20/26] only include the nav tag if there are pages to be displayed in the menu (#116) Merge pull request 116 --- _includes/header.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 365cc36daa..88e0c68da8 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -4,26 +4,26 @@ {% assign default_paths = site.pages | map: "path" %} {% assign page_paths = site.header_pages | default: default_paths %} {{ site.title | escape }} + + {% if page_paths %} + + {% endif %}