From 1c6589bb1cb815a8bfcdaf0d2b9a1542bd4a402a Mon Sep 17 00:00:00 2001
From: Jason Frey <fryguy9@gmail.com>
Date: Mon, 16 Dec 2024 13:59:13 -0500
Subject: [PATCH] [WIP] Upgrade bootstrap to v5

---
 Gemfile                      |  2 +-
 site/_plugins/sass_loader.rb |  2 +-
 site/_sass/_banner.scss      |  2 +-
 site/_sass/_colors.scss      |  2 +-
 site/_sass/_page.scss        |  2 +-
 site/_sass/_solutions.scss   |  2 +-
 site/_sass/_triad.scss       |  4 ++--
 site/_sass/_twbs_custom.scss | 21 +++++++++++----------
 site/assets/css/main.scss    |  1 -
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index 54ecb579b..c8bd4b982 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 ruby "~> 3.3.6"
 
 gem "activesupport", ">= 5.2.7", :require => false
-gem "bootstrap-sass", "~> 3.x"
+gem "bootstrap", "~> 5.3"
 gem "font-awesome-sass", "~> 6.5"
 gem "jekyll", "~> 4.3"
 gem "jekyll-paginate"
diff --git a/site/_plugins/sass_loader.rb b/site/_plugins/sass_loader.rb
index b5265b77b..7f85da2fb 100644
--- a/site/_plugins/sass_loader.rb
+++ b/site/_plugins/sass_loader.rb
@@ -1,5 +1,5 @@
 require "jekyll/converters/scss"
-require "bootstrap-sass"
+require "bootstrap"
 require "font-awesome-sass"
 
 # sass/load_paths configuration in _config.yml only supports hardcoded paths,
diff --git a/site/_sass/_banner.scss b/site/_sass/_banner.scss
index e700a46d8..4afd7bbe6 100644
--- a/site/_sass/_banner.scss
+++ b/site/_sass/_banner.scss
@@ -46,7 +46,7 @@ $banner_height_lg: 440px;
 .banner-content {
   // width: 60em;
   max-width: 100%;
-  @include container-fixed(0);
+  @extend .container-fluid !optional;
 
   z-index: 5;
 }
diff --git a/site/_sass/_colors.scss b/site/_sass/_colors.scss
index 9e777e481..d35776c07 100644
--- a/site/_sass/_colors.scss
+++ b/site/_sass/_colors.scss
@@ -28,7 +28,7 @@ $menu-link-color: lighten($grey-dark, 55%);
 
 @mixin banner_grad {
   // from Bootstrap
-  @include gradient-horizontal($banner-grad-dark, $banner-grad-lite, 0, 100%);
+  @include gradient-x($banner-grad-dark, $banner-grad-lite, 0, 100%);
 }
 
 // FIXME: Can ditch bootstrap mixin and simplify,
diff --git a/site/_sass/_page.scss b/site/_sass/_page.scss
index e1bc39b67..d2ea79a5b 100644
--- a/site/_sass/_page.scss
+++ b/site/_sass/_page.scss
@@ -13,7 +13,7 @@ main {
 
 .home_container {
   max-width: 867px;
-  @include container-fixed(0);
+  @extend .container-fluid !optional;
 }
 
 .flex_container {
diff --git a/site/_sass/_solutions.scss b/site/_sass/_solutions.scss
index b16f5c91f..43d7d838f 100644
--- a/site/_sass/_solutions.scss
+++ b/site/_sass/_solutions.scss
@@ -3,7 +3,7 @@ $solution_pad: 4em;
 .solutions {}
 
 .solution-container {
-  @include container-fixed(0);
+  @extend .container-fluid !optional;
   display: flex;
   max-width: 100%;
   justify-content: space-between;
diff --git a/site/_sass/_triad.scss b/site/_sass/_triad.scss
index 08d2c93a4..5799b432a 100644
--- a/site/_sass/_triad.scss
+++ b/site/_sass/_triad.scss
@@ -1,7 +1,7 @@
 
 .triad {
   max-width: 90%;
-  @include container-fixed(0);
+  @extend .container-fluid !optional;
 }
 
 .triad-heading {
@@ -64,7 +64,7 @@
   }
 
   .triad-col {
-    @include make-md-column(4, $triad-gutter);
+    @include make-col(4, $triad-gutter);
 
     border-right: 1px solid var(--color-border-primary);
 
diff --git a/site/_sass/_twbs_custom.scss b/site/_sass/_twbs_custom.scss
index 2735234af..60ca8ba65 100644
--- a/site/_sass/_twbs_custom.scss
+++ b/site/_sass/_twbs_custom.scss
@@ -1,12 +1,13 @@
-
+@import "bootstrap/functions";
 @import "bootstrap/variables";
+@import "bootstrap/maps";
 @import "bootstrap/mixins";
-@import "bootstrap/normalize";
-@import "bootstrap/print";
+// @import "bootstrap/normalize";
+// @import "bootstrap/print";
 // @import "bootstrap/glyphicons";
-@import "bootstrap/scaffolding";
-@import "bootstrap/type";
-@import "bootstrap/code";
+// @import "bootstrap/scaffolding";
+// @import "bootstrap/type";
+// @import "bootstrap/code";
 @import "bootstrap/grid";
 @import "bootstrap/tables";
 // @import "bootstrap/forms";
@@ -17,9 +18,9 @@
 // @import "bootstrap/input-groups";
 // @import "bootstrap/navs";
 // @import "bootstrap/navbar";
-@import "bootstrap/breadcrumbs";
+// @import "bootstrap/breadcrumbs";
 @import "bootstrap/pagination";
-@import "bootstrap/pager";
+// @import "bootstrap/pager";
 // @import "bootstrap/labels";
 // @import "bootstrap/badges";
 // @import "bootstrap/jumbotron";
@@ -29,7 +30,7 @@
 // @import "bootstrap/media";
 // @import "bootstrap/list-group";
 // @import "bootstrap/panels";
-@import "bootstrap/responsive-embed";
+// @import "bootstrap/responsive-embed";
 // @import "bootstrap/wells";
 // @import "bootstrap/close";
 // @import "bootstrap/modals";
@@ -37,4 +38,4 @@
 // @import "bootstrap/popovers";
 // @import "bootstrap/carousel";
 @import "bootstrap/utilities";
-@import "bootstrap/responsive-utilities";
+// @import "bootstrap/responsive-utilities";
diff --git a/site/assets/css/main.scss b/site/assets/css/main.scss
index c59695046..b67b94dbe 100644
--- a/site/assets/css/main.scss
+++ b/site/assets/css/main.scss
@@ -3,7 +3,6 @@
 
 @charset "utf-8";
 
-$font-size-base: 16px;
 $fa-font-path: "../fonts/font-awesome";
 
 @import "font-awesome";