From 2fdc4a382fc8e538d9b0ee7ae522367de6ffe4e6 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Fri, 11 Aug 2017 11:35:52 +0300 Subject: [PATCH] Import Bootstrap 4 Beta 1 Bring in new bootstrap.scss and align dependencies in package.json with upstream's. See: node_modules/bootstrap/scss/bootstrap.scss --- package.json | 4 ++-- source/scss/bootstrap.scss | 49 ++++++++++++++------------------------ 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/package.json b/package.json index 8ad9119..dd278db 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,8 @@ "author": "Alan Orth", "license": "GPL-3.0", "devDependencies": { - "bootstrap": "4.0.0-alpha.6", - "clean-css-cli": "^4.1.3", + "bootstrap": "4.0.0-beta", + "clean-css-cli": "^4.1.6", "cookieconsent": "^3.0.4", "font-awesome": "^4.7.0", "node-sass": "^4.5.3" diff --git a/source/scss/bootstrap.scss b/source/scss/bootstrap.scss index 76c2504..1fc16f7 100644 --- a/source/scss/bootstrap.scss +++ b/source/scss/bootstrap.scss @@ -1,54 +1,41 @@ /*! - * Bootstrap v4.0.0-alpha.6 (https://getbootstrap.com) + * Bootstrap v4.0.0-beta (https://getbootstrap.com) * Copyright 2011-2017 The Bootstrap Authors * Copyright 2011-2017 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ -// Core variables and mixins +@import "node_modules/bootstrap/scss/functions"; @import "node_modules/bootstrap/scss/variables"; @import "node_modules/bootstrap/scss/mixins"; -@import "node_modules/bootstrap/scss/custom"; - -// Reset and dependencies -@import "node_modules/bootstrap/scss/normalize"; @import "node_modules/bootstrap/scss/print"; - -// Core CSS @import "node_modules/bootstrap/scss/reboot"; @import "node_modules/bootstrap/scss/type"; @import "node_modules/bootstrap/scss/images"; @import "node_modules/bootstrap/scss/code"; @import "node_modules/bootstrap/scss/grid"; -//@import "node_modules/bootstrap/scss/tables"; +@import "node_modules/bootstrap/scss/tables"; @import "node_modules/bootstrap/scss/forms"; @import "node_modules/bootstrap/scss/buttons"; - -// Components -//@import "node_modules/bootstrap/scss/transitions"; -//@import "node_modules/bootstrap/scss/dropdown"; -//@import "node_modules/bootstrap/scss/button-group"; -//@import "node_modules/bootstrap/scss/input-group"; -//@import "node_modules/bootstrap/scss/custom-forms"; +@import "node_modules/bootstrap/scss/transitions"; +@import "node_modules/bootstrap/scss/dropdown"; +@import "node_modules/bootstrap/scss/button-group"; +@import "node_modules/bootstrap/scss/input-group"; +@import "node_modules/bootstrap/scss/custom-forms"; @import "node_modules/bootstrap/scss/nav"; @import "node_modules/bootstrap/scss/navbar"; -//@import "node_modules/bootstrap/scss/card"; -//@import "node_modules/bootstrap/scss/breadcrumb"; +@import "node_modules/bootstrap/scss/card"; +@import "node_modules/bootstrap/scss/breadcrumb"; @import "node_modules/bootstrap/scss/pagination"; -//@import "node_modules/bootstrap/scss/badge"; -//@import "node_modules/bootstrap/scss/jumbotron"; -//@import "node_modules/bootstrap/scss/alert"; -//@import "node_modules/bootstrap/scss/progress"; +@import "node_modules/bootstrap/scss/badge"; +@import "node_modules/bootstrap/scss/jumbotron"; +@import "node_modules/bootstrap/scss/alert"; +@import "node_modules/bootstrap/scss/progress"; @import "node_modules/bootstrap/scss/media"; @import "node_modules/bootstrap/scss/list-group"; -@import "node_modules/bootstrap/scss/responsive-embed"; @import "node_modules/bootstrap/scss/close"; - -// Components w/ JavaScript -//@import "node_modules/bootstrap/scss/modal"; -//@import "node_modules/bootstrap/scss/tooltip"; -//@import "node_modules/bootstrap/scss/popover"; -//@import "node_modules/bootstrap/scss/carousel"; - -// Utility classes +@import "node_modules/bootstrap/scss/modal"; +@import "node_modules/bootstrap/scss/tooltip"; +@import "node_modules/bootstrap/scss/popover"; +@import "node_modules/bootstrap/scss/carousel"; @import "node_modules/bootstrap/scss/utilities";