Skip to content

Responsiveness related fixes for breadcrumb, filter options in workzone. #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2016
Merged

Responsiveness related fixes for breadcrumb, filter options in workzone. #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions client/cat3/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}
]
Expand Down
9 changes: 6 additions & 3 deletions client/cat3/main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,12 @@
<div class="breadcrumb-wrapper">
<div class="container-fluid" id="breadcrumb-block" ng-controller="breadcrumbCtrl" ng-show="isBreadCrumbAvailable">
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 no-padding">
<div id="section-name" ng-click="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="cursor">
<i class="fa fa-bars tree-toggle"></i>
<span>Menu</span>
<div id="section-name">
<span ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="cursor">
<i class="fa fa-bars tree-toggle">
</i>
Menu
</span>
</div>
</div>
<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
Expand Down
27 changes: 19 additions & 8 deletions client/cat3/src/partials/global.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 8 additions & 0 deletions client/cat3/src/partials/sections/dashboard/workzone/instance/instance.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 2 additions & 5 deletions client/htmls/private/css/catalyst.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -3389,7 +3386,7 @@ nav ul {
min-height: 6%!important;
}
#ribbon {
min-height: 4%!important;
min-height: 8%!important;
}
.jarviswidget>div {
font-size: 12px;
Expand Down