From 7680511ddd8e21fa79eb0b4b440f40d480f88276 Mon Sep 17 00:00:00 2001 From: rien Date: Fri, 16 Aug 2019 10:30:21 +0200 Subject: [PATCH] release 2.4.2 --- Gemfile.lock | 34 +++++++++--------- README.md | 3 +- _posts/2019-08-16-release-2-4-2.md | 17 +++++++++ _sass/classic-jekyll-theme.scss | 21 +++++++---- _sass/classic/_custom.scss | 2 +- _sass/classic/_menubar.scss | 31 +++++++++++----- classic-jekyll-theme.gemspec | 6 ++-- pages/jekyll/04-cron-job.md | 58 +++++++++++++----------------- 8 files changed, 102 insertions(+), 70 deletions(-) create mode 100644 _posts/2019-08-16-release-2-4-2.md diff --git a/Gemfile.lock b/Gemfile.lock index 3878603..29ecd98 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - classic-jekyll-theme (2.3.0) + classic-jekyll-theme (2.4.2) jekyll (~> 3.5, >= 3.5.1) jekyll-data (>= 0.4, < 2.0) jekyll-feed (~> 0.8) @@ -9,20 +9,20 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.5.2) + addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) colorator (1.1.0) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.10.0) + ffi (1.11.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.5) + jekyll (3.8.6) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -37,14 +37,14 @@ GEM safe_yaml (~> 1.0) jekyll-data (1.0.0) jekyll (~> 3.3) - jekyll-feed (0.11.0) - jekyll (~> 3.3) + jekyll-feed (0.12.1) + jekyll (>= 3.7, < 5.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-watch (2.1.2) + jekyll-watch (2.2.1) listen (~> 3.0) kramdown (1.17.0) - liquid (4.0.1) + liquid (4.0.3) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -52,15 +52,15 @@ GEM mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.0.3) - rake (10.5.0) + public_suffix (3.1.1) + rake (12.3.3) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.3.0) + rouge (3.8.0) ruby_dep (1.5.0) - safe_yaml (1.0.4) - sass (3.7.3) + safe_yaml (1.0.5) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -70,9 +70,9 @@ PLATFORMS ruby DEPENDENCIES - bundler (~> 1.12) + bundler (~> 2.0) classic-jekyll-theme! - rake (~> 10.0) + rake (~> 12.0) BUNDLED WITH - 1.16.3 + 2.0.2 diff --git a/README.md b/README.md index 692ca40..bf79975 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Classic-Jekyll-Theme v2.4.0 +# Classic-Jekyll-Theme v2.4.2 Welcome to Classic-Jekyll-Theme. This theme centers around one of the most used website structures on the web. A banner, navigation menu (dropdown), (up to) three columns and a footer. The design is fully responsive for three different screen widths: widest, medium and narrow. It is probably best shown in an example: @@ -87,6 +87,7 @@ Please see [http://balancingrock.github.io/classic-jekyll-theme](http://balancin - [Release 2.2.0 (2018-02-02)](http://balancingrock.github.io/classic-jekyll-theme/classic/2018/02/02/release-2-2-0.html) - [Release 2.3.0 (2018-02-05)](http://balancingrock.github.io/classic-jekyll-theme/classic/2018/02/05/release-2-3-0.html) - [Release 2.4.0 (2019-01-15)](http://balancingrock.github.io/classic-jekyll-theme//2019/01/15/release-2-4-0.html) +- [Release 2.4.2 (2019-08-16)](http://balancingrock.github.io/classic-jekyll-theme//2019/08/16/release-2-4-2.html) ## Suport & Feedback diff --git a/_posts/2019-08-16-release-2-4-2.md b/_posts/2019-08-16-release-2-4-2.md new file mode 100644 index 0000000..e761048 --- /dev/null +++ b/_posts/2019-08-16-release-2-4-2.md @@ -0,0 +1,17 @@ +--- +layout: post +title: Release 2.4.2 +date: 2019-08-16 +menuInclude: no +--- +This release addresses an omission that was made when creating v2.0. + +Up to now it was not posible to specify the color of a menu item when it was selected, though it was possible to specify the background color. This has now been fixed. + +The files `_sass/classic/_menubar.scss` has undergone a few minor updates, and in the file `_sass/classic-jekyll-theme.scss` some additions have been made. + +To keep the naming of items harmonised, the `...item-hover-color-...` names have been converted into `...item-color-hover-...` + +A page over creating cron-jobs (on MacOS) to facilitate automatic site generation has been added (under the menu item 'Jekyll') + +And lastly the version numbers for bundler and rake have been updated. \ No newline at end of file diff --git a/_sass/classic-jekyll-theme.scss b/_sass/classic-jekyll-theme.scss index 719abef..a3bcbac 100644 --- a/_sass/classic-jekyll-theme.scss +++ b/_sass/classic-jekyll-theme.scss @@ -576,17 +576,24 @@ $menubar-subsubitem-font-widest: $menubar-subitem-font-widest; $menubar-item-color-narrow: $theme-color; $menubar-item-color-medium: $theme-color; $menubar-item-color-widest: $theme-color; -$menubar-item-hover-color-narrow: black; -$menubar-item-hover-color-medium: black; -$menubar-item-hover-color-widest: black; +$menubar-item-color-hover-narrow: black; +$menubar-item-color-hover-medium: black; +$menubar-item-color-hover-widest: black; +$menubar-item-color-selected-narrow: $theme-color; +$menubar-item-color-selected-medium: $theme-color; +$menubar-item-color-selected-widest: $theme-color; $menubar-subitem-color-medium: $theme-color; $menubar-subitem-color-widest: $theme-color; -$menubar-subitem-hover-color-medium: black; -$menubar-subitem-hover-color-widest: black; +$menubar-subitem-color-hover-medium: black; +$menubar-subitem-color-hover-widest: black; +$menubar-subitem-color-selected-medium: $theme-color; +$menubar-subitem-color-selected-widest: $theme-color; $menubar-subsubitem-color-medium: $menubar-subitem-color-medium; $menubar-subsubitem-color-widest: $menubar-subitem-color-widest; -$menubar-subsubitem-hover-color-medium: $menubar-subitem-hover-color-medium; -$menubar-subsubitem-hover-color-widest: $menubar-subitem-hover-color-widest; +$menubar-subsubitem-color-hover-medium: $menubar-subitem-color-hover-medium; +$menubar-subsubitem-color-hover-widest: $menubar-subitem-color-hover-widest; +$menubar-subsubitem-color-selected-medium: $menubar-subitem-color-selected-medium; +$menubar-subsubitem-color-selected-widest: $menubar-subitem-color-selected-widest; // The background & hover background & active-page background to be used for an entry // The selected background is used when an item is visible and the page that is linked to is visible. diff --git a/_sass/classic/_custom.scss b/_sass/classic/_custom.scss index 33ad0e7..1938464 100644 --- a/_sass/classic/_custom.scss +++ b/_sass/classic/_custom.scss @@ -130,7 +130,7 @@ // =============================================================== .highlighter-rouge { - background: #fc9; + background: #eee; } .highlight { diff --git a/_sass/classic/_menubar.scss b/_sass/classic/_menubar.scss index d9fb1ce..74d3e0c 100644 --- a/_sass/classic/_menubar.scss +++ b/_sass/classic/_menubar.scss @@ -102,7 +102,7 @@ p { color: $menubar-item-color-narrow; } // Hover effect - &:hover { p { color: $menubar-item-hover-color-narrow; } } + &:hover { p { color: $menubar-item-color-hover-narrow; } } } } @@ -199,7 +199,10 @@ } } - .isActiveSelection { background: $menubar-item-background-selected-narrow; } + .isActiveSelection { + background: $menubar-item-background-selected-narrow; + .title .text p { color: $menubar-item-color-selected-narrow } + } } @include medium-and-widest-layout { @@ -329,8 +332,8 @@ p { // Change font color - @include medium-layout { color: $menubar-item-hover-color-medium; } - @include widest-layout { color: $menubar-item-hover-color-widest; } + @include medium-layout { color: $menubar-item-color-hover-medium; } + @include widest-layout { color: $menubar-item-color-hover-widest; } } // Change item background @@ -413,8 +416,8 @@ .sub-dropdown { display: flex; } p { - @include medium-layout { color: $menubar-subitem-hover-color-medium; } - @include widest-layout { color: $menubar-subitem-hover-color-widest; } + @include medium-layout { color: $menubar-subitem-color-hover-medium; } + @include widest-layout { color: $menubar-subitem-color-hover-widest; } } @include medium-layout { background: $menubar-subitem-background-hover-medium; } @@ -472,8 +475,8 @@ // Hover effect &:hover { p { - @include medium-layout { color: $menubar-subsubitem-hover-color-medium; } - @include widest-layout { color: $menubar-subsubitem-hover-color-widest; } + @include medium-layout { color: $menubar-subsubitem-color-hover-medium; } + @include widest-layout { color: $menubar-subsubitem-color-hover-widest; } } @include medium-layout { background: $menubar-subsubitem-background-hover-medium; } @@ -492,6 +495,10 @@ .isActiveSelection { @include medium-layout { background: $menubar-subsubitem-background-selected-medium; } @include widest-layout { background: $menubar-subsubitem-background-selected-widest; } + p { + @include medium-layout { color: $menubar-subsubitem-color-selected-medium; } + @include widest-layout { color: $menubar-subsubitem-color-selected-widest; } + } } } } @@ -501,6 +508,10 @@ .isActiveSelection { @include medium-layout { background: $menubar-subitem-background-selected-medium; } @include widest-layout { background: $menubar-subitem-background-selected-widest; } + p { + @include medium-layout { color: $menubar-subitem-color-selected-medium; } + @include widest-layout { color: $menubar-subitem-color-selected-widest; } + } } } } @@ -510,6 +521,10 @@ .isActiveSelection { @include medium-layout { background: $menubar-item-background-selected-medium; } @include widest-layout { background: $menubar-item-background-selected-widest; } + p { + @include medium-layout { color: $menubar-item-color-selected-medium; } + @include widest-layout { color: $menubar-item-color-selected-widest; } + } } } } diff --git a/classic-jekyll-theme.gemspec b/classic-jekyll-theme.gemspec index 7c0b174..dead4c1 100644 --- a/classic-jekyll-theme.gemspec +++ b/classic-jekyll-theme.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "classic-jekyll-theme" - spec.version = "2.4.1" + spec.version = "2.4.2" spec.authors = ["Rien"] spec.email = ["rien@balancingrock.nl"] @@ -17,6 +17,6 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "jekyll-feed", "~> 0.8" spec.add_runtime_dependency "jekyll-data", ">= 0.4", "< 2.0" - spec.add_development_dependency "bundler", "~> 1.12" - spec.add_development_dependency "rake", "~> 10.0" + spec.add_development_dependency "bundler", "~> 2.0" + spec.add_development_dependency "rake", "~> 12.0" end diff --git a/pages/jekyll/04-cron-job.md b/pages/jekyll/04-cron-job.md index 00e7c44..b559874 100644 --- a/pages/jekyll/04-cron-job.md +++ b/pages/jekyll/04-cron-job.md @@ -5,8 +5,8 @@ date: 2018-02-05 menuInclude: yes menuTopTitle: Jekyll menuSubs: -- title: Ruby environment - index: 3 +- title: Create website from git periodically and automatically + index: 4 tertiary-column: none excerpt: How to set up the daily creation of a website with jekyll and git... --- @@ -65,9 +65,7 @@ Any location will work, this example uses: `/Users/rien/Documents/Websites/mysit Goto the `/Websites` directory and create the git repository that will be used by the script. -~~~~~ git clone <> -~~~~~ The <> should be the path to the git-server repository and end in 'mysite' or 'mysite.git' @@ -77,7 +75,6 @@ This command also creates the directory `/mysite` This script is located at the user level (in this case: `Users/rien`) and lets call it `mysite-daily-update.script`. -~~~~~ #! /bin/bash echo "$(date) start" cd /Users/rien/Documents/Websites/mysite @@ -89,7 +86,6 @@ This script is located at the user level (in this case: `Users/rien`) and lets c echo "sync site" rsync -av _site/ /Library/Server/Web/Data/Sites/mysite echo "$(date) ready" -~~~~~ What happens: @@ -116,29 +112,29 @@ In the directory `~/Library/LaunchAgents` create a file with the name `com.mysit This file should contain the following: -~~~~~ - - - - - Label - com.mysite.daily-update - StandardOutPath - /Users/rien/mysite-daily-update.log - StandardErrorPath - /Users/rien/mysite-daily-update.error.log - Program - /Users/rien/mysite-daily-update.script - StartCalendarInterval - - Hour - 00 - Minute - 01 - - - -~~~~~ +```xml + + + + + Label + com.mysite.daily-update + StandardOutPath + /Users/rien/mysite-daily-update.log + StandardErrorPath + /Users/rien/mysite-daily-update.error.log + Program + /Users/rien/mysite-daily-update.script + StartCalendarInterval + + Hour + 00 + Minute + 01 + + + +``` One thing to notice is that this specification also tells the OS to create an error and a log file. These files are written to the users root directory and can be examined for error messages. @@ -150,15 +146,11 @@ Btw, a good resource for the capabilities and configuration of the launchd can b The job will be loaded automatically at startup. But right now you will need to load the job by hand: -~~~~~ launchctl load ~/Library/LaunchAgents/com.mysite.plist -~~~~~ Most likely you will also want to test the script, that can be done with: -~~~~~ launchctl start com.mysite.daily-update -~~~~~ The first couple of times, make sure to check for an error log in the `StandardErrorPath`. (Which in this example is the user home directory)