Skip to content
This repository has been archived by the owner on Jul 21, 2019. It is now read-only.

Commit

Permalink
Change to bootstrap 4 (#107)
Browse files Browse the repository at this point in the history
* Change framework to bootstrap 4

Also moves us from LESS to SCSS

Signed-off-by: Matt Stratton <[email protected]>

* Format with bootstrap 4

Signed-off-by: Matt Stratton <[email protected]>

* Add styling to navs

Signed-off-by: Matt Stratton <[email protected]>

* Compress CSS file

Signed-off-by: Matt Stratton <[email protected]>
  • Loading branch information
mattstratton authored Jan 17, 2017
1 parent 4169441 commit 4d299f5
Show file tree
Hide file tree
Showing 305 changed files with 46,525 additions and 15,329 deletions.
5 changes: 4 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
"private": true,
"dependencies": {
"jquery": "^3.1.1",
"bootstrap": "^3.3.7",
"bootstrap": "4.0.0-alpha.6",
"jquery-oembed-all": "*",
"markerwithlabel-v3": "^1.1.10",
"font-awesome": "fontawesome#^4.7.0"
},
"resolutions": {
"bootstrap": "4.0.0-alpha.6"
}
}
22 changes: 12 additions & 10 deletions bower_components/bootstrap/.bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@
"keywords": [
"css",
"js",
"less",
"sass",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"homepage": "http://getbootstrap.com",
"homepage": "https://getbootstrap.com",
"license": "MIT",
"moduleType": "globals",
"main": [
"less/bootstrap.less",
"scss/bootstrap.scss",
"dist/js/bootstrap.js"
],
"ignore": [
Expand All @@ -29,16 +29,18 @@
"test-infra"
],
"dependencies": {
"jquery": "1.9.1 - 3"
"jquery": ">=1.9.1",
"tether": "^1.4.0"
},
"version": "3.3.7",
"_release": "3.3.7",
"version": "4.0.0-alpha.6",
"_release": "4.0.0-alpha.6",
"_resolution": {
"type": "version",
"tag": "v3.3.7",
"commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
"tag": "v4.0.0-alpha.6",
"commit": "65ffb1c3b6e94440812a2e228cb8e8be512652ec"
},
"_source": "https://github.com/twbs/bootstrap.git",
"_target": "^3.3.7",
"_originalSource": "bootstrap"
"_target": "4.0.0-alpha.6",
"_originalSource": "bootstrap",
"_direct": true
}
2 changes: 1 addition & 1 deletion bower_components/bootstrap/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-

See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.

Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
6 changes: 4 additions & 2 deletions bower_components/bootstrap/Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
source 'https://rubygems.org'

group :development, :test do
gem 'jekyll', '~> 3.1.2'
gem 'jekyll-sitemap', '~> 0.11.0'
gem 'jekyll', '~> 3.3.1'
gem 'jekyll-redirect-from', '~> 0.12.0'
gem 'jekyll-sitemap', '~> 0.12.0'
gem 'scss_lint', '~> 0.51.0'
end
47 changes: 31 additions & 16 deletions bower_components/bootstrap/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,43 +1,58 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
colorator (0.1)
ffi (1.9.14-x64-mingw32)
jekyll (3.1.6)
colorator (~> 0.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.14)
forwardable-extended (2.6.0)
jekyll (3.3.1)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-sass-converter (1.4.0)
jekyll-redirect-from (0.12.0)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
jekyll-watch (1.4.0)
jekyll-sitemap (0.12.0)
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.11.1)
kramdown (1.13.1)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
rb-fsevent (0.9.7)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rake (12.0.0)
rb-fsevent (0.9.8)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.22)
sass (3.4.23)
scss_lint (0.51.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)

PLATFORMS
x64-mingw32
ruby

DEPENDENCIES
jekyll (~> 3.1.2)
jekyll-sitemap (~> 0.11.0)
jekyll (~> 3.3.1)
jekyll-redirect-from (~> 0.12.0)
jekyll-sitemap (~> 0.12.0)
scss_lint (~> 0.51.0)

BUNDLED WITH
1.12.5
1.13.6
Loading

0 comments on commit 4d299f5

Please sign in to comment.