From 152adf53c666cc31d22d22c5da8482dd30a10a5d Mon Sep 17 00:00:00 2001 From: Eddie A Tejeda Date: Wed, 20 Nov 2019 11:12:17 -0500 Subject: [PATCH 1/9] add jekyll-assets gem --- Gemfile | 11 ++--------- Gemfile.lock | 46 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index d51715df..4f6c21e8 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.8.4" +gem "jekyll", "~> 3.8" # If you have any plugins, put them here! @@ -18,20 +18,13 @@ group :jekyll_plugins do gem 'jekyll-paginate-v2', "2.0" gem 'jekyll-sitemap' gem 'jekyll-seo-tag' - - # jekyll_pages_api_search is useful gem, but needs updating - # to support the latest version of Jekyll - # gem 'jekyll_pages_api_search' - + gem "jekyll-assets", "~> 3.0", group: :jekyll_plugins end - - # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] # Performance-booster for watching directories on Windows gem "wdm", "~> 0.1.0" if Gem.win_platform? - gem "html-proofer", "~> 3.10" diff --git a/Gemfile.lock b/Gemfile.lock index 72c64f08..32843280 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,7 +17,17 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) eventmachine (1.2.7) + eventmachine (1.2.7-java) + eventmachine (1.2.7-x64-mingw32) + eventmachine (1.2.7-x86-mingw32) + execjs (2.7.0) + extras (0.3.0) + forwardable-extended (~> 2.5) + fastimage (2.1.7) ffi (1.10.0) + ffi (1.10.0-java) + ffi (1.10.0-x64-mingw32) + ffi (1.10.0-x86-mingw32) forwardable-extended (2.6.0) html-proofer (3.10.1) activesupport (>= 4.2, < 6.0) @@ -29,6 +39,7 @@ GEM typhoeus (~> 1.3) yell (~> 2.0) http_parser.rb (0.6.0) + http_parser.rb (0.6.0-java) i18n (0.9.5) concurrent-ruby (~> 1.0) jekyll (3.8.5) @@ -44,12 +55,25 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) + jekyll-assets (3.0.12) + activesupport (~> 5.0) + execjs (~> 2.7) + extras (~> 0.2) + fastimage (~> 2.0, >= 1.8) + jekyll (>= 3.5, < 4.0) + jekyll-sanity (~> 1.2) + liquid-tag-parser (~> 1.0) + nokogiri (~> 1.8) + pathutil (~> 0.16) + sprockets (>= 3.3, < 4.1.beta) jekyll-feed (0.11.0) jekyll (~> 3.3) jekyll-paginate-v2 (2.0.0) jekyll (~> 3.0) jekyll-redirect-from (0.14.0) jekyll (~> 3.3) + jekyll-sanity (1.2.0) + jekyll (~> 3.1) jekyll-sass-converter (1.5.2) sass (~> 3.4) jekyll-seo-tag (2.6.0) @@ -60,6 +84,9 @@ GEM listen (~> 3.0) kramdown (1.17.0) liquid (4.0.1) + liquid-tag-parser (1.9.0) + extras (~> 0.3) + liquid (>= 3.0, < 5.0) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -69,10 +96,16 @@ GEM minitest (5.11.3) nokogiri (1.10.4) mini_portile2 (~> 2.4.0) + nokogiri (1.10.4-java) + nokogiri (1.10.4-x64-mingw32) + mini_portile2 (~> 2.4.0) + nokogiri (1.10.4-x86-mingw32) + mini_portile2 (~> 2.4.0) parallel (1.13.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (3.0.3) + rack (2.0.7) rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) @@ -84,19 +117,30 @@ GEM sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) thread_safe (0.3.6) + thread_safe (0.3.6-java) typhoeus (1.3.1) ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) + tzinfo-data (1.2019.3) + tzinfo (>= 1.0.0) yell (2.0.7) PLATFORMS + java ruby + x64-mingw32 + x86-mingw32 + x86-mswin32 DEPENDENCIES html-proofer (~> 3.10) - jekyll (~> 3.8.4) + jekyll (~> 3.8) + jekyll-assets (~> 3.0) jekyll-feed (~> 0.6) jekyll-paginate-v2 (= 2.0) jekyll-redirect-from From d2d88b2c80148a92a4929e8df5f275372197b12a Mon Sep 17 00:00:00 2001 From: Eddie A Tejeda Date: Mon, 25 Nov 2019 16:48:36 -0500 Subject: [PATCH 2/9] remove default sass folder and rename assets index js/css --- _sass/.gitkeep | 0 {src => assets}/css/app.css | 0 assets/css/{styles.scss => index.scss} | 0 src/js/app.js | 1 - 4 files changed, 1 deletion(-) delete mode 100644 _sass/.gitkeep rename {src => assets}/css/app.css (100%) rename assets/css/{styles.scss => index.scss} (100%) delete mode 100644 src/js/app.js diff --git a/_sass/.gitkeep b/_sass/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/css/app.css b/assets/css/app.css similarity index 100% rename from src/css/app.css rename to assets/css/app.css diff --git a/assets/css/styles.scss b/assets/css/index.scss similarity index 100% rename from assets/css/styles.scss rename to assets/css/index.scss diff --git a/src/js/app.js b/src/js/app.js deleted file mode 100644 index 1d393e70..00000000 --- a/src/js/app.js +++ /dev/null @@ -1 +0,0 @@ -// Add your custom javascript here \ No newline at end of file From bf9e85315a7fecd927fc27a81cdb32a0da35b036 Mon Sep 17 00:00:00 2001 From: Eddie A Tejeda Date: Mon, 25 Nov 2019 16:49:51 -0500 Subject: [PATCH 3/9] add build script in ruby to be cross platform --- build.rb | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 build.rb diff --git a/build.rb b/build.rb new file mode 100644 index 00000000..ffe34cc2 --- /dev/null +++ b/build.rb @@ -0,0 +1,19 @@ +require 'fileutils' + + + +case ARGV.first +when "clean" + puts "> cleaning..." + FileUtils.rm_rf('assets/uswds') + FileUtils.rm_rf('_site') +when "uswds" + puts "> building USWDS..." + FileUtils.mkdir_p 'assets/uswds' + FileUtils.cp_r "node_modules/uswds/dist/css", "assets/uswds/" + FileUtils.cp_r "node_modules/uswds/dist/img", "assets/uswds/" + FileUtils.cp_r "node_modules/uswds/dist/fonts", "assets/uswds/" + FileUtils.cp_r "node_modules/uswds/dist/js", "assets/uswds/" +else + "Not an option" +end \ No newline at end of file From 7b25574a526edc9065aca31db34cf19b9926f0fb Mon Sep 17 00:00:00 2001 From: Eddie A Tejeda Date: Mon, 25 Nov 2019 16:50:21 -0500 Subject: [PATCH 4/9] split logo into its own include --- _includes/logo.html | 3 +++ _includes/menu.html | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 _includes/logo.html diff --git a/_includes/logo.html b/_includes/logo.html new file mode 100644 index 00000000..638777da --- /dev/null +++ b/_includes/logo.html @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/_includes/menu.html b/_includes/menu.html index db57bd52..6690d114 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -5,9 +5,8 @@