Verified Commit 5bba2fd6 authored by David Haynes's avatar David Haynes 🙆
Browse files

Clone down Bootstrap 4 & begin cleaning

- docs changes
- index.html cleanup & completion beginning
parent fd8c39a3
Pipeline #2067 passed with stages
in 1 minute and 29 seconds
# Masonstrap 4 (Beta 3)
# Masonstrap 4
[![build status](https://git.gmu.edu/srct/masonstrap/badges/master/build.svg)](https://git.gmu.edu/srct/masonstrap/commits/master) [![Gitlab license](https://img.shields.io/badge/license-MIT-blue.svg)](https://git.gmu.edu/srct/masonstrap/raw/master/LICENSE)
......
......@@ -16,48 +16,38 @@ const minify = require('gulp-minify');
const src = './src'
const dest = './build'
// Move fonts to build/fonts
gulp.task('fonts', () => {
let brands = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-brands-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let regular = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-regular-400.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
let solid = gulp.src('./node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/fa-solid-900.woff2')
.pipe(gulp.dest(dest + '/fonts/'))
return merge(brands, regular, solid).pipe(connect.reload())
});
// Move html to build/html
gulp.task('html', () => gulp.src(src + '/html/*.html').pipe(connect.reload())
gulp.task('html', () => gulp.src(src + '/html/*.html')
.pipe(connect.reload())
.pipe(gulp.dest(dest))
);
// Optimize images and move them to build/img
gulp.task('img', () => gulp.src(src + '/img/*').pipe(connect.reload())
.pipe(imagemin())
.pipe(gulp.dest(dest + '/img/'))
gulp.task('img', () => gulp.src(src + '/img/*')
.pipe(connect.reload())
.pipe(imagemin())
.pipe(gulp.dest(dest + '/img/'))
);
// Build masonstrap.min.js
gulp.task('js', () => gulp.src(['./node_modules/jquery/dist/jquery.min.js', './node_modules/bootstrap/dist/js/bootstrap.bundle.min.js', src + '/js/*.js'])
.pipe(concat('masonstrap.js'))
.pipe(minify({ext: ".min.js"}))
.pipe(gulp.dest(dest + '/js/')));
.pipe(concat('masonstrap.js'))
.pipe(minify({ext: ".min.js"}))
.pipe(gulp.dest(dest + '/js/'))
);
// Compile, autoprefix, minify scss with sourcemaps
gulp.task('sass', () => gulp.src(src + '/scss/*.scss').pipe(connect.reload())
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(postcss([autoprefixer()]))
.pipe(sourcemaps.write())
.pipe(gulp.dest(dest + '/css/'))
.pipe(uglifycss())
.pipe(rename({extname: ".min.css"}))
.pipe(gulp.dest(dest + '/css/')
));
gulp.task('sass', () => gulp.src(src + '/scss/*.scss')
.pipe(connect.reload())
.pipe(sourcemaps.init())
.pipe(sass().on('error', sass.logError))
.pipe(postcss([autoprefixer()]))
.pipe(sourcemaps.write())
.pipe(gulp.dest(dest + '/css/'))
.pipe(uglifycss())
.pipe(rename({extname: ".min.css"}))
.pipe(gulp.dest(dest + '/css/'))
);
// Run task whenever associated files change
gulp.task('watch', () => {
......@@ -77,7 +67,7 @@ gulp.task('http', () => {
});
// Run all tasks
gulp.task('build', ['sass', 'html', 'img', 'js', 'fonts']);
gulp.task('build', ['sass', 'html', 'img', 'js']);
// By default, run all tasks and then rebuild on changes
gulp.task('default', ['http', 'build', 'watch']);
\ No newline at end of file
......@@ -37,45 +37,40 @@
<!-- Navbar -->
<nav class="navbar navbar-expand-lg navbar-dark bg-primary">
<a class="navbar-brand d-flex mx-auto" href="./index.html">
<img src="./img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top" alt="SRCT Masonstrap">
&nbsp;Masonstrap&nbsp;
</a>
<div class="container">
<a class="navbar-brand d-flex mx-auto mr-2" href="./index.html">
<img src="./img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top mr-2" alt="SRCT Masonstrap">
Masonstrap 4
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item">
<a class="nav-link" href="./demo.html">Demo</a>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Source Files
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<a class="dropdown-item" href="./css/masonstrap.css">masonstrap.css</a>
</div>
</li>
</ul>
<a class="btn accent-btn-outline" href="https://git.gmu.edu/srct/masonstrap/-/jobs/artifacts/master/download?job=build">Download</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<ul class="navbar-nav mr-auto mt-2 mt-lg-0">
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Source Files
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<h6 class="dropdown-header">CSS</h6>
<a class="dropdown-item" href="./css/masonstrap.css">masonstrap.css</a>
<a class="dropdown-item" href="./css/masonstrap.min.css">masonstrap.min.css</a>
<div class="dropdown-divider"></div>
<h6 class="dropdown-header">JS</h6>
<a class="dropdown-item" href="./js/masonstrap.js">masonstrap.js</a>
<a class="dropdown-item" href="./js/masonstrap.min.js">masonstrap.min.js</a>
</div>
</li>
</ul>
<a class="btn accent-btn-outline" href="https://git.gmu.edu/srct/masonstrap/-/jobs/artifacts/master/download?job=build">Download</a>
</div>
</div>
</nav>
<body style="">
<div class="container" style="padding-top: 5rem;">
<h1>
<span class="fa-stack">
<i class="fas fa-circle fa-stack-2x"></i>
<i class="fas fa-paint-brush fa-stack-1x fa-inverse"></i>
</span> Masonstrap
</h1>
<hr />
</body>
<!-- load in external js -->
<script src="./js/masonstrap.min.js"></script>
......
// Masonstrap 4.0 Variables
// Global External Packages Settings -------------------------------------------
$fa-font-path: "../fonts";
// Global Bootstrap Options Overrides ------------------------------------------
......
/*!
* Masonstrap 4.0 Beta 3
* Masonstrap 4.0
*
* author: Mason SRCT (https://srct.gmu.edu)
* source code: (https://git.gmu.edu/srct/masonstrap)
......
......@@ -2,25 +2,37 @@
# yarn lockfile v1
"@fortawesome/fontawesome-common-types@^0.1.2":
version "0.1.2"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.1.2.tgz#d6aa075058f0c984d6e2ebcbc0052c1f7f9bea72"
"@fortawesome/fontawesome-free-brands@^5.0.0":
version "5.0.2"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.2.tgz#a1cc602eec40a379a3dd8a44c78b31110dd3d3d3"
version "5.0.6"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-brands/-/fontawesome-free-brands-5.0.6.tgz#fee054ce0c4d74019020f6353ca85cfb408de719"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.1.2"
"@fortawesome/fontawesome-free-regular@^5.0.0":
version "5.0.2"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.2.tgz#429af86bed14689f87648e6322983c65c782c017"
version "5.0.6"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-regular/-/fontawesome-free-regular-5.0.6.tgz#fafc624025a247c1a1bbb5080b9902a490cd79f5"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.1.2"
"@fortawesome/fontawesome-free-solid@^5.0.0":
version "5.0.2"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.2.tgz#090ce2c59dd5ec76983f3da8a43e1ab0321b42d5"
version "5.0.6"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-solid/-/fontawesome-free-solid-5.0.6.tgz#6bb5acdd081b03ab25b7684f7089b37ed3d20740"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.1.2"
"@fortawesome/fontawesome-free-webfonts@^1.0.0":
version "1.0.1"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.1.tgz#29728c7edcb62148febadc4e00a2a032e246fcf8"
"@fortawesome/fontawesome-free-webfonts@^1.0.2":
version "1.0.3"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.3.tgz#de12e529b7224fd30926e1df17afacad73342e88"
"@fortawesome/fontawesome@^1.0.0":
version "1.1.0"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome/-/fontawesome-1.1.0.tgz#2a949fa46d96e41092e67218b42579f8e54c7b7f"
version "1.1.3"
resolved "https://npm.fontawesome.com/6AA31A0B-D000-4323-91AA-F338DEBE87D7/@fortawesome/fontawesome/-/fontawesome-1.1.3.tgz#7a4844345cbc7fb238f5f1788af73bd302ee9b80"
dependencies:
"@fortawesome/fontawesome-common-types" "^0.1.2"
"@gulp-sourcemaps/identity-map@1.X":
version "1.0.1"
......@@ -74,12 +86,30 @@ amdefine@>=0.0.4:
version "1.0.1"
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
ansi-colors@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.0.1.tgz#e94c6c306005af8b482240241e2f3dea4b855ff3"
dependencies:
ansi-wrap "^0.1.0"
ansi-cyan@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
dependencies:
ansi-wrap "0.1.0"
ansi-gray@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
dependencies:
ansi-wrap "0.1.0"
ansi-red@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
dependencies:
ansi-wrap "0.1.0"
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
......@@ -102,7 +132,7 @@ ansi-styles@^3.1.0:
dependencies:
color-convert "^1.9.0"
ansi-wrap@0.1.0:
ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
......@@ -133,6 +163,13 @@ argparse@^1.0.7:
dependencies:
sprintf-js "~1.0.2"
arr-diff@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
dependencies:
arr-flatten "^1.0.1"
array-slice "^0.2.3"
arr-diff@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
......@@ -147,6 +184,10 @@ arr-flatten@^1.0.1, arr-flatten@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
arr-union@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
arr-union@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
......@@ -163,6 +204,10 @@ array-find-index@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
array-slice@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
array-slice@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
......@@ -222,14 +267,14 @@ atob@~1.1.0:
resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
autoprefixer@^7.1.4:
version "7.2.3"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.3.tgz#c2841e38b7940c2d0a9bbffd72c75f33637854f8"
version "7.2.5"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.5.tgz#04ccbd0c6a61131b6d13f53d371926092952d192"
dependencies:
browserslist "^2.10.0"
caniuse-lite "^1.0.30000783"
browserslist "^2.11.1"
caniuse-lite "^1.0.30000791"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^6.0.14"
postcss "^6.0.16"
postcss-value-parser "^3.2.3"
aws-sign2@~0.6.0:
......@@ -390,9 +435,9 @@ boom@5.x.x:
dependencies:
hoek "4.x.x"
bootstrap@4.0.0-beta.2:
version "4.0.0-beta.2"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-beta.2.tgz#4d67d2aa2219f062cd90bc1247e6747b9e8fd051"
bootstrap@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0.tgz#ceb03842c145fcc1b9b4e15da2a05656ba68469a"
brace-expansion@^1.0.0, brace-expansion@^1.1.7:
version "1.1.8"
......@@ -425,12 +470,12 @@ braces@^2.3.0:
split-string "^3.0.2"
to-regex "^3.0.1"
browserslist@^2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
browserslist@^2.11.1:
version "2.11.3"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2"
dependencies:
caniuse-lite "^1.0.30000780"
electron-to-chromium "^1.3.28"
caniuse-lite "^1.0.30000792"
electron-to-chromium "^1.3.30"
buffer-crc32@~0.2.3:
version "0.2.13"
......@@ -490,9 +535,9 @@ camelcase@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783:
version "1.0.30000784"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
caniuse-lite@^1.0.30000791, caniuse-lite@^1.0.30000792:
version "1.0.30000792"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz#d0cea981f8118f3961471afbb43c9a1e5bbf0332"
capture-stack-trace@^1.0.0:
version "1.0.0"
......@@ -550,13 +595,12 @@ clap@^1.0.9:
chalk "^1.1.3"
class-utils@^0.3.5:
version "0.3.5"
resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
version "0.3.6"
resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
dependencies:
arr-union "^3.1.0"
define-property "^0.2.5"
isobject "^3.0.0"
lazy-cache "^2.0.2"
static-extend "^0.1.1"
cliui@^3.2.0:
......@@ -648,9 +692,9 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
dependencies:
delayed-stream "~1.0.0"
commander@^2.9.0, commander@~2.12.1:
version "2.12.2"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
commander@^2.9.0, commander@~2.13.0:
version "2.13.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
commander@~2.8.1:
version "2.8.1"
......@@ -692,10 +736,10 @@ concat-stream@^1.4.6, concat-stream@^1.4.7:
typedarray "^0.0.6"
concat-with-sourcemaps@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
version "1.0.5"
resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.5.tgz#8964bc2347d05819b63798104d87d6e001bed8d0"
dependencies:
source-map "^0.5.1"
source-map "^0.6.1"
connect-livereload@^0.5.4:
version "0.5.4"
......@@ -1025,8 +1069,8 @@ depd@~1.0.1:
resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
depd@~1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
version "1.1.2"
resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
deprecated@^0.0.1:
version "0.0.1"
......@@ -1081,8 +1125,8 @@ duplexer@~0.1.1:
resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
duplexify@^3.2.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
version "3.5.3"
resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
dependencies:
end-of-stream "^1.0.0"
inherits "^2.0.1"
......@@ -1106,19 +1150,13 @@ ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
electron-releases@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
electron-to-chromium@^1.3.28:
version "1.3.30"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
dependencies:
electron-releases "^2.1.0"
electron-to-chromium@^1.3.30:
version "1.3.31"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz#00d832cba9fe2358652b0c48a8816c8e3a037e9f"
end-of-stream@^1.0.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
version "1.4.1"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
dependencies:
once "^1.4.0"
......@@ -1142,13 +1180,13 @@ errorhandler@~1.4.2:
escape-html "~1.0.3"
es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
version "0.10.37"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
version "0.10.38"
resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.38.tgz#fa7d40d65bbc9bb8a67e1d3f9cc656a00530eed3"
dependencies:
es6-iterator "~2.0.1"
es6-iterator "~2.0.3"
es6-symbol "~3.1.1"
es6-iterator@^2.0.1, es6-iterator@~2.0.1:
es6-iterator@^2.0.1, es6-iterator@~2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
dependencies:
......@@ -1294,6 +1332,12 @@ express-session@~1.11.3:
uid-safe "~2.0.0"
utils-merge "1.0.0"
extend-shallow@^1.1.2:
version "1.1.4"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
dependencies:
kind-of "^1.1.0"
extend-shallow@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
......@@ -1318,8 +1362,8 @@ extglob@^0.3.1:
is-extglob "^1.0.0"
extglob@^2.0.2:
version "2.0.3"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29"
version "2.0.4"
resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
dependencies:
array-unique "^0.3.2"
define-property "^1.0.0"
......@@ -1338,7 +1382,7 @@ extsprintf@^1.2.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
fancy-log@^1.1.0:
fancy-log@^1.1.0, fancy-log@^1.3.2:
version "1.3.2"
resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
dependencies:
......@@ -1755,8 +1799,8 @@ globule@~0.1.0:
minimatch "~0.2.11"
glogg@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
version "1.0.1"
resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.1.tgz#dcf758e44789cc3f3d32c1f3562a3676e6a34810"
dependencies:
sparkles "^1.0.0"
......@@ -1807,13 +1851,15 @@ gulp-concat@^2.6.1:
vinyl "^2.0.0"
gulp-connect@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/gulp-connect/-/gulp-connect-5.0.0.tgz#f2fdf306ae911468368c2285f2d782f13eddaf4e"
version "5.2.0"
resolved "https://registry.yarnpkg.com/gulp-connect/-/gulp-connect-5.2.0.tgz#0858e5ca7ea6ea1f1d774e2107fc91f8a534b95b"
dependencies:
ansi-colors "^1.0.1"
connect "^2.30.0"
connect-livereload "^0.5.4"
event-stream "^3.3.2"
gulp-util "^3.0.6"
fancy-log "^1.3.2"
send "^0.13.2"
tiny-lr "^0.2.1"
gulp-decompress@^1.2.0:
......@@ -1851,10 +1897,11 @@ gulp-minify@^2.1.0:
uglify-es "^3.0.3"
gulp-postcss@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-7.0.0.tgz#cfb62a19fa947f8be67ce9ecae89ceb959f0cf93"
version "7.0.1"
resolved "https://registry.yarnpkg.com/gulp-postcss/-/gulp-postcss-7.0.1.tgz#3f1c36db1197140c399c252ddff339129638e395"
dependencies:
gulp-util "^3.0.8"
fancy-log "^1.3.2"
plugin-error "^0.1.2"
postcss "^6.0.0"
postcss-load-config "^1.2.0"
vinyl-sourcemaps-apply "^0.2.1"
......@@ -1884,8 +1931,8 @@ gulp-sourcemaps@1.6.0:
vinyl "^1.0.0"
gulp-sourcemaps@^2.6.1:
version "2.6.2"
resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.2.tgz#4f41c72b35a7ea06b666d2e3f57917e2c0e71c4e"
version "2.6.4"
resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz#cbb2008450b1bcce6cd23bf98337be751bf6e30a"
dependencies:
"@gulp-sourcemaps/identity-map" "1.X"
"@gulp-sourcemaps/map-sources" "1.X"
......@@ -1895,7 +1942,7 @@ gulp-sourcemaps@^2.6.1:
debug-fabulous "1.X"
detect-newline "2.X"
graceful-fs "4.X"
source-map "0.X"
source-map "~0.6.0"
strip-bom-string "1.X"
through2 "2.X"
......@@ -1932,7 +1979,7 @@ gulp-util@^2.2.14:
through2 "^0.5.0"
vinyl "^0.2.1"
gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.6, gulp-util@^3.0.8:
gulp-util@^3.0, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
dependencies:
......@@ -2511,12 +2558,12 @@ jpegtran-bin@^3.0.0:
logalot "^2.0.0"
jquery@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
js-base64@^2.1.8:
version "2.4.0"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
version "2.4.2"
resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.2.tgz#1896da010ef8862f385d8887648e9b6dc4a7a2e9"
js-yaml@^3.4.3:
version "3.10.0"
......@@ -2571,6 +2618,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
kind-of@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.1.0, kind-of@^3.2.0:
version "3.2.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
......@@ -2627,8 +2678,8 @@ liftoff@^2.1.0:
resolve "^1.1.7"
livereload-js@^2.2.0:
version "2.2.2"
resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.2.2.tgz#6c87257e648ab475bc24ea257457edcc1f8d0bc2"
version "2.3.0"
resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a"
load-json-file@^1.0.0:
version "1.1.0"
......@@ -2998,8 +3049,8 @@ micromatch@^2.3.7:
regex-cache "^0.4.2"
micromatch@^3.0.4:
version "3.1.4"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
version "3.1.5"
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
dependencies:
arr-diff "^4.0.0"
array-unique "^0.3.2"
......@@ -3117,8 +3168,8 @@ nan@^2.3.2:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
nanomatch@^1.2.5:
version "1.2.6"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
version "1.2.7"
resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
dependencies:
arr-diff "^4.0.0"
array-unique "^0.3.2"
......@@ -3502,6 +3553,16 @@ pinkie@^2.0.0:
version "2.0.4"
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
plugin-error@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
dependencies:
ansi-cyan "^0.1.1"