Skip to content

Updating bootstrap and deps to 4.6.1 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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:12.18.3
image: node:16
commands:
- yarn
- yarn build

deploy:
image: node:12.18.3
image: node:16
commands:
- yarn deploy
secrets: [ aws_access_key_id, aws_secret_access_key ]
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.18.3
16
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Use CSH Material Bootstrap without a package manager.

Development
------------
You must have [Node 6 or higher](https://nodejs.org) and NPM or [Yarn](https://yarnpkg.com) installed.
You must have [Node 16 or higher](https://nodejs.org) and NPM or [Yarn](https://yarnpkg.com) installed.

Once you have those tools installed, clone this repo and run the following command to install dependencies:

Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,20 @@ <h1 class="display-3">Welcome!</h1>
<div class="col-sm-6">
<h2>Installation</h2>
<p>Recommended for modern web applications.</p>
<pre><code class="shell">npm install csh-material-bootstrap@4.5.2</code></pre>
<pre><code class="shell">npm install csh-material-bootstrap@4.6.1</code></pre>
</div>
<div class="col-sm-6">
<h2>CDN</h2>
<p>Use CSH Material Bootstrap without a package manager.</p>

<h5>CSS</h5>
<pre><code class="html">&lt;link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.5.2/dist/csh-material-bootstrap.min.css" media="screen"&gt;</code></pre>
<pre><code class="html">&lt;link rel="stylesheet" href="https://s3.csh.rit.edu/csh-material-bootstrap/4.6.1/dist/csh-material-bootstrap.min.css" media="screen"&gt;</code></pre>

<h5>JS, Popper.js, and jQuery</h5>
<p>Required for most interactive functionality, unless using an alternative implementation such as <a href="http://reactstrap.github.io" rel="nofollow">Reactstrap</a>.</p>
<pre><code class="html">&lt;script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"&gt;&lt;/script&gt;
&lt;script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"&gt;&lt;/script&gt;
&lt;script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"&gt;&lt;/script&gt;</code></pre>
&lt;script src="https://stackpath.bootstrapcdn.com/bootstrap/4.6.1/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"&gt;&lt;/script&gt;</code></pre>
</div>
</div>
</div>
Expand Down Expand Up @@ -1567,7 +1567,7 @@ <h4 class="modal-title">Source Code</h4>

<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js" integrity="sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.6.1/js/bootstrap.min.js" integrity="sha384-B4gt1jrGC7Jh4AgTPSdUtOBvfO8shuf57BaghqFfPlYxofvL8/KUEfYiJOMMV+rV" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/gh/highlightjs/[email protected]/build/highlight.min.js"></script>
<script>
(function () {
Expand Down
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "csh-material-bootstrap",
"description": "A material design Bootstrap theme for Computer Science House.",
"version": "4.5.2",
"version": "4.6.1",
"author": "Computer Science House <[email protected]>",
"homepage": "https://csh.rit.edu",
"license": "MIT",
Expand All @@ -13,7 +13,7 @@
"url": "https://github.com/ComputerScienceHouse/csh-material-bootstrap/issues"
},
"engines": {
"node": ">=12"
"node": ">=16"
},
"style": "dist/csh-material-bootstrap.css",
"sass": "src/csh-material-bootstrap.scss",
Expand All @@ -24,23 +24,24 @@
},
"dependencies": {},
"devDependencies": {
"autoprefixer": "^9.8.6",
"aws-sdk": "^2.747.0",
"bootstrap": "^4.5.2",
"bootswatch": "^4.5.2",
"autoprefixer": "^10.4.7",
"aws-sdk": "^2.1160.0",
"bootstrap": "^4.6.1",
"bootswatch": "^4.6.1",
"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",
"chokidar": "^3.5.3",
"cssnano": "^5.1.12",
"fs-extra": "^10.1.0",
"globby": "^13.1.2",
"mime-types": "^2.1.35",
"node-sass": "^7.0.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"
"popper.js": "^1.16.1",
"postcss": "^8.4.14",
"postcss-cli": "^9.1.0",
"postcss-flexbugs-fixes": "^5.0.2",
"shelljs": "^0.8.5",
"yargs": "^17.5.1"
},
"files": [
"dist/",
Expand Down
2 changes: 1 addition & 1 deletion src/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// CSH Material Bootstrap 4.5.2
// CSH Material Bootstrap 4.6.1
// Based on Bootswatch Materia

// Color system ================================================================
Expand Down
2 changes: 1 addition & 1 deletion src/csh-material-bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// CSH Material Bootstrap 4.5.2
// CSH Material Bootstrap 4.6.1
// Based on Bootswatch Materia

@import "variables";
Expand Down
Loading