From 848799414aade11c0ac78a3347efa0db7d4cc952 Mon Sep 17 00:00:00 2001 From: Neha Gupta Date: Tue, 11 Sep 2018 16:48:54 +0900 Subject: [PATCH] Updated patternfly version from v3.29.13 to v3.51.1 Bugzilla: 1627651 tendrl-bug-id: https://github.com/Tendrl/ui/issues/1054 --- gulpfile.js | 115 +++++++++--------- package.json | 3 +- src/commons/scss/_base.scss | 8 +- .../tasks/task-detail/task-detail.html | 2 +- 4 files changed, 68 insertions(+), 60 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index ad06fd8e..4c7ce605 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -49,7 +49,7 @@ var buildMode = process.argv[2] || "release"; var browsers = pluginOpts.targetBrowsers; // System wide paths -var paths = (function () { +var paths = (function() { var src = "./src/"; @@ -69,7 +69,7 @@ var paths = (function () { })(); // File selection filters -var filters = (function () { +var filters = (function() { return { all: "**/*.*", js: "**/*.{js,jst}", @@ -88,55 +88,56 @@ del.sync([paths.dest]); //Copy js file of the dependent libraries gulp.task("jsLibraries", function() { - return gulp.src([ - "node_modules/d3/d3.min.js", - "node_modules/c3/c3.min.js", - "node_modules/jquery/dist/jquery.min.js", - "node_modules/bootstrap/dist/js/bootstrap.min.js", // For dropdown : temporary - "node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js", - "node_modules/angular/angular.js", - "node_modules/angular-ui-bootstrap/dist/ui-bootstrap.min.js", - "node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js", - "node_modules/angular-sanitize/angular-sanitize.min.js", - "node_modules/angular-animate/angular-animate.min.js", - "node_modules/angular-aria/angular-aria.min.js", - "node_modules/@uirouter/angularjs/release/angular-ui-router.min.js", - "node_modules/patternfly/dist/js/patternfly.js", - "node_modules/angular-patternfly/node_modules/lodash/lodash.min.js", - "node_modules/angular-patternfly/dist/angular-patternfly.js", - "node_modules/c3-angular/c3-angular.min.js", - "node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js", - "node_modules/angular-bootstrap-switch/dist/angular-bootstrap-switch.min.js", - "node_modules/angular-patternfly/node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js", - "node_modules/datatables/media/js/jquery.dataTables.js", - "node_modules/angular-patternfly/node_modules/angularjs-datatables/dist/angular-datatables.js" - ]) - .pipe(uglify()) - .pipe(concat("libraries.js")) - .pipe(gulp.dest(paths.dest + paths.jsLibraries)); + return gulp.src([ + "node_modules/d3/d3.min.js", + "node_modules/c3/c3.min.js", + "node_modules/jquery/dist/jquery.min.js", + "node_modules/bootstrap/dist/js/bootstrap.min.js", // For dropdown : temporary + "node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js", + "node_modules/bootstrap-select/dist/js/bootstrap-select.js", + "node_modules/angular/angular.js", + "node_modules/angular-ui-bootstrap/dist/ui-bootstrap.min.js", + "node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js", + "node_modules/angular-sanitize/angular-sanitize.min.js", + "node_modules/angular-animate/angular-animate.min.js", + "node_modules/angular-aria/angular-aria.min.js", + "node_modules/@uirouter/angularjs/release/angular-ui-router.min.js", + "node_modules/patternfly/dist/js/patternfly.js", + "node_modules/angular-patternfly/node_modules/lodash/lodash.min.js", + "node_modules/angular-patternfly/dist/angular-patternfly.js", + "node_modules/c3-angular/c3-angular.min.js", + "node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js", + "node_modules/angular-bootstrap-switch/dist/angular-bootstrap-switch.min.js", + "node_modules/angular-patternfly/node_modules/angular-drag-and-drop-lists/angular-drag-and-drop-lists.js", + "node_modules/datatables/media/js/jquery.dataTables.js", + "node_modules/angular-patternfly/node_modules/angularjs-datatables/dist/angular-datatables.js" + ]) + .pipe(uglify()) + .pipe(concat("libraries.js")) + .pipe(gulp.dest(paths.dest + paths.jsLibraries)); }); //Copy css file of the dependent libraries gulp.task("cssLibraries", function() { - return gulp.src([ - "node_modules/patternfly/dist/css/patternfly.css", - "node_modules/patternfly/dist/css/patternfly-additions.css", - "node_modules/angular-patternfly/styles/angular-patternfly.css", - "node_modules/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css" - ]) - .pipe(postCss([autoprefixer({ browsers: browsers })])) - .pipe(buildMode === "dev" ? noop() : minifyCSS()) - .pipe(concat("libraries.css")) - .pipe(gulp.dest(paths.dest + paths.cssLibraries)); + return gulp.src([ + "node_modules/patternfly/dist/css/patternfly.css", + "node_modules/patternfly/dist/css/patternfly-additions.css", + "node_modules/angular-patternfly/styles/angular-patternfly.css", + "node_modules/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.min.css" + ]) + .pipe(postCss([autoprefixer({ browsers: browsers })])) + .pipe(buildMode === "dev" ? noop() : minifyCSS()) + .pipe(concat("libraries.css")) + .pipe(gulp.dest(paths.dest + paths.cssLibraries)); }); //Copy all the application files to dist except js and css -gulp.task("copy", function () { +gulp.task("copy", function() { var filesToCopy; filesToCopy = [filters.all, "!../package.json", "!" + filters.jscss]; - paths.htmlFiles.forEach(function (htmlFile) { + paths.htmlFiles.forEach(function(htmlFile) { //filesToCopy.push("!" + htmlFile); }); @@ -145,7 +146,7 @@ gulp.task("copy", function () { }); //Task to do eslint -gulp.task("eslint", function () { +gulp.task("eslint", function() { return gulp.src([filters.js], { cwd: paths.src }) .pipe(eslint()) .pipe(eslint.format("stylish")) @@ -153,7 +154,7 @@ gulp.task("eslint", function () { }); //Copy the files needed to load before the bootstraping of application -gulp.task("preload", ["eslint"], function () { +gulp.task("preload", ["eslint"], function() { return gulp.src(paths.preloads, { base: paths.src, cwd: paths.src }) .pipe(concat("preload.jst", { newLine: ";" })) @@ -163,7 +164,7 @@ gulp.task("preload", ["eslint"], function () { }); //Compile the scss files -gulp.task("sass", function () { +gulp.task("sass", function() { return gulp.src([paths.cssMain], { base: paths.src, cwd: paths.src }) .pipe(sass()) .pipe(cssimport({ @@ -175,13 +176,13 @@ gulp.task("sass", function () { }); //Copy the resources(fonts etc) to dist folder -gulp.task("resource", function (done) { +gulp.task("resource", function(done) { var streams = merge(), resources = Object.keys(paths.resources); if (resources.length > 0) { - resources.forEach(function (resource) { + resources.forEach(function(resource) { var stream = gulp.src(resource, { cwd: paths.src }) .pipe(gulp.dest(paths.dest + paths.resources[resource])); @@ -196,7 +197,7 @@ gulp.task("resource", function (done) { }); //bundle application js files in plugin-bundle.js and copy it to dist -gulp.task("jsbundle", ["eslint"], function () { +gulp.task("jsbundle", ["eslint"], function() { return gulp.src(paths.jsFiles, { cwd: paths.src }) .pipe(concat("plugin-bundle.js")) @@ -212,25 +213,25 @@ gulp.task("watcher", ["browser-sync", "common"], function(done) { filesToCopy = [filters.images, filters.html]; - paths.htmlFiles.forEach(function (htmlPath) { + paths.htmlFiles.forEach(function(htmlPath) { //filesToCopy.push("!" + htmlPath); }); - gulp.watch(filesToCopy, { cwd: paths.src }, function (event) { + gulp.watch(filesToCopy, { cwd: paths.src }, function(event) { log("Modified:", colors.yellow(event.path)); runSequence("copy"); }); - gulp.watch(paths.htmlFiles, { cwd: paths.src }, function (event) { + gulp.watch(paths.htmlFiles, { cwd: paths.src }, function(event) { log("Modified:", colors.yellow(event.path)); }); - gulp.watch(filters.js, { cwd: paths.src }, function (event) { + gulp.watch(filters.js, { cwd: paths.src }, function(event) { log("Modified:", colors.yellow(event.path)); runSequence("preload", "jsbundle"); }); - gulp.watch([filters.css, filters.scss], { cwd: paths.src }, function (event) { + gulp.watch([filters.css, filters.scss], { cwd: paths.src }, function(event) { log("Modified:", colors.yellow(event.path)); runSequence("sass"); }); @@ -246,14 +247,14 @@ gulp.task("browser-sync", ["common"], function() { middleware: [historyApiFallback()] }, - //proxy: "localhost:8080", + //proxy: "localhost:8080", files: ["dist/**/*.*"], reloadDebounce: 500 }); }); //Run the unit tests -gulp.task("ut", function (done) { +gulp.task("ut", function(done) { var config = { configFile: __dirname + "/karma.conf.js", singleRun: true @@ -265,14 +266,14 @@ gulp.task("ut", function (done) { gulp.task("common", ["eslint", "jsLibraries", "cssLibraries", "resource", "copy", "preload", "sass", "jsbundle"]); // dev mode task -gulp.task("dev", ["common", "watcher"], function (done) { +gulp.task("dev", ["common", "watcher"], function(done) { log(colors.bold(colors.yellow("Watchers Established. You can now start coding"))); }); // production mode task -gulp.task("release", ["common"], function (done) { - runSequence("ut", done); +gulp.task("release", ["common"], function(done) { + runSequence("ut", done); }); //default task is common -gulp.task("default", ["common"]); +gulp.task("default", ["common"]); \ No newline at end of file diff --git a/package.json b/package.json index 5783a75b..4da84056 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "angular-ui-bootstrap": "~2.2.0", "bootstrap": "^3.3.7", "bootstrap-datepicker": "~1.6.4", + "bootstrap-select": "^1.12.4", "bootstrap-tooltip": "~3.1.1", "c3": "~0.4.11", "c3-angular": "git://github.com/jettro/c3-angular-directive#1.3.1", @@ -27,7 +28,7 @@ "idb-wrapper": "~1.7.1", "jquery": "~3.1.1", "numeral": "~1.5.3", - "patternfly": "~3.29.13" + "patternfly": "~3.51.1" }, "devDependencies": { "angular-mocks": "~1.5.8", diff --git a/src/commons/scss/_base.scss b/src/commons/scss/_base.scss index da57d06f..5bb5879f 100644 --- a/src/commons/scss/_base.scss +++ b/src/commons/scss/_base.scss @@ -27,7 +27,7 @@ font-weight: bold; } -.dropdown-menu > li > a.disabled { +.dropdown-menu>li>a.disabled { cursor: not-allowed; pointer-events: none; color: $color-light-grey; @@ -203,3 +203,9 @@ color: $color-gray !important; } } + +@media screen and (min-width: 768px) { + .toolbar-pf-actions .toolbar-pf-filter { + width: 25%; + } +} \ No newline at end of file diff --git a/src/modules/tasks/task-detail/task-detail.html b/src/modules/tasks/task-detail/task-detail.html index 9caba858..fc7bfd77 100644 --- a/src/modules/tasks/task-detail/task-detail.html +++ b/src/modules/tasks/task-detail/task-detail.html @@ -13,7 +13,7 @@
- +