Skip to content

Commit 495a376

Browse files
authored
Merge pull request #11 from ceiphr/master
Updated bootstrap and bootswatch
2 parents 2843f9f + b96b629 commit 495a376

File tree

3 files changed

+14
-24
lines changed

3 files changed

+14
-24
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ A [Bootstrap](http://getbootstrap.com) material theme designed for use on [Compu
66
Demo
77
----
88

9-
A live demo of this theme that showcases most components can be found [here](https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0/index.html).
9+
A live demo of this theme that showcases most components can be found [here](https://s3.csh.rit.edu/csh-material-bootstrap/4.3.1/index.html).
1010

1111
Usage
1212
------
@@ -37,15 +37,15 @@ Use CSH Material Bootstrap without a package manager.
3737
###### CSS
3838

3939
```
40-
<link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.0.0/dist/csh-material-bootstrap.min.css" media="screen">
40+
<link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.3.1/dist/csh-material-bootstrap.min.css" media="screen">
4141
```
4242

4343
###### JS, Popper.js, and jQuery
4444

4545
```
4646
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
4747
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
48-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-a5N7Y/aK3qNeh15eJKGWxsqtnX/wWdSZSKp+81YjTmS15nvnvxKHuzaWwXHDli+4" crossorigin="anonymous"></script>
48+
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-a5N7Y/aK3qNeh15eJKGWxsqtnX/wWdSZSKp+81YjTmS15nvnvxKHuzaWwXHDli+4" crossorigin="anonymous"></script>
4949
```
5050

5151
Development

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "csh-material-bootstrap",
33
"description": "A material design Bootstrap theme for Computer Science House.",
4-
"version": "4.0.0",
4+
"version": "4.3.1",
55
"author": "Computer Science House",
66
"homepage": "https://csh.rit.edu",
77
"license": "MIT",
@@ -30,8 +30,8 @@
3030
"devDependencies": {
3131
"autoprefixer": "^7.2.5",
3232
"aws-sdk": "^2.183.0",
33-
"bootstrap": "4.0.0",
34-
"bootswatch": "4.0.0",
33+
"bootstrap": "4.3.1",
34+
"bootswatch": "4.3.1",
3535
"chalk": "^2.3.0",
3636
"chokidar": "^2.0.0",
3737
"cssnano": "^3.10.0",

yarn.lock

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -261,17 +261,15 @@ boom@5.x.x:
261261
dependencies:
262262
hoek "4.x.x"
263263

264-
bootstrap@4.0.0, bootstrap@^4.0.0:
265-
version "4.0.0"
266-
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
264+
bootstrap@4.3.1:
265+
version "4.3.1"
266+
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
267+
integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
267268

268-
bootswatch@4.0.0:
269-
version "4.0.0"
270-
resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-4.0.0.tgz#dfcab028c03c09a58888d37d7ce9f6c8c33498cc"
271-
dependencies:
272-
bootstrap "^4.0.0"
273-
jquery ">=1.9.1"
274-
popper.js "^1.12.9"
269+
bootswatch@4.3.1:
270+
version "4.3.1"
271+
resolved "https://registry.yarnpkg.com/bootswatch/-/bootswatch-4.3.1.tgz#be54748b420a1962dbcf9782605aac092f842e38"
272+
integrity sha512-kNdpo/TnhO++aic1IODLIe1V0lx6pXwHMpwXMacpANDnuVDtgU1MUgUbVMC3rSWm4UcbImfwPraNYgjKDT0BtA==
275273

276274
brace-expansion@^1.1.7:
277275
version "1.1.11"
@@ -1521,10 +1519,6 @@ jmespath@0.15.0:
15211519
version "0.15.0"
15221520
resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
15231521

1524-
jquery@>=1.9.1:
1525-
version "3.3.1"
1526-
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
1527-
15281522
js-base64@^2.1.8, js-base64@^2.1.9:
15291523
version "2.4.3"
15301524
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582"
@@ -2153,10 +2147,6 @@ pinkie@^2.0.0:
21532147
version "2.0.4"
21542148
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
21552149

2156-
popper.js@^1.12.9:
2157-
version "1.12.9"
2158-
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.12.9.tgz#0dfbc2dff96c451bb332edcfcfaaf566d331d5b3"
2159-
21602150
posix-character-classes@^0.1.0:
21612151
version "0.1.1"
21622152
resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"

0 commit comments

Comments
 (0)