Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.

Commit 7a76f57

Browse files
WadeBarnesWadeBarnes
authored
Merge pull request #10 from cywolf/bootstrap-4.3
Update to bootstrap 4.3, add misc fixes
2 parents 7809a4f + 499adcc commit 7a76f57

17 files changed

+53
-118
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[Full documentation and demonstrations of the theme](https://bcgov.github.io/bootstrap-theme/)
44

5-
A Bootstrap version 4.1 BC Government Look-and-Feel featuring:
5+
A Bootstrap version 4.3 BC Government look-and-feel featuring:
66
- Compatibility with pure Bootstrap markup
77
- A few additions:
88
- `bcgold` colour classes for the old-style gold buttons (`btn-bcgold`, `bg-bcgold`, etc)

‎dist/css/bootstrap-theme.min.css

+4-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/js/bootstrap-theme.min.js

+1-88
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/scss/_additions.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//---------------------------------------------------------------------------------------
2-
// Additions are for extra things not found in bootstrap like a new font!
2+
// Additions are for extra classes not found in the normal Bootstrap
33
// WARNING: Do not create alot of new things here, remember always try to tweak and variable
44
// or override bootstrap css before trying to create something new.
55
//---------------------------------------------------------------------------------------

‎dist/scss/_common.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
// Includes in this file should not define any CSS classes, it is only meant for
2+
// defining variables and functions for use by isolated components
3+
14
@import "~bootstrap/scss/functions";
25

36
@import "variables";
47

58
@import "~bootstrap/scss/variables";
69
@import "~bootstrap/scss/mixins";
7-
8-
@import "overrides";

‎dist/scss/_overrides.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
// Highlight focused links
13-
a:focus {
13+
a:not(.btn):focus {
1414
color: $link-hover-color;
1515
}
1616

‎dist/scss/_variables.scss

+8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,15 @@ $table-dark-bg: theme-color(primary);
4545
$table-dark-border-color: theme-color(primary);
4646

4747
// Slightly darker borders
48+
$gray-400: #ced4da;
4849
$alert-border-level: -7;
50+
$card-border-color: rgba(0, 0, 0, .2);
51+
$hr-border-color: rgba(0, 0, 0, .2);
52+
$border-color: $gray-400;
53+
$nav-tabs-border-color: $gray-400;
54+
$pagination-border-color: $gray-400;
55+
$pagination-hover-border-color: $gray-400;
56+
$table-border-color: $gray-400;
4957

5058
// List groups
5159
$list-group-active-bg: lighten(theme-color(secondary-nav), 10%);

‎dist/scss/bootstrap-theme.scss

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// Now bring in the rest of bootstrap!
55
@import "~bootstrap/scss/bootstrap";
66

7+
// Overrides of bootstrap classes
8+
@import "overrides";
9+
710
// Import the additions to bootstrap base
811
@import "additions";
912

‎docs/getting-started/introduction.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ For the moment, the theme package can be installed using something like this in
1616

1717
```json
1818
"devDependencies": {
19-
"@bcgov/bootstrap-theme": "https://github.com/cywolf/bootstrap-theme/releases/download/v4.1.0-rc0/bcgov-bootstrap-theme-4.1.0-rc0.tgz",
20-
"bootstrap": "~4.1.0",
19+
"@bcgov/bootstrap-theme": "https://github.com/bcgov/bootstrap-theme/releases/download/v1.0.0/bcgov-bootstrap-theme-1.0.0.tgz",
20+
"bootstrap": "~4.3.1",
2121
}
2222
```
2323

@@ -39,7 +39,7 @@ installed as node modules, or distributed separately. For example:
3939
```html
4040
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
4141
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
42-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
42+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
4343
```
4444

4545
For Angular-based sites, [`ng-bootstrap`](https://ng-bootstrap.github.io/) is recommended
@@ -133,7 +133,7 @@ footer at the bottom of the screen on larger screen sizes.
133133

134134
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
135135
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
136-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
136+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
137137
<script>
138138
// enable popovers everywhere
139139
$(function () {

‎docs/reference/simple.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ toc: true
2020
<div class="col-md-9 col-sm-8">
2121
<h1>Simple Theme Reference</h1>
2222
<p class="lead">
23-
For complete Bootstrap documentation, see <a href="https://getbootstrap.com/docs/4.1/">The Official Site</a>.
23+
For complete Bootstrap documentation, see <a href="https://getbootstrap.com/docs/4.3/">The Official Site</a>.
2424
</p>
2525
</div>
2626
@@ -266,13 +266,13 @@ toc: true
266266

267267
<div class="mb-3">
268268
<div class="btn-toolbar" role="toolbar" aria-label="Toolbar with button groups">
269-
<div class="btn-group" role="group" aria-label="First group">
269+
<div class="btn-group mr-2" role="group" aria-label="First group">
270270
<button type="button" class="btn btn-secondary">1</button>
271271
<button type="button" class="btn btn-secondary">2</button>
272272
<button type="button" class="btn btn-secondary">3</button>
273273
<button type="button" class="btn btn-secondary">4</button>
274274
</div>
275-
<div class="btn-group" role="group" aria-label="Second group">
275+
<div class="btn-group mr-2" role="group" aria-label="Second group">
276276
<button type="button" class="btn btn-secondary">5</button>
277277
<button type="button" class="btn btn-secondary">6</button>
278278
<button type="button" class="btn btn-secondary">7</button>

‎index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="container">
77
<h1>Government of British Columbia Bootstrap Theme</h1>
88
<p class="lead">
9-
BC Government look-and-feel for Bootstrap 4.1.
9+
BC Government look-and-feel for Bootstrap 4.3.
1010
See <a href="{{ site.baseurl }}/docs/reference/simple">a simple demonstration of all common styles.</a>
1111
</p>
1212
</div>

‎package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@bcgov/bootstrap-theme",
3-
"version": "4.1.0-rc0",
3+
"version": "1.0.0",
44
"description": "Government of British Columbia Bootstrap v4 theme",
55
"style": "dist/css/bootstrap-theme.min.css",
66
"main": "dist/js/bootstrap-theme.min.js",
@@ -33,23 +33,23 @@
3333
"license": "Apache-2.0",
3434
"dependencies": {},
3535
"peerDependencies": {
36-
"bootstrap": "~4.1.0"
36+
"bootstrap": "~4.3.1"
3737
},
3838
"devDependencies": {
3939
"autoprefixer": "^7.2.0",
40-
"bootstrap": "~4.1.0",
40+
"bootstrap": "^4.3.1",
4141
"clean-webpack-plugin": "^0.1.19",
42-
"copy-webpack-plugin": "^4.5.0",
42+
"copy-webpack-plugin": "^4.6.0",
4343
"cross-env": "^5.2.0",
4444
"css-loader": "^0.28.11",
4545
"extract-text-webpack-plugin": "^3.0.0",
4646
"file-loader": "^1.1.11",
47-
"node-sass": "^4.5.3",
47+
"node-sass": "^4.12.0",
4848
"postcss-loader": "^2.1.0",
4949
"precss": "^3.1.0",
50+
"sass-lint": "^1.13.1",
5051
"sass-loader": "^7.1.0",
51-
"sass-lint": "^1.12.1",
5252
"style-loader": "^0.23.0",
53-
"webpack": "^3.10.0"
53+
"webpack": "^3.12.0"
5454
}
5555
}

‎src/styles/_additions.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//---------------------------------------------------------------------------------------
2-
// Additions are for extra things not found in bootstrap like a new font!
2+
// Additions are for extra classes not found in the normal Bootstrap
33
// WARNING: Do not create alot of new things here, remember always try to tweak and variable
44
// or override bootstrap css before trying to create something new.
55
//---------------------------------------------------------------------------------------

‎src/styles/_common.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
// Includes in this file should not define any CSS classes, it is only meant for
2+
// defining variables and functions for use by isolated components
3+
14
@import "~bootstrap/scss/functions";
25

36
@import "variables";
47

58
@import "~bootstrap/scss/variables";
69
@import "~bootstrap/scss/mixins";
7-
8-
@import "overrides";

‎src/styles/_overrides.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111

1212
// Highlight focused links
13-
a:focus {
13+
a:not(.btn):focus {
1414
color: $link-hover-color;
1515
}
1616

‎src/styles/_variables.scss

+8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,15 @@ $table-dark-bg: theme-color(primary);
4545
$table-dark-border-color: theme-color(primary);
4646

4747
// Slightly darker borders
48+
$gray-400: #ced4da;
4849
$alert-border-level: -7;
50+
$card-border-color: rgba(0, 0, 0, .2);
51+
$hr-border-color: rgba(0, 0, 0, .2);
52+
$border-color: $gray-400;
53+
$nav-tabs-border-color: $gray-400;
54+
$pagination-border-color: $gray-400;
55+
$pagination-hover-border-color: $gray-400;
56+
$table-border-color: $gray-400;
4957

5058
// List groups
5159
$list-group-active-bg: lighten(theme-color(secondary-nav), 10%);

‎src/styles/bootstrap-theme.scss

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// Now bring in the rest of bootstrap!
55
@import "~bootstrap/scss/bootstrap";
66

7+
// Overrides of bootstrap classes
8+
@import "overrides";
9+
710
// Import the additions to bootstrap base
811
@import "additions";
912

0 commit comments

Comments
 (0)