Skip to content

Commit a9b5e90

Browse files
Merge pull request #18 from stevenmirabito/v4.5.2-upgrade
Upgrade to v4.5.2
2 parents e9ae2af + a9e684a commit a9b5e90

9 files changed

+1747
-2237
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
pipeline:
22
build:
3-
image: node:8.9.4
3+
image: node:12.18.3
44
commands:
55
- yarn
66
- yarn build
77

88
deploy:
9-
image: node:8.9.4
9+
image: node:12.18.3
1010
commands:
1111
- yarn deploy
1212
secrets: [ aws_access_key_id, aws_secret_access_key ]

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@ typings/
102102

103103
# dotenv environment variables file
104104
.env
105+
106+
# JetBrains
107+
.idea

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
12.18.3

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodejs 12.18.3

index.html

Lines changed: 142 additions & 88 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "csh-material-bootstrap",
33
"description": "A material design Bootstrap theme for Computer Science House.",
4-
"version": "4.3.1",
5-
"author": "Computer Science House",
4+
"version": "4.5.2",
5+
"author": "Computer Science House <webmaster@csh.rit.edu>",
66
"homepage": "https://csh.rit.edu",
77
"license": "MIT",
88
"repository": {
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/ComputerScienceHouse/csh-material-bootstrap/issues"
1414
},
1515
"engines": {
16-
"node": ">=6"
16+
"node": ">=12"
1717
},
1818
"style": "dist/csh-material-bootstrap.css",
1919
"sass": "src/csh-material-bootstrap.scss",
@@ -23,28 +23,24 @@
2323
"deploy": "node tools/deploy.js"
2424
},
2525
"dependencies": {},
26-
"peerDependencies": {
27-
"jquery": "1.9.1 - 3",
28-
"popper.js": "^1.12.9"
29-
},
3026
"devDependencies": {
31-
"autoprefixer": "^7.2.5",
32-
"aws-sdk": "^2.183.0",
33-
"bootstrap": "4.3.1",
34-
"bootswatch": "4.3.1",
35-
"chalk": "^2.3.0",
36-
"chokidar": "^2.0.0",
37-
"cssnano": "^3.10.0",
38-
"fs-extra": "^5.0.0",
39-
"globby": "^7.1.1",
40-
"mime-types": "^2.1.17",
41-
"node-sass": "^4.7.2",
42-
"ora": "^1.3.0",
43-
"postcss": "^6.0.16",
44-
"postcss-cli": "^4.1.1",
45-
"postcss-flexbugs-fixes": "^3.2.0",
46-
"shelljs": "^0.8.0",
47-
"yargs": "^10.1.1"
27+
"autoprefixer": "^9.8.6",
28+
"aws-sdk": "^2.747.0",
29+
"bootstrap": "^4.5.2",
30+
"bootswatch": "^4.5.2",
31+
"chalk": "^4.1.0",
32+
"chokidar": "^3.4.2",
33+
"cssnano": "^4.1.10",
34+
"fs-extra": "^9.0.1",
35+
"globby": "^11.0.1",
36+
"mime-types": "^2.1.27",
37+
"node-sass": "^4.14.1",
38+
"ora": "^5.1.0",
39+
"postcss": "^7.0.32",
40+
"postcss-cli": "^7.1.2",
41+
"postcss-flexbugs-fixes": "^4.2.1",
42+
"shelljs": "^0.8.4",
43+
"yargs": "^15.4.1"
4844
},
4945
"files": [
5046
"dist/",

src/_variables.scss

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// CSH Material Bootstrap 4.0.0
1+
// CSH Material Bootstrap 4.5.2
22
// Based on Bootswatch Materia
33

44
// Color system ================================================================
@@ -35,6 +35,10 @@ $danger: $red !default;
3535
$light: $white !default;
3636
$dark: $gray-800 !default;
3737

38+
$yiq-contrasted-threshold: 170 !default;
39+
40+
$enable-gradients: true !default;
41+
3842
// Body ========================================================================
3943

4044
$body-color: $gray-700 !default;
@@ -47,16 +51,26 @@ $font-weight-base: 400 !default;
4751

4852
// Buttons =====================================================================
4953

50-
$input-btn-padding-y: 1rem !default;
54+
$input-btn-padding-y: 0.5rem !default;
5155
$input-btn-padding-x: 1rem !default;
5256

5357
// Forms =======================================================================
5458

59+
$input-padding-y: 1rem !default;
60+
$input-padding-x: 0 !default;
61+
62+
$input-padding-y-sm: 0 !default;
63+
$input-padding-x-sm: 0 !default;
64+
65+
$input-padding-y-lg: ($font-size-base * 1.25) !default;
66+
$input-padding-x-lg: 0 !default;
67+
5568
$input-bg: transparent !default;
5669
$input-disabled-bg: transparent !default;
5770

5871
$input-color: $gray-600 !default;
5972
$input-border-color: transparent !default;
73+
$input-border-width: 0 !default;
6074

6175
$input-border-radius: 0 !default;
6276
$input-border-radius-lg: 0 !default;
@@ -66,9 +80,25 @@ $input-placeholder-color: rgba(0,0,0,0.4) !default;
6680

6781
$input-group-addon-bg: transparent !default;
6882

83+
$custom-control-gutter: 1.75rem !default;
84+
85+
$custom-control-indicator-focus-box-shadow: 0 !default;
86+
87+
$custom-control-indicator-size: 1.25rem !default;
88+
$custom-control-indicator-bg: $white;
89+
$custom-checkbox-indicator-border-radius: 2px !default;
90+
91+
$custom-control-indicator-disabled-bg: $gray-100 !default;
92+
93+
$custom-radio-indicator-icon-checked: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='4' fill='#{$primary}'/%3E%3C/svg%3E") !default;
94+
95+
$custom-select-border-radius: 0 !default;
96+
$custom-select-box-shadow: none !default;
97+
6998
// Navs ========================================================================
7099

71100
$nav-link-disabled-color: $gray-500 !default;
101+
$nav-tabs-link-active-bg: transparent !default;
72102

73103
$nav-tabs-border-color: transparent !default;
74104

@@ -96,7 +126,7 @@ $modal-content-border-color: transparent !default;
96126

97127
// Progress Bars ===============================================================
98128

99-
$progress-height: 6px !default;
129+
$progress-height: 0.375rem !default;
100130
$progress-border-radius: 0 !default;
101131

102132
// Close =======================================================================

0 commit comments

Comments
 (0)