framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update dependencies, incl Bootstrap 4 alpha 3

Browse Source
This commit is contained in:
QWp6t
2016-08-06 18:51:06 -07:00
parent ccd128cb3e
commit 447c24d082
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
assets/scripts/main.js
View File

@@ -5,17 +5,7 @@ import home from './routes/Home';
import about_us from './routes/About'; import about_us from './routes/About';
// Import npm dependencies // Import npm dependencies
import 'bootstrap/dist/js/umd/util.js'; import 'bootstrap/dist/js/bootstrap';
import 'bootstrap/dist/js/umd/alert.js';
import 'bootstrap/dist/js/umd/button.js';
import 'bootstrap/dist/js/umd/carousel.js';
import 'bootstrap/dist/js/umd/collapse.js';
import 'bootstrap/dist/js/umd/dropdown.js';
import 'bootstrap/dist/js/umd/modal.js';
import 'bootstrap/dist/js/umd/scrollspy.js';
import 'bootstrap/dist/js/umd/tab.js';
import 'bootstrap/dist/js/umd/tooltip.js';
import 'bootstrap/dist/js/umd/popover.js';
// Use this variable to set up the common and page specific functions. If you // Use this variable to set up the common and page specific functions. If you
// rename this variable, you will also need to rename the namespace below. // rename this variable, you will also need to rename the namespace below.

12
assets/styles/components/_grid.scss
View File

@@ -1,18 +1,16 @@
// Grid system // Grid system
.main { .main {
@include make-col(); @extend %grid-column;
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
@include make-col-span($main-sm-columns); @include make-col($main-sm-columns);
.sidebar-primary & { .sidebar-primary & {
@include make-col-span($main-sm-columns - $sidebar-sm-columns); @include make-col($main-sm-columns - $sidebar-sm-columns);
} }
} }
} }
.sidebar { .sidebar {
@include make-col(); @extend %grid-column;
@include media-breakpoint-up(sm) { @include media-breakpoint-up(sm) {
@include make-col-span($sidebar-sm-columns); @include make-col($sidebar-sm-columns);
} }
} }

18
package.json
View File

@@ -41,24 +41,24 @@
"clean-webpack-plugin": "^0.1.8", "clean-webpack-plugin": "^0.1.8",
"css-loader": "^0.23.1", "css-loader": "^0.23.1",
"cssnano": "^3.5.2", "cssnano": "^3.5.2",
"eslint": "^2.5.1", "eslint": "^3.2.2",
"eslint-config-airbnb": "^6.2.0", "eslint-config-airbnb": "^10.0.0",
"eslint-loader": "^1.3.0", "eslint-loader": "^1.3.0",
"eslint-plugin-react": "^4.2.3", "eslint-plugin-react": "^6.0.0",
"extract-text-webpack-plugin": "^1.0.1", "extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5", "file-loader": "^0.9.0",
"image-webpack-loader": "^1.6.3", "image-webpack-loader": "^2.0.0",
"imagemin-pngcrush": "^4.1.0", "imagemin-pngcrush": "^5.0.0",
"imports-loader": "^0.6.5", "imports-loader": "^0.6.5",
"minimist": "^1.2.0", "minimist": "^1.2.0",
"monkey-hot-loader": "0.0.3", "monkey-hot-loader": "0.0.3",
"node-sass": "^3.4.2", "node-sass": "^3.4.2",
"optimize-css-assets-webpack-plugin": "^1.3.0", "optimize-css-assets-webpack-plugin": "^1.3.0",
"postcss": "^5.0.18", "postcss": "^5.0.18",
"postcss-loader": "^0.8.0", "postcss-loader": "^0.9.1",
"qs": "^6.1.0", "qs": "^6.1.0",
"resolve-url-loader": "^1.4.3", "resolve-url-loader": "^1.4.3",
"sass-loader": "^3.1.1", "sass-loader": "^4.0.0",
"style-loader": "^0.13.0", "style-loader": "^0.13.0",
"url-loader": "^0.5.7", "url-loader": "^0.5.7",
"webpack": "^1.12.14", "webpack": "^1.12.14",
@@ -67,7 +67,7 @@
}, },
"dependencies": { "dependencies": {
"babel-runtime": "^6.5.0", "babel-runtime": "^6.5.0",
"bootstrap": "^4.0.0-alpha.2", "bootstrap": "^4.0.0-alpha.3",
"jquery": "^2.1.4", "jquery": "^2.1.4",
"tether": "^1.2.0" "tether": "^1.2.0"
} }