From 4adf994c90a8923bffb2788d0ffbef05878caae1 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 11 Jun 2017 18:20:43 -0400 Subject: [PATCH] chore: Updated fuse-box to 2.1.0 --- client/scss/components/editor.scss | 8 +++++++- fuse.js | 3 +-- package.json | 2 +- yarn.lock | Bin 256744 -> 257110 bytes 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/client/scss/components/editor.scss b/client/scss/components/editor.scss index d5bdae77..856329b5 100644 --- a/client/scss/components/editor.scss +++ b/client/scss/components/editor.scss @@ -374,11 +374,17 @@ .editor-sd { background-color: mc('blue-grey', '100'); &-item { - background-color: mc('blue-grey', '50'); + background-color: mc('blue-grey', '500'); + padding: 5px; &:first-child { margin-top: 60px; } + + & + .editor-sd-item { + margin-top: 5px; + } + } } diff --git a/fuse.js b/fuse.js index c889428f..d77558dc 100644 --- a/fuse.js +++ b/fuse.js @@ -83,7 +83,6 @@ globalTasks.then(() => { homeDir: './client', output: './assets/js/$name.min.js', alias: ALIASES, - shim: SHIMS, plugins: [ fsbx.EnvPlugin({ NODE_ENV: (dev) ? 'development' : 'production' }), fsbx.VuePlugin(), @@ -106,7 +105,7 @@ globalTasks.then(() => { }) } - const bundleApp = fuse.bundle('app').instructions('> index.js') + const bundleApp = fuse.bundle('app').shim(SHIMS).instructions('> index.js') const bundleSetup = fuse.bundle('configure').instructions('> configure.js') switch (mode) { diff --git a/package.json b/package.json index 9a06fd26..3b69a636 100644 --- a/package.json +++ b/package.json @@ -139,7 +139,7 @@ "eslint-plugin-node": "^5.0.0", "eslint-plugin-promise": "^3.5.0", "eslint-plugin-standard": "^3.0.1", - "fuse-box": "^2.0.2", + "fuse-box": "^2.1.0", "i18next-xhr-backend": "^1.4.2", "jest": "^20.0.4", "jquery": "^3.2.1", diff --git a/yarn.lock b/yarn.lock index 0cf8f668fcf6e424f91ad859b2d4dd12950bf427..b29257469c00966bf0c74c5a55b997971b37c9e1 100644 GIT binary patch delta 372 zcmYL^ze@u#9L2foQ1HhUK@=AW6$hbrO)kAO5d;ytIJ>wMl3darl>Snr2+rNTA(Mkc z!BMf$NvNAnPKy2qt{uCG*K5J;y)TdN`@Elz+~-&BVQr9&nl2X&WhSw8d?M?7;frqZ z-?+$w9`Y_~S39Caxnv@gh-x1(U&%6tTu4F)WST+FML=MnpOy#HA!tPHMyqyMg&y`0 z++PCVQgzRxRukmYQ#`?iik_#E#)Wd{@w87-!6Z^rhd5Ef*IILoF%y`=Fey^F%%sn> zc^PE3Ru}LfUrmTdzh~B-6Iby1&0E3L>efbawqv#;)FnbS3>9YqDGMJVMtv4CCW#C} zj%bMnLi70Udoy;N74u%Vrp_EQ`JLkR$B{J}NA_vfJa+6|bA4+U%&={5n^wm@GWXB+ PL2CP;YmY!T^V<6ZB9eLj delta 147 zcmV;E0Brx(*bnH{53muXv#h1_w6|Pa0V58RHSZFa5ElV1m%nKN7B4U^GA?vydLw2r zF*h-0F=IDmHDNV4G-P8qF*Pw{VrF7uH85s3GdW{1G&eV5IG16W0~eQIxB&;35b^>A zmnUig`G+=Z0k<}50!#;&l$rxQmvD0e9+&ZQ0z#L9asnlnC%*zLhj4QOw{UX<=6FO; BGlu{G