Skip to content

Commit f3a3b10

Browse files
committed
[WIP] Upgrade bootstrap to v5
1 parent 77a036b commit f3a3b10

File tree

9 files changed

+19
-33
lines changed

9 files changed

+19
-33
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
ruby "~> 3.3.6"
44

55
gem "activesupport", ">= 5.2.7", :require => false
6-
gem "bootstrap-sass", "~> 3.x"
6+
gem "bootstrap", "~> 5.3"
77
gem "font-awesome-sass", "~> 6.5"
88
gem "jekyll", "~> 4.3"
99
gem "jekyll-paginate"

site/_plugins/sass_loader.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require "jekyll/converters/scss"
2-
require "bootstrap-sass"
2+
require "bootstrap"
33
require "font-awesome-sass"
44

55
# sass/load_paths configuration in _config.yml only supports hardcoded paths,

site/_sass/_banner.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ $banner_height_lg: 440px;
4646
.banner-content {
4747
// width: 60em;
4848
max-width: 100%;
49-
@include container-fixed(0);
49+
@extend .container-fluid !optional;
5050

5151
z-index: 5;
5252
}

site/_sass/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ $menu-link-color: lighten($grey-dark, 55%);
2828

2929
@mixin banner_grad {
3030
// from Bootstrap
31-
@include gradient-horizontal($banner-grad-dark, $banner-grad-lite, 0, 100%);
31+
@include gradient-x($banner-grad-dark, $banner-grad-lite, 0, 100%);
3232
}
3333

3434
// FIXME: Can ditch bootstrap mixin and simplify,

site/_sass/_page.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ main {
1313

1414
.home_container {
1515
max-width: 867px;
16-
@include container-fixed(0);
16+
@extend .container-fluid !optional;
1717
}
1818

1919
.flex_container {

site/_sass/_solutions.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ $solution_pad: 4em;
33
.solutions {}
44

55
.solution-container {
6-
@include container-fixed(0);
6+
@extend .container-fluid !optional;
77
display: flex;
88
max-width: 100%;
99
justify-content: space-between;

site/_sass/_triad.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
.triad {
33
max-width: 90%;
4-
@include container-fixed(0);
4+
@extend .container-fluid !optional;
55
}
66

77
.triad-heading {
@@ -64,7 +64,7 @@
6464
}
6565

6666
.triad-col {
67-
@include make-md-column(4, $triad-gutter);
67+
@include make-col(4, $triad-gutter);
6868

6969
border-right: 1px solid var(--color-border-primary);
7070

site/_sass/_twbs_custom.scss

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
1+
@import "bootstrap/functions";
22
@import "bootstrap/variables";
3+
@import "bootstrap/maps";
34
@import "bootstrap/mixins";
4-
@import "bootstrap/normalize";
5-
@import "bootstrap/print";
5+
// @import "bootstrap/normalize";
6+
// @import "bootstrap/print";
67
// @import "bootstrap/glyphicons";
7-
@import "bootstrap/scaffolding";
8-
@import "bootstrap/type";
9-
@import "bootstrap/code";
8+
// @import "bootstrap/scaffolding";
9+
// @import "bootstrap/type";
10+
// @import "bootstrap/code";
1011
@import "bootstrap/grid";
1112
@import "bootstrap/tables";
1213
// @import "bootstrap/forms";
@@ -17,9 +18,9 @@
1718
// @import "bootstrap/input-groups";
1819
// @import "bootstrap/navs";
1920
// @import "bootstrap/navbar";
20-
@import "bootstrap/breadcrumbs";
21+
// @import "bootstrap/breadcrumbs";
2122
@import "bootstrap/pagination";
22-
@import "bootstrap/pager";
23+
// @import "bootstrap/pager";
2324
// @import "bootstrap/labels";
2425
// @import "bootstrap/badges";
2526
// @import "bootstrap/jumbotron";
@@ -29,12 +30,12 @@
2930
// @import "bootstrap/media";
3031
// @import "bootstrap/list-group";
3132
// @import "bootstrap/panels";
32-
@import "bootstrap/responsive-embed";
33+
// @import "bootstrap/responsive-embed";
3334
// @import "bootstrap/wells";
3435
// @import "bootstrap/close";
3536
// @import "bootstrap/modals";
3637
// @import "bootstrap/tooltip";
3738
// @import "bootstrap/popovers";
3839
// @import "bootstrap/carousel";
3940
@import "bootstrap/utilities";
40-
@import "bootstrap/responsive-utilities";
41+
// @import "bootstrap/responsive-utilities";

site/assets/css/main.scss

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,12 @@
33

44
@charset "utf-8";
55

6-
$font-size-base: 16px;
76
$fa-font-path: "../fonts/font-awesome";
87

98
@import "font-awesome";
109
@import "twbs_custom";
1110
@import "twbs_overrides";
1211

13-
// Undo Bootstrap pixel font-size
14-
// http://fvsch.com/code/css-locks/#toc-2d
15-
16-
/*
17-
* Redefine the rem value while keeping it proportional.
18-
* Useful values, with default font-size of 16px:
19-
* • 62.5% -> 1rem = 10px, .1rem = 1px
20-
* • 125% -> 1rem = 20px, .05rem = 1px
21-
*/
22-
html {
23-
font-size: 62.5%;
24-
overflow-x: hidden; // deals with off-canvas issue
25-
}
26-
2712
// Breakpoints, mobile first
2813

2914
$bp-desk0: 768px;

0 commit comments

Comments
 (0)