1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-22 21:22:52 +02:00

Merge branch 'v4-dev' into rip-custom

This commit is contained in:
Mark Otto
2017-06-14 20:59:02 -07:00
committed by GitHub
5 changed files with 52 additions and 56 deletions

11
scss/bootstrap.scss vendored
View File

@@ -5,13 +5,10 @@
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
// Core variables and mixins
@import "functions";
@import "variables";
@import "mixins";
@import "print";
// Core CSS
@import "reboot";
@import "type";
@import "images";
@@ -20,8 +17,6 @@
@import "tables";
@import "forms";
@import "buttons";
// Components
@import "transitions";
@import "dropdown";
@import "button-group";
@@ -40,12 +35,8 @@
@import "list-group";
@import "responsive-embed";
@import "close";
// Components w/ JavaScript
@import "modal";
@import "tooltip";
@import "popover";
@import "carousel";
// Utility classes
@import "utilities";