framework/sage
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 npm dependencies
import 'bootstrap/dist/js/umd/util.js';
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';
import 'bootstrap/dist/js/bootstrap';
// 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.

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

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