Skip to content

Commit dd5550f

Browse files
committed
Move to packaged Bootstrap
We had included Bootstrap v4 as vendored scss instead of loading it via npm / packages. This isn't a great practice for a couple of reasons, not the least of which being the fact that we can't benefit from things like dependabot and dependency tree checks. This intentionally does not migrate to Bootstrap v5, but simply changes how v4 is being installed. Issue #895 Remove vendored bootstrap
1 parent be10eb6 commit dd5550f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+61
-6991
lines changed

package-lock.json

Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"@types/openseadragon": "^4.1.0",
5858
"angular-shepherd": "^20.0.0",
5959
"binaryjs": "0.2.1",
60+
"bootstrap": "^4.1.1",
6061
"check-password-strength": "^3.0.0",
6162
"core-js": "3.45.1",
6263
"country-list": "^2.4.1",

src/styles/_bootstrap-custom.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Import Bootstrap from node_modules with selective components
2+
@import 'bootstrap/scss/mixins';
3+
@import 'bootstrap/scss/root';
4+
@import 'bootstrap/scss/reboot';
5+
@import 'bootstrap/scss/type';
6+
@import 'bootstrap/scss/tables';
7+
@import 'bootstrap/scss/forms';
8+
@import 'bootstrap/scss/buttons';
9+
@import 'bootstrap/scss/dropdown';
10+
@import 'bootstrap/scss/input-group';
11+
@import 'bootstrap/scss/nav';
12+
@import 'bootstrap/scss/navbar';
13+
@import 'bootstrap/scss/pagination';
14+
@import 'bootstrap/scss/alert';
15+
@import 'bootstrap/scss/close';
16+
@import 'bootstrap/scss/tooltip';
17+
@import 'bootstrap/scss/utilities';
18+
@import 'bootstrap/scss/print';

src/styles/_variables.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,12 +175,15 @@ $linear-gradient-background: linear-gradient(90deg, #131b4a 0%, #364493 100%);
175175
}
176176
}
177177

178-
$ionicons-font-path: 'https://unpkg.com/[email protected]/dist/fonts';
179-
180-
@import 'vendor/bootstrap/functions';
181-
@import 'vendor/bootstrap/variables';
178+
@import 'bootstrap/scss/functions';
179+
@import 'bootstrap/scss/variables';
182180
@import 'utilities';
183181

182+
// Custom variables that were in vendored Bootstrap
183+
$darkBlue: #131b4a !default;
184+
$box-shadow-dark: 0 0.5rem 1rem rgba($black, 0.3) !default;
185+
$font-size-xs: ($font-size-base * 0.75) !default;
186+
184187
// Customizations to Bootstrap Variables
185188
$link-color: lighten(theme-color('primary'), 20%);
186189
$link-decoration: underline;

src/styles/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@import '@angular/cdk/overlay-prebuilt.css';
22

33
@import 'variables';
4-
@import 'vendor/bootstrap/bootstrap-custom';
4+
@import 'bootstrap-custom';
55

66
@import 'animations';
77
@import 'base';

src/styles/vendor/bootstrap/_alert.scss

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/styles/vendor/bootstrap/_badge.scss

Lines changed: 0 additions & 47 deletions
This file was deleted.

src/styles/vendor/bootstrap/_breadcrumb.scss

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)