From 1f18f338ff684cbc40639fe93f9bd067257ca729 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Thu, 21 Mar 2024 07:45:31 -0400 Subject: [PATCH] Stop using CDN for bootstrap and datatables. Continue for font awesome, I could not get it working locally. --- Gemfile.lock | 30 ++-- app/assets/javascripts/application.js | 4 + app/assets/stylesheets/application.css | 4 + app/views/layouts/_cdn.html.erb | 12 +- app/views/layouts/application.html.erb | 3 + vendor/assets/javascripts/bootstrap.min.js | 7 + .../javascripts/jquery.dataTables.min.js | 158 ++++++++++++++++++ .../stylesheets/bootstrap-theme.min.css | 6 + vendor/assets/stylesheets/bootstrap.min.css | 6 + 9 files changed, 204 insertions(+), 26 deletions(-) create mode 100644 vendor/assets/javascripts/bootstrap.min.js create mode 100644 vendor/assets/javascripts/jquery.dataTables.min.js create mode 100644 vendor/assets/stylesheets/bootstrap-theme.min.css create mode 100644 vendor/assets/stylesheets/bootstrap.min.css diff --git a/Gemfile.lock b/Gemfile.lock index 4f7a79e..893a0cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -167,18 +167,18 @@ GEM net-smtp (0.4.0.1) net-protocol newrelic_rpm (9.7.1) - nio4r (2.7.0) - nokogiri (1.16.2-aarch64-linux) + nio4r (2.7.1) + nokogiri (1.16.3-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.2-arm-linux) + nokogiri (1.16.3-arm-linux) racc (~> 1.4) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86-linux) + nokogiri (1.16.3-x86-linux) racc (~> 1.4) - nokogiri (1.16.2-x86_64-darwin) + nokogiri (1.16.3-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) orm_adapter (0.5.0) parallel (1.24.0) @@ -193,7 +193,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (3.0.9.1) + rack (3.0.10) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) @@ -241,7 +241,7 @@ GEM rainbow (3.1.1) rake (13.1.0) rb-readline (0.5.5) - rdoc (6.6.2) + rdoc (6.6.3.1) psych (>= 4.0.0) regexp_parser (2.9.0) reline (0.4.3) @@ -282,12 +282,12 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.7.2-aarch64-linux) - sqlite3 (1.7.2-arm-linux) - sqlite3 (1.7.2-arm64-darwin) - sqlite3 (1.7.2-x86-linux) - sqlite3 (1.7.2-x86_64-darwin) - sqlite3 (1.7.2-x86_64-linux) + sqlite3 (1.7.3-aarch64-linux) + sqlite3 (1.7.3-arm-linux) + sqlite3 (1.7.3-arm64-darwin) + sqlite3 (1.7.3-x86-linux) + sqlite3 (1.7.3-x86_64-darwin) + sqlite3 (1.7.3-x86_64-linux) stringio (3.1.0) thor (1.3.1) tilt (2.3.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b399845..d33a61c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,4 +13,8 @@ //= require_tree . //= require jquery //= require jquery_ujs +// Bootstrap 3.3.6 in vendor/assets/javascripts +//= require bootstrap.min.js +// Data Tables 1.10.6 in vendor/assets/javascripts +//= require jquery.dataTables.min.js diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 2e6e7ab..82024f4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,8 @@ * *= require_tree . *= require_self + * Bootstrap 3.3.6 in vendor/assets/stylesheets + *= require bootstrap.min.css + *= require bootstrap-theme.min.css + */ \ No newline at end of file diff --git a/app/views/layouts/_cdn.html.erb b/app/views/layouts/_cdn.html.erb index 02a3c20..5806747 100644 --- a/app/views/layouts/_cdn.html.erb +++ b/app/views/layouts/_cdn.html.erb @@ -1,17 +1,7 @@ - - - - - - - - - - - +