Skip to content

Commit

Permalink
Merge pull request #3496 from bolt/update/bootstrap
Browse files Browse the repository at this point in the history
Remove abs() deprecation warnings when compiling assets
  • Loading branch information
bobdenotter authored Oct 23, 2023
2 parents f11c645 + a24cbdb commit 396f2e9
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 167 deletions.
7 changes: 5 additions & 2 deletions assets/scss/init/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ $bolt-blue: #255687; // Nice and bright, pretty light
$bolt-bluegray: #2f3e4d; // Nice dark and desaturated
$bolt-saturated: #003e7c; // Very saturated. Use with care

$gray-200: #e9ecef; // Use default Bootstrap value for now

$body-bg: $background;
$body-secondary-bg: $gray-200; // Use default Bootstrap value for now

$theme-colors: (
"primary": $primary,
Expand Down Expand Up @@ -67,8 +70,7 @@ $font-weight-bold: 700;
$headings-font-weight: 600;

// Links
$link-color: var(--primary);
$link-hover-color: var(--primary-600);
$link-color: $primary;

//buttons
$btn-disabled-opacity: 0.75;
Expand Down Expand Up @@ -139,6 +141,7 @@ $min-contrast-ratio: 4.5;

$popover-header-padding-y: 0.5rem;
$popover-header-padding-x: 0.75rem;
$popover-header-bg: $body-secondary-bg;

$popover-body-padding-y: 0.5rem;
$popover-body-padding-x: 0.75rem;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/vendor/bootstrap/bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//** Bootstrap
@import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables";
//@import "~bootstrap/scss/variables-dark";
@import "~bootstrap/scss/variables-dark";
@import "~bootstrap/scss/maps";
@import "~bootstrap/scss/mixins";
@import "~bootstrap/scss/root";
Expand Down
219 changes: 56 additions & 163 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@vue/cli-service": "^4.5.19",
"axios": "^0.27.2",
"baguettebox.js": "^1.11.1",
"bootstrap": "5.2.*",
"bootstrap": "5.3.*",
"browserslist": "^4.21.4",
"clipboard": "^2.0.11",
"codemirror": "^5.65.9",
Expand Down

0 comments on commit 396f2e9

Please sign in to comment.