Update to the latest bootstrap and adjust the breakpoints and container-max-widths to reflect

This commit is contained in:
Kevin MacMartin 2020-02-25 18:02:59 -05:00
parent bcbfbf29f7
commit c6cf9a44a1
4 changed files with 22 additions and 10 deletions

6
package-lock.json generated
View file

@ -1414,9 +1414,9 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"bootstrap": { "bootstrap": {
"version": "4.3.1", "version": "4.4.1",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz",
"integrity": "sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==" "integrity": "sha512-tbx5cHubwE6e2ZG7nqM3g/FZ5PQEDMWmMGNrCUBVRPHXTJaH7CBDdsLeu3eCh3B1tzAxTnAbtmrzvWEvT2NNEA=="
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",

View file

@ -13,7 +13,7 @@
"@fortawesome/fontawesome-free": "^5.12.1", "@fortawesome/fontawesome-free": "^5.12.1",
"autoprefixer": "^9.7.4", "autoprefixer": "^9.7.4",
"babelify": "^10.0.0", "babelify": "^10.0.0",
"bootstrap": "4.3.1", "bootstrap": "4.4.1",
"browserify": "^16.5.0", "browserify": "^16.5.0",
"easymde": "^2.9.0", "easymde": "^2.9.0",
"fancy-log": "^1.3.3", "fancy-log": "^1.3.3",

View file

@ -9,15 +9,19 @@ $grid-breakpoints: (
md: 768px, md: 768px,
lg: 992px, lg: 992px,
xl: 1200px, xl: 1200px,
xxl: 1600px xxl: 1600px,
xxxl: 1950px,
xxxxl: 2150px
); );
$container-max-widths: ( $container-max-widths: (
sm: pxrem(540), sm: 540px,
md: pxrem(720), md: 720px,
lg: pxrem(960), lg: 960px,
xl: pxrem(1140), xl: 1140px,
xxl: pxrem(1540) xxl: 1540px,
xxxl: 1733px,
xxxxl: 1925px
); );
// Colours // Colours

View file

@ -38,6 +38,14 @@ html {
width: 100%; width: 100%;
font-size: $base-font-size; font-size: $base-font-size;
@include media-breakpoint-up(xxxl) {
font-size: 18px;
}
@include media-breakpoint-up(xxxxl) {
font-size: 20px;
}
&.no-scroll { &.no-scroll {
overflow-y: hidden; overflow-y: hidden;
} }