ros.grant.common 2.0.154 → 2.0.155-5.1

package/GulpTasks/less.js

@@ -4,7 +4,7 @@ module.exports = function (gulp, paths) {
         var startUrl = `/${paths.serviceName}static/`;
 
         var importPrefix = `@commonImgRoot: '${startUrl}img'; @commonFontsRoot: '${startUrl}fonts/shared';`;
-        gulp.src(paths.common + 'Shared/Styles/variablesCommon.less')
+        gulp.src(paths.common + 'Shared/Styles/CommonVariables.less')
             .pipe(plugins.replace(importPrefix, ''))
             .pipe(plugins.header(importPrefix))
             .pipe(gulp.dest((paths.common + 'Shared/Styles/')));
@@ -15,10 +15,13 @@ module.exports = function (gulp, paths) {
         var excludeClientProjectPath = `!../RosGrant.${serviceNameWithCaptical}.Client/node_modules/**/*.less`;
 
         var stream = gulp.src([paths.nodeModules + 'slick-carousel/slick/slick.less',
+        paths.nodeModules + '@ng-select/ng-select/themes/default.theme.css',
+        paths.nodeModules + 'ngx-toastr/toastr.css',
         paths.nodeModules + 'pickmeup/css/pickmeup.css',
         paths.nodeModules + 'chosen-js/chosen.css',
         paths.nodeModules + 'fine-uploader/fine-uploader/fine-uploader-gallery.css',
-        paths.nodeModules + 'ros.grant.common/Shared/Styles/*.less',
+        paths.nodeModules + 'nouislider/distribute/nouislider.css',
+        paths.nodeModules + 'ros.grant.common/Shared/Styles/**/*.less',
         paths.nodeModules + 'ros.grant.webshared/Shared/Styles/**/*.less',
         paths.nodeModules + 'ros.grant.telerik/Shared/Styles/**/*.less',
             clientProjectPath,
@@ -40,6 +43,5 @@ module.exports = function (gulp, paths) {
             .pipe(gulp.dest(paths.concatCssDest));
 
         return stream;
-
     };
 };

package/GulpTasks/utilsAndPlugins.js

@@ -10,7 +10,7 @@ module.exports = function (gulp, paths) {
             paths.common + 'Shared/Scripts/Initializers/*.{js,ts}',
             paths.webShared + 'Shared/Scripts/SvgSpritesLoader.ts',
             paths.telerik + 'Shared/Scripts/AdminGridInitializer.js',
-            ], { allowEmpty: true })
+        ], { allowEmpty: true })
             .pipe(plugins.typescript({
                 allowEmpty: true,
                 noImplicitAny: false,
@@ -30,6 +30,9 @@ module.exports = function (gulp, paths) {
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/slim.kickstart.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/datepicker.js'))
 
+            //.pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/sticky-sidebar.js'))
+            //.pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.sticky-sidebar.js'))
+
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mousewheel.min.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mousewheel-3.0.6.min.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mCustomScrollbar.min.js'))
@@ -47,6 +50,9 @@ module.exports = function (gulp, paths) {
             .pipe(addsrc.append(paths.nodeModules + 'chosen-js/chosen.jquery.js'))
             .pipe(addsrc.append(paths.nodeModules + 'fine-uploader/fine-uploader/fine-uploader.js'))
             .pipe(addsrc.append(paths.nodeModules + 'slick-carousel/slick/slick.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'nouislider/distribute/nouislider.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'sticky-sidebar/dist/sticky-sidebar.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'sticky-sidebar/dist/jquery.sticky-sidebar.js'))
 
             .pipe(plugins.concat('Utils.js'))
             .pipe(gulp.dest(paths.js));
@@ -58,7 +64,7 @@ module.exports = function (gulp, paths) {
             paths.common + 'Shared/Scripts/Initializers/*.{js,ts}',
             paths.webShared + 'Shared/Scripts/SvgSpritesLoader.ts',
             paths.telerik + 'Shared/Scripts/AdminGridInitializer.js',
-            ], { allowEmpty: true })
+        ], { allowEmpty: true })
             .pipe(plugins.typescript({
                 noImplicitAny: false,
                 noEmitOnError: true,
@@ -80,6 +86,9 @@ module.exports = function (gulp, paths) {
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/notify.min.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/datepicker.js'))
 
+            //.pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/sticky-sidebar.js'))
+            //.pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.sticky-sidebar.js'))
+
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mousewheel.min.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mousewheel-3.0.6.min.js'))
             .pipe(addsrc.append(paths.common + 'Shared/Scripts/Plugins/jquery.mCustomScrollbar.min.js'))
@@ -96,6 +105,9 @@ module.exports = function (gulp, paths) {
             .pipe(addsrc.append(paths.nodeModules + 'chosen-js/chosen.jquery.min.js'))
             .pipe(addsrc.append(paths.nodeModules + 'fine-uploader/fine-uploader/fine-uploader.min.js'))
             .pipe(addsrc.append(paths.nodeModules + 'slick-carousel/slick/slick.min.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'nouislider/distribute/nouislider.min.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'sticky-sidebar/dist/sticky-sidebar.min.js'))
+            .pipe(addsrc.append(paths.nodeModules + 'sticky-sidebar/dist/jquery.sticky-sidebar.min.js'))
 
             .pipe(plugins.concat('Utils.min.js'))
             .pipe(gulp.dest(paths.js));