Skip to content

Commit

Permalink
Merge pull request #18 from stevenmirabito/v4.5.2-upgrade
Browse files Browse the repository at this point in the history
Upgrade to v4.5.2
  • Loading branch information
stevenmirabito committed Sep 7, 2020
2 parents e9ae2af + a9e684a commit a9b5e90
Show file tree
Hide file tree
Showing 9 changed files with 1,747 additions and 2,237 deletions.
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pipeline:
build:
image: node:8.9.4
image: node:12.18.3
commands:
- yarn
- yarn build

deploy:
image: node:8.9.4
image: node:12.18.3
commands:
- yarn deploy
secrets: [ aws_access_key_id, aws_secret_access_key ]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,6 @@ typings/

# dotenv environment variables file
.env

# JetBrains
.idea
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
12.18.3
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 12.18.3
230 changes: 142 additions & 88 deletions index.html

Large diffs are not rendered by default.

44 changes: 20 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "csh-material-bootstrap",
"description": "A material design Bootstrap theme for Computer Science House.",
"version": "4.3.1",
"author": "Computer Science House",
"version": "4.5.2",
"author": "Computer Science House <[email protected]>",
"homepage": "https://csh.rit.edu",
"license": "MIT",
"repository": {
Expand All @@ -13,7 +13,7 @@
"url": "https://github.com/ComputerScienceHouse/csh-material-bootstrap/issues"
},
"engines": {
"node": ">=6"
"node": ">=12"
},
"style": "dist/csh-material-bootstrap.css",
"sass": "src/csh-material-bootstrap.scss",
Expand All @@ -23,28 +23,24 @@
"deploy": "node tools/deploy.js"
},
"dependencies": {},
"peerDependencies": {
"jquery": "1.9.1 - 3",
"popper.js": "^1.12.9"
},
"devDependencies": {
"autoprefixer": "^7.2.5",
"aws-sdk": "^2.183.0",
"bootstrap": "4.3.1",
"bootswatch": "4.3.1",
"chalk": "^2.3.0",
"chokidar": "^2.0.0",
"cssnano": "^3.10.0",
"fs-extra": "^5.0.0",
"globby": "^7.1.1",
"mime-types": "^2.1.17",
"node-sass": "^4.7.2",
"ora": "^1.3.0",
"postcss": "^6.0.16",
"postcss-cli": "^4.1.1",
"postcss-flexbugs-fixes": "^3.2.0",
"shelljs": "^0.8.0",
"yargs": "^10.1.1"
"autoprefixer": "^9.8.6",
"aws-sdk": "^2.747.0",
"bootstrap": "^4.5.2",
"bootswatch": "^4.5.2",
"chalk": "^4.1.0",
"chokidar": "^3.4.2",
"cssnano": "^4.1.10",
"fs-extra": "^9.0.1",
"globby": "^11.0.1",
"mime-types": "^2.1.27",
"node-sass": "^4.14.1",
"ora": "^5.1.0",
"postcss": "^7.0.32",
"postcss-cli": "^7.1.2",
"postcss-flexbugs-fixes": "^4.2.1",
"shelljs": "^0.8.4",
"yargs": "^15.4.1"
},
"files": [
"dist/",
Expand Down
36 changes: 33 additions & 3 deletions src/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// CSH Material Bootstrap 4.0.0
// CSH Material Bootstrap 4.5.2
// Based on Bootswatch Materia

// Color system ================================================================
Expand Down Expand Up @@ -35,6 +35,10 @@ $danger: $red !default;
$light: $white !default;
$dark: $gray-800 !default;

$yiq-contrasted-threshold: 170 !default;

$enable-gradients: true !default;

// Body ========================================================================

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

// Buttons =====================================================================

$input-btn-padding-y: 1rem !default;
$input-btn-padding-y: 0.5rem !default;
$input-btn-padding-x: 1rem !default;

// Forms =======================================================================

$input-padding-y: 1rem !default;
$input-padding-x: 0 !default;

$input-padding-y-sm: 0 !default;
$input-padding-x-sm: 0 !default;

$input-padding-y-lg: ($font-size-base * 1.25) !default;
$input-padding-x-lg: 0 !default;

$input-bg: transparent !default;
$input-disabled-bg: transparent !default;

$input-color: $gray-600 !default;
$input-border-color: transparent !default;
$input-border-width: 0 !default;

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

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

$custom-control-gutter: 1.75rem !default;

$custom-control-indicator-focus-box-shadow: 0 !default;

$custom-control-indicator-size: 1.25rem !default;
$custom-control-indicator-bg: $white;
$custom-checkbox-indicator-border-radius: 2px !default;

$custom-control-indicator-disabled-bg: $gray-100 !default;

$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;

$custom-select-border-radius: 0 !default;
$custom-select-box-shadow: none !default;

// Navs ========================================================================

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

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

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

// Progress Bars ===============================================================

$progress-height: 6px !default;
$progress-height: 0.375rem !default;
$progress-border-radius: 0 !default;

// Close =======================================================================
Expand Down
Loading

0 comments on commit a9b5e90

Please sign in to comment.