Skip to content

Commit 8b82704

Browse files
authored
Merge pull request #2072 from sumitdaga/mil-53-issue-2064
project details secondary toolbar fixed at top on desktop #2064
2 parents 5542841 + 5c1fa51 commit 8b82704

File tree

5 files changed

+22
-4
lines changed

5 files changed

+22
-4
lines changed

src/projects/detail/components/ProjectLayout.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class ProjectViewLayout extends React.Component {
1212
const location = this.props.location.pathname
1313
const isAddPhasePage = location && (location.substr(location.lastIndexOf('/') + 1) === 'add-phase')
1414
return (
15-
<div>
15+
<div styleName="container">
1616
<div styleName="secondary-toolbar">
1717
{!isAddPhasePage && (<SecondaryToolBarContainer />)}
1818
</div>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1+
@import '~tc-ui/src/styles/tc-includes';
2+
3+
.container {
4+
5+
@media screen and (min-width: $screen-md) {
6+
padding-top: 50px;
7+
}
8+
}
9+
110
.secondary-toolbar {
211
position: relative;
312
z-index: 1;
13+
14+
@media screen and (min-width: $screen-md) {
15+
position: fixed;
16+
top: 60px;
17+
left: 0;
18+
right: 0;
19+
width: 100%;
20+
}
421
}
22+

src/projects/detail/containers/DashboardContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ class DashboardContainer extends React.Component {
9797
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
9898
{(matches) => {
9999
if (matches) {
100-
return <Sticky top={60}>{leftArea}</Sticky>
100+
return <Sticky top={110}>{leftArea}</Sticky>
101101
} else {
102102
return leftArea
103103
}

src/projects/detail/containers/ProjectPlanContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const ProjectPlanContainer = (props) => {
4040
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
4141
{(matches) => {
4242
if (matches) {
43-
return <Sticky top={60}>{leftArea}</Sticky>
43+
return <Sticky top={110}>{leftArea}</Sticky>
4444
} else {
4545
return leftArea
4646
}

src/projects/detail/containers/ScopeAndSpecificationContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class SpecificationContainer extends Component {
8282
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
8383
{(matches) => {
8484
if (matches) {
85-
return <Sticky top={60}>{leftArea}</Sticky>
85+
return <Sticky top={110}>{leftArea}</Sticky>
8686
} else {
8787
return leftArea
8888
}

0 commit comments

Comments
 (0)