diff --git a/client/cat3/Gruntfile.js b/client/cat3/Gruntfile.js
index 0ef665e08..8619729ba 100644
--- a/client/cat3/Gruntfile.js
+++ b/client/cat3/Gruntfile.js
@@ -82,14 +82,12 @@ module.exports = function(grunt) {
{'catalyst/partials/global.css':'src/partials/global.scss'},
{'catalyst/partials/globals/treeComponent/treeDirective.css':'src/partials/globals/treeComponent/treeDirective.scss'},
{'catalyst/partials/sections/dashboard/workzone/workzone.css':'src/partials/sections/dashboard/workzone/workzone.scss'},
- {'catalyst/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.css':'src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss'},
{'catalyst/partials/sections/dashboard/workzone/instance/instance.css':'src/partials/sections/dashboard/workzone/instance/instance.scss'},
{'catalyst/partials/sections/dashboard/workzone/blueprint/blueprint.css':'src/partials/sections/dashboard/workzone/blueprint/blueprint.scss'},
{'catalyst/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.css':'src/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.scss'},
{'catalyst/partials/sections/dashboard/workzone/container/container.css':'src/partials/sections/dashboard/workzone/container/container.scss'},
{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
- {'catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css':'src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss'},
{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
]
diff --git a/client/cat3/main.html b/client/cat3/main.html
index 1d152b839..310ebd6b4 100644
--- a/client/cat3/main.html
+++ b/client/cat3/main.html
@@ -54,9 +54,12 @@
-
-
-
Menu
+
+
+
+
+ Menu
+
diff --git a/client/cat3/src/partials/global.scss b/client/cat3/src/partials/global.scss
index 933f670b6..5743e04af 100644
--- a/client/cat3/src/partials/global.scss
+++ b/client/cat3/src/partials/global.scss
@@ -60,22 +60,33 @@ $imagePath : "../../../../../../cat3/images";
/*CSS for header,breadcrumb and tree starts*/
#breadcrumb-block {
- @include theme-bg-color;
- color: white;
+ @include theme-bg-color;
+ color: white;
}
.tree-toggle {
- z-index: 100;
- color: #fff;
- font-size: 1.2em;
- padding-right: 4px;
+ z-index: 100;
+ color: #fff;
+ font-size: 1.2em;
+ padding: 6px 0px 6px 12px;
}
#section-name {
- padding: 6px 0px 6px 12px;
font-size: 14px;
font-weight: bold;
- width: 35%;
+
+ .menu-icon {
+ float: left;
+ height: 40px;
+ font-size: 20px;
+ }
+
+ .menu-text {
+ float: left;
+ margin: 11px 0 0 5px;
+ color: #fff;
+ height: 29px;
+ }
}
#breadcrumb-nav {
diff --git a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
index 98acdcc1a..756d953b2 100644
--- a/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
+++ b/client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
@@ -607,6 +607,14 @@ $imagePath: "../../../../../../images";
}
}
@media (min-width: 768px) and (max-width: 991px) {
+ .box.box-default.instance-filter.active {
+ height: 250px;
+ }
+
+ .box.box-default.instance-filter .box-body .cat-btn-update {
+ float: right;
+ }
+
#assignJobPage {
#container {
.left-right-selection {
diff --git a/client/htmls/private/css/catalyst.css b/client/htmls/private/css/catalyst.css
index a52290956..fb41b673d 100644
--- a/client/htmls/private/css/catalyst.css
+++ b/client/htmls/private/css/catalyst.css
@@ -1356,13 +1356,10 @@ button {
}
}
@media (min-width: 767px) and (max-width: 979px) {
- #main {
- margin-left: 220px;
- }
#left-panel {
- left: 0px;
position: absolute;
width: 220px;
+ margin-top: 34px;
}
.minified #left-panel {
left: 0;
@@ -3389,7 +3386,7 @@ nav ul {
min-height: 6%!important;
}
#ribbon {
- min-height: 4%!important;
+ min-height: 8%!important;
}
.jarviswidget>div {
font-size: 12px;