chore: Upgraded to Bootstrap 4 stable

This commit is contained in:
Federico Zivolo 2018-01-23 13:15:45 +01:00
parent 06e9fcac7d
commit 21f93f0c96
11 changed files with 12454 additions and 620 deletions

View File

@ -1,10 +1,19 @@
{
"presets": [["es2015", { "modules": false }]],
"plugins": [
"external-helpers",
"presets": [
[
"module-alias",
[{ "src": "./node_modules/bootstrap", "expose": "bootstrap" }]
"@babel/env", {
"loose": true,
"modules": false,
"exclude": ["transform-typeof-symbol"]
}
]
],
"plugins": [
"@babel/plugin-proposal-object-rest-spread",
[
"module-resolver", {
"alias": [{ "src": "./node_modules/bootstrap", "expose": "bootstrap" }]
}
]
]
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -5,20 +5,20 @@
@each $color, $value in $colors {
.swatch-#{$color} {
background-color: #{$value};
@include color-yiq($value);
color: color-yiq($value);
}
}
@each $color, $value in $theme-colors {
.swatch-#{$color} {
background-color: #{$value};
@include color-yiq($value);
color: color-yiq($value);
}
}
@each $color, $value in $grays {
.swatch-#{$color} {
background-color: #{$value};
@include color-yiq($value);
color: color-yiq($value);
}
}

View File

@ -10,3 +10,7 @@ $bd-yellow: #ffe484;
$bd-danger: #d9534f;
$bd-warning: #f0ad4e;
$bd-info: #5bc0de;
$theme-colors: (
primary: $brand-primary
)

View File

@ -23,14 +23,11 @@
//
// Happy Bootstrapping!
// Load Bootstrap variables and mixins
@import "../../scss/functions";
@import "../../scss/variables";
@import "~bootstrap/scss/mixins";
@import "../../scss/mixins";
// Load custom Bootstrap variables and core
@import "variables";
@import "../../scss/core";
// Load docs components
@import "variables";
@import "nav";
@import "masthead";
@import "featured-sites";

View File

@ -1,29 +0,0 @@
{
"name": "bootstrap-material-design",
"description": "Material Design for Bootstrap 4",
"keywords": [
"material",
"design",
"bootstrap",
"css",
"js",
"sass",
"mobile-first",
"responsive",
"front-end",
"framework",
"web"
],
"homepage": "http://fezvrasta.github.io/bootstrap-material-design",
"license": "MIT",
"moduleType": "globals",
"main": [
"scss/_core.scss",
"dist/js/bootstrap-material-design.js"
],
"dependencies": {
"jquery": "^2.2",
"popper.js": "^1.10.11",
"bootstrap": "4.0.0-beta"
}
}

View File

@ -45,13 +45,14 @@
},
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.0.0-beta.38",
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-beta.38",
"@babel/preset-env": "^7.0.0-beta.38",
"babel-core": "^6.25.0",
"babel-minify": "^0.2.0",
"babel-plugin-external-helpers": "^6.22.0",
"babel-plugin-module-alias": "^1.6.0",
"babel-plugin-module-resolver": "3",
"babel-plugin-transform-es2015-modules-strip": "^0.1.1",
"babel-preset-es2015": "^6.24.1",
"bootstrap": "4.0.0-beta",
"bootstrap": "^4.0.0",
"cssnano-cli": "^1.0.5",
"jquery": ">=3.0.0",
"node-sass": "^4.5.3",
@ -59,7 +60,7 @@
"popper.js": "^1.11.0",
"prettier": "^1.5.3",
"rollup": "^0.50.0",
"rollup-plugin-babel": "^3.0.1"
"rollup-plugin-babel": "^4.0.0-beta.0"
},
"files": [
"dist",

View File

@ -5,9 +5,21 @@ const babelOptions = JSON.parse(fs.readFileSync('./.babelrc'));
export default {
output: {
format: 'iife',
format: 'umd',
},
globals: {
jquery: 'jQuery',
'popper.js': 'Popper'
},
plugins: [
babel(Object.assign(babelOptions, { babelrc: false })),
babel({
exclude: 'node_modules/**', // Only transpile our source code
externalHelpersWhitelist: [ // Include only required helpers
'defineProperties',
'createClass',
'inheritsLoose',
'extends'
]
})
],
};

View File

@ -1,7 +1,7 @@
// This is the main scss file, provided as an underscored file so that variable contexts remain in-tact when importing from the source.
@import "variables";
@import "mixins";
@import "core-bootstrap"; // FIXME: V4 SCSS inclusion via an underscored file https://github.com/twbs/bootstrap/issues/18350
@import "~bootstrap/scss/bootstrap";
@import "reboot";

1732
yarn.lock

File diff suppressed because it is too large Load Diff