Skip to content

Commit

Permalink
preparing for jekyll 3.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MattReimer committed Sep 4, 2020
1 parent 39b0d3d commit d2e63e4
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 34 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ env:
matrix:
- JEKYLL_VERSION="~> 3.5"
- JEKYLL_VERSION="~> 3.8.0"
- JEKYLL_VERSION="~> 3.9.0"
- JEKYLL_VERSION=">= 4.0.0.pre.alpha1"
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"
gemspec


gem "jekyll", "3.8.7"
gem "jekyll", "3.9.0"
6 changes: 3 additions & 3 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ settings:
active: true
onHome: false
# Options for the sidebar menu
sideMenu:
homeItem: true
startExpanded: false
# sideMenu:
# homeItem: true
# startExpanded: false
# Arbitrary multi-level topbar menu
# IF you don't need this just comment out everything below
# ----------------------------------
Expand Down
4 changes: 3 additions & 1 deletion assets/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ function getUrlParameter(name) {
* @return {[type]}
*/
function accordionize(t, $mUL) {
if (!SiteSettings.sideMenu) return
// The first time we have to build the ul
if (!$mUL) {
$mUL = $('<ul id="topmenu" class="vertical menu accordion-menu hide" data-accordion-menu data-submenu-toggle="true"></ul>');
Expand Down Expand Up @@ -243,6 +244,7 @@ function getUrlParameter(name) {
* @param {any} $sidebar
*/
function expandCurentAccordion($sidebar) {
if (!$sidebar) return
$menuEl = $sidebar.find("[href='"+window.location.pathname+"']");
$menuEl.addClass('menuActive');

Expand Down Expand Up @@ -280,7 +282,7 @@ function getUrlParameter(name) {
})

// Bind our buttons to menu actions
if (SiteSettings.sideMenu.startExpanded){
if (SiteSettings.sideMenu && SiteSettings.sideMenu.startExpanded){
$sidebarnav.foundation('showAll');
}
$('#menuCtls #expand').click(function(){
Expand Down
4 changes: 2 additions & 2 deletions docs/Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

source "https://rubygems.org"
gem "jekyll", "3.8.7"
gem "jekyll-remote-theme"
gem "jekyll", "3.9.0"
gem "jekyll-remote-theme", "0.4.2"
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "web_riverscapes",
"version": "1.0.0",
"name": "riverscapes-jekyll-theme",
"version": "1.1.0",
"description": "The riverscapes theme",
"main": "index.js",
"dependencies": {},
"devDependencies": {
"font-awesome": "4.7.0",
"foundation-sites": "6.6.1",
"jquery": "3.5.0",
"motion-ui": "1.2.3",
"what-input": "5.2.6"
"foundation-sites": "6.6.3",
"jquery": "3.5.1",
"motion-ui": "2.0.3",
"what-input": "5.2.10"
},
"scripts": {
"build": "script/build.sh",
Expand Down
2 changes: 1 addition & 1 deletion riverscapes-jekyll-theme.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Gem::Specification.new do |spec|
spec.name = "riverscapes-jekyll-theme"
spec.version = "0.1.0"
spec.version = "0.2.0"
spec.authors = ["Matt Reimer"]
spec.email = ["[email protected]"]

Expand Down
33 changes: 13 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,22 @@ [email protected]:
resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=

[email protected].1:
version "6.6.1"
resolved "https://registry.yarnpkg.com/foundation-sites/-/foundation-sites-6.6.1.tgz#79dce2f897cc08fafa7e8d56f5b0e88b51c45d38"
integrity sha512-4GrCL8L3osFJM6WCNRIQs5kGX5BCKNuO2zzQN68lUTblgpH7FUE28ctkbNFqoTnkUmWARj5VtiS3oQob3H0eZA==
[email protected].3:
version "6.6.3"
resolved "https://registry.yarnpkg.com/foundation-sites/-/foundation-sites-6.6.3.tgz#8ca5f246357db69e6a0e73351ce06aa8acce6540"
integrity sha512-8X93wUAmUg1HhVv8uWMWnwoBLSQWSmFImJencneIZDctswn724Bq/MV1cbPZN/GFWGOB/9ngoQHztfzd4+ovCg==

[email protected]:
version "3.5.0"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==

jquery@>=2.2.0:
[email protected]:
version "3.5.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==

[email protected]:
version "1.2.3"
resolved "https://registry.yarnpkg.com/motion-ui/-/motion-ui-1.2.3.tgz#9f7e17f0d66a15e9ee549023e6f3de1139a2e166"
integrity sha1-n34X8NZqFenuVJAj5vPeETmi4WY=
dependencies:
jquery ">=2.2.0"
[email protected]:
version "2.0.3"
resolved "https://registry.yarnpkg.com/motion-ui/-/motion-ui-2.0.3.tgz#3a87f8fea4512d654c0822a0b346f23dadf0d0b7"
integrity sha512-f9xzh/hbZTUYjk4M7y1aDcsiPTfqUbuvCv/+If05TSIBEJMu3hGBU+YSe9csQPP7WBBHXxjossEygM/TJo2enw==

[email protected].6:
version "5.2.6"
resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.6.tgz#ac6f003bf8d3592a0031dea7a03565469b00020b"
integrity sha512-a0BcI5YR7xp87vSzGcbN0IszJKpUQuTmrZaTSQBl7TLDIdKj6rDhluQ7b/7lYGG81gWDvkySsEvwv4BW5an9kg==
[email protected].10:
version "5.2.10"
resolved "https://registry.yarnpkg.com/what-input/-/what-input-5.2.10.tgz#f79f5b65cf95d75e55e6d580bb0a6b98174cad4e"
integrity sha512-7AQoIMGq7uU8esmKniOtZG3A+pzlwgeyFpkS3f/yzRbxknSL68tvn5gjE6bZ4OMFxCPjpaBd2udUTqlZ0HwrXQ==

0 comments on commit d2e63e4

Please sign in to comment.