diff --git a/gulpfile.js b/gulpfile.js index f628d64aaec..e39de7faa17 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -269,6 +269,18 @@ gulp.task('dist:move', function () { }); gulp.task('dist:css', function () { + distCss({}); +}); + +gulp.task('dist:css:edge', function () { + distCss({ edge: true }); +}); + +gulp.task('dist:css:firefox', function () { + distCss({ firefox: true }); +}); + +function distCss(preprocessContext) { return gulp .src([ // libs @@ -277,9 +289,10 @@ gulp.task('dist:css', function () { // app paths.cssDir + 'popup.css' ]) + .pipe(preprocess({ context: preprocessContext })) .pipe(concat(paths.dist + 'popup/css/popup.css')) .pipe(gulp.dest('.')); -}); +} gulp.task('dist:js', function () { return distJs(false); @@ -334,17 +347,24 @@ gulp.task('dist:preprocess', function () { }); gulp.task('dist', ['build'], function (cb) { - return dist(false, cb); + return dist({}, cb); }); gulp.task('dist:edge', ['build'], function (cb) { - return dist(true, cb); + return dist({ edge: true }, cb); }); -function dist(edge, cb) { +gulp.task('dist:firefox', ['build'], function (cb) { + return dist({ firefox: true }, cb); +}); + +function dist(o, cb) { + var distCss = o.edge ? 'dist:css:edge' : o.firefox ? 'dist:css:firefox' : 'dist:css'; + var distJs = o.edge ? 'dist:js:edge' : 'dist:js'; + return runSequence( 'dist:clean', - ['dist:move', 'dist:css', edge ? 'dist:js:edge' : 'dist:js'], + ['dist:move', distCss, distJs], 'dist:preprocess', cb); } @@ -355,7 +375,7 @@ var sidebarActionManifestObj = { "default_icon": "images/icon19.png" }; -gulp.task('dist-firefox', ['dist'], function (cb) { +gulp.task('dist-firefox', ['dist:firefox'], function (cb) { gulp.src(paths.dist + 'manifest.json') .pipe(jeditor(function (manifest) { manifest.applications = { diff --git a/src/popup/app/global/mainController.js b/src/popup/app/global/mainController.js index b9dff7187d1..6bc1fe23615 100644 --- a/src/popup/app/global/mainController.js +++ b/src/popup/app/global/mainController.js @@ -8,7 +8,6 @@ angular self.animation = ''; self.xsBody = $window.screen.availHeight < 600; self.smBody = !self.xsBody && $window.screen.availHeight <= 800; - self.lgBody = !self.xsBody && !self.smBody && utilsService && !utilsService.isFirefox() && !utilsService.isEdge(); self.disableSearch = utilsService && utilsService.isEdge(); self.inSidebar = utilsService && utilsService.inSidebar($window); diff --git a/src/popup/index.html b/src/popup/index.html index abc98ac079d..53fc5d12b9b 100644 --- a/src/popup/index.html +++ b/src/popup/index.html @@ -18,7 +18,7 @@ + ng-class="{sm: main.smBody, xs: main.xsBody }">