Skip to content

Commit

Permalink
Merge pull request #5 from WISVCH/4.6.1
Browse files Browse the repository at this point in the history
Update to Bootstrap 4.6.1 and use Gulp instead of Grunt
  • Loading branch information
julian9499 authored Dec 10, 2021
2 parents 21cc92a + aa037cd commit be25773
Show file tree
Hide file tree
Showing 31 changed files with 25,161 additions and 10,630 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/node_modules
/bower_components
/tmp
.sass-cache
package-lock.json
70 changes: 0 additions & 70 deletions Gruntfile.coffee

This file was deleted.

12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,24 @@ See https://wisvch.github.io/bootstrap-theme/
### Setup

Install dependencies using
[Grunt](http://gruntjs.com) and [Bower](https://github.com/bower/bower) (you must have these
[Gulp](http://gulpjs.com) and [Bower](https://github.com/bower/bower) (you must have these
installed).

npm install
bower install

Now you're ready to go! Simply edit `less/variables.less` and `less/theme.less` to your liking.
When you're ready, just run `grunt` and it will compile and minify the distribution for you.
You can also run `grunt watch` to automatically compile as you work.
Now you're ready to go! Simply edit `sass/variables.less` and `sass/theme.less` to your liking.
When you're ready, just run `gulp` and it will compile and minify the distribution for you.
<!-- You can also run `grunt watch` to automatically compile as you work. -->

### Testing Out

We've provided a "Bootstrap Kitchen Sink" HTML file at `examples/kitchen-sink.html` that contains
all of the various components in all of their variations. It may not be 100% exhaustive but it
should give you a good idea of what your theme will look like at a glance.

You can start a development server at `http://localhost:8000` by running `grunt serve`. Your theme will automatically compile while the server is running.
<!-- You can start a development server at `http://localhost:8000` by running `grunt serve`. Your theme will automatically compile while the server is running. -->

## Copyright and license

Copyright 2015 W.I.S.V. 'Christiaan Huygens'; copyright 2013 Divshot, Inc. under [the Apache 2.0 license](LICENSE).
Copyright 2021 W.I.S.V. 'Christiaan Huygens'; copyright 2013 Divshot, Inc. under [the Apache 2.0 license](LICENSE).
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
exclude:
- README.md
- Gruntfile.coffee
- gulpfile.js
- bower.json
- package.json
- LICENSE
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "wisvch-bootstrap-theme",
"version": "0.0.3",
"version": "4.6.1-3",
"private": false,
"author": "W.I.S.V. 'Christiaan Huygens'",
"license": "Apache-2.0",
Expand All @@ -18,6 +18,6 @@
"tests"
],
"dependencies": {
"bootstrap": "3.3.5"
"bootstrap": "4.6.1"
}
}
Loading

0 comments on commit be25773

Please sign in to comment.