Commit 3d674147 authored by Dipesh Batheja's avatar Dipesh Batheja

bootstrap 4.1.0 updated with popper.js

parent bb1164e2
This diff is collapsed.
...@@ -10,44 +10,44 @@ ...@@ -10,44 +10,44 @@
"license": "MIT", "license": "MIT",
"description": "Frontend Starter Kit", "description": "Frontend Starter Kit",
"devDependencies": { "devDependencies": {
"autoprefixer": "^6.3.6", "autoprefixer": "^6.7.7",
"browser-sync": "^2.12.10", "browser-sync": "^2.23.6",
"chalk": "^1.1.3", "chalk": "^1.1.3",
"cssnano": "^3.7.0", "cssnano": "^3.10.0",
"decache": "^4.1.0", "decache": "^4.4.0",
"del": "^2.2.0", "del": "^2.2.0",
"eslint": "^2.11.1", "eslint": "^2.11.1",
"fs": "0.0.2", "fs": "0.0.2",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-changed": "^1.3.0", "gulp-changed": "^1.3.0",
"gulp-data": "^1.2.1", "gulp-data": "^1.3.1",
"gulp-htmlhint": "^0.3.1", "gulp-htmlhint": "^0.3.1",
"gulp-htmlhint-html-reporter": "^1.0.1", "gulp-htmlhint-html-reporter": "^1.0.1",
"gulp-if": "^2.0.1", "gulp-if": "^2.0.1",
"gulp-imagemin": "^3.0.1", "gulp-imagemin": "^3.4.0",
"gulp-inject": "^4.1.0", "gulp-inject": "^4.3.2",
"gulp-load-plugins": "^1.2.4", "gulp-load-plugins": "^1.5.0",
"gulp-notify": "^2.2.0", "gulp-notify": "^2.2.0",
"gulp-nunjucks-render": "^2.0.0", "gulp-nunjucks-render": "^2.2.2",
"gulp-postcss": "^6.1.1", "gulp-postcss": "^6.4.0",
"gulp-prettify": "^0.5.0", "gulp-prettify": "^0.5.0",
"gulp-rucksack": "^0.1.3", "gulp-rucksack": "^0.1.4",
"gulp-sass": "^2.3.1", "gulp-sass": "^2.3.1",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.12.1",
"gulp-svgstore": "^6.0.0", "gulp-svgstore": "^6.1.1",
"gulp-typescript": "^2.13.6", "gulp-typescript": "^2.13.6",
"gulp-util": "^3.0.7", "gulp-util": "^3.0.8",
"gulp-watch": "^4.3.6", "gulp-watch": "^4.3.6",
"htmlhint": "^0.9.13", "htmlhint": "^0.9.13",
"htmlhint-stylish": "^1.0.3", "htmlhint-stylish": "^1.0.3",
"jsonfile": "^2.3.1", "jsonfile": "^2.3.1",
"lodash": "^4.13.1", "lodash": "^4.17.5",
"merge-stream": "^1.0.0", "merge-stream": "^1.0.0",
"postcss-object-fit-images": "^1.1.2", "postcss-object-fit-images": "^1.1.2",
"require-dir": "^0.3.0", "require-dir": "^0.3.2",
"run-sequence": "^1.2.1", "run-sequence": "^1.2.1",
"stylelint": "^7.2.0", "stylelint": "^7.13.0",
"stylelint-config-sass-guidelines": "^1.1.0", "stylelint-config-sass-guidelines": "^1.1.1",
"stylelint-config-standard": "^13.0.0", "stylelint-config-standard": "^13.0.0",
"ts-node": "^0.7.3", "ts-node": "^0.7.3",
"tslint": "^3.10.2", "tslint": "^3.10.2",
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
"yargs": "^4.7.1" "yargs": "^4.7.1"
}, },
"dependencies": { "dependencies": {
"bootstrap": "4.0.0-alpha.5", "bootstrap": "4.1.0",
"jquery": "^2.2.4", "jquery": "^2.2.4",
"object-fit-images": "^2.5.9",
"lt-ie-9": "^0.1.0", "lt-ie-9": "^0.1.0",
"tether": "^1.3.2" "object-fit-images": "^2.5.9",
"popper.js": "^1.14.3"
} }
} }
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{ "src": "node_modules/lt-ie-9/lt-ie-9.js", "inject": "lt-ie-9" }, { "src": "node_modules/lt-ie-9/lt-ie-9.js", "inject": "lt-ie-9" },
{ "src": "node_modules/jquery/dist/jquery.js", "inject": "footer" }, { "src": "node_modules/jquery/dist/jquery.js", "inject": "footer" },
{ "src": "node_modules/tether/dist/js/tether.js", "inject": "footer" }, { "src": "node_modules/popper.js/dist/umd/popper.js", "inject": "footer" },
{ "src": "node_modules/bootstrap/dist/js/bootstrap.js", "inject": "footer" }, { "src": "node_modules/bootstrap/dist/js/bootstrap.js", "inject": "footer" },
{ "src": "node_modules/object-fit-images/dist/ofi.browser.js", "inject": "footer" }, { "src": "node_modules/object-fit-images/dist/ofi.browser.js", "inject": "footer" },
{ "src": "src/client/javascript/main.js", "inject": "footer" } { "src": "src/client/javascript/main.js", "inject": "footer" }
......
@import 'variables/main.scss';
@import "../../../node_modules/bootstrap/scss/bootstrap.scss"; @import "../../../node_modules/bootstrap/scss/bootstrap.scss";
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
/// @param {Number} $base [$font-size-root] - The base value to use when calculating the `rem`. /// @param {Number} $base [$font-size-root] - The base value to use when calculating the `rem`.
/// ///
/// @returns {List} A list of converted values. /// @returns {List} A list of converted values.
@function rem-calc($values, $base: $font-size-root) { @function rem-calc($values, $base: 16px) {
$rem-values: (); $rem-values: ();
$count: length($values); $count: length($values);
......
@import "../../../../node_modules/bootstrap/scss/functions.scss";
@import "bootstrap"; @import "bootstrap";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment