Skip to content

Commit 6baddf1

Browse files
committed
fix: apply sticky sidebar fix to other pages
1 parent 9b5131e commit 6baddf1

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
lines changed

src/projects/detail/containers/AssetsLibraryContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class AssetsLibraryContainer extends React.Component {
122122
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
123123
{(matches) => {
124124
if (matches) {
125-
return <Sticky top={60}>{leftArea}</Sticky>
125+
return <Sticky top={60} bottomBoundary="#wrapper-main">{leftArea}</Sticky>
126126
} else {
127127
return leftArea
128128
}

src/projects/detail/containers/MessagesContainer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ class MessagesView extends React.Component {
460460
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
461461
{matches => {
462462
if (matches) {
463-
return <Sticky top={60}>{leftArea}</Sticky>
463+
return <Sticky top={60} bottomBoundary="#wrapper-main">{leftArea}</Sticky>
464464
} else {
465465
return leftArea
466466
}

src/projects/detail/containers/MessagesTabContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class MessagesTabContainer extends React.Component {
158158
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
159159
{matches => {
160160
if (matches) {
161-
return <Sticky top={60}>{leftArea}</Sticky>
161+
return <Sticky top={60} bottomBoundary="#wrapper-main">{leftArea}</Sticky>
162162
} else {
163163
return leftArea
164164
}

src/projects/detail/containers/ProjectSummaryReportContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ProjectSummaryReportContainer extends React.Component {
7474
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
7575
{(matches) => {
7676
if (matches) {
77-
return <Sticky top={60}>{leftArea}</Sticky>
77+
return <Sticky top={60} bottomBoundary="#wrapper-main">{leftArea}</Sticky>
7878
} else {
7979
return leftArea
8080
}

src/projects/detail/containers/ScopeAndSpecificationContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class SpecificationContainer extends Component {
184184
<MediaQuery minWidth={SCREEN_BREAKPOINT_MD}>
185185
{(matches) => {
186186
if (matches) {
187-
return <Sticky top={60}>{leftArea}</Sticky>
187+
return <Sticky top={60} bottomBoundary="#wrapper-main">{leftArea}</Sticky>
188188
} else {
189189
return leftArea
190190
}

src/projects/list/components/Projects/Projects.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ class Projects extends Component {
286286
{(matches) => {
287287
if (matches) {
288288
return (
289-
<Sticky top={60}>
289+
<Sticky top={60} bottomBoundary="#wrapper-main">
290290
<UserSidebar user={user}/>
291291
</Sticky>
292292
)

src/routes/metadata/components/MetaDataLayout.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MetaDataLayout extends React.Component {
2121
{(matches) => {
2222
if (matches) {
2323
return (
24-
<Sticky top={60}>
24+
<Sticky top={60} bottomBoundary="#wrapper-main">
2525
<MetadataSidebar/>
2626
</Sticky>
2727
)

src/routes/notifications/containers/NotificationsContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const NotificationsContainerView = (props) => {
8484
{(matches) => {
8585
if (matches) {
8686
return (
87-
<Sticky top={60}>
87+
<Sticky top={60} bottomBoundary="#wrapper-main">
8888
<UserSidebar user={user}/>
8989
</Sticky>
9090
)
@@ -133,7 +133,7 @@ const NotificationsContainerView = (props) => {
133133
}
134134
</div>
135135
<aside className="filters">
136-
<Sticky top={90}>
136+
<Sticky top={90} bottomBoundary="#wrapper-main">
137137
<SideFilter
138138
filterSections={getNotificationsFilters(allNotificationsBySources)}
139139
selectedFilter={filterBy}

src/routes/settings/components/SettingsPanel.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const SettingsPanel = (props) => (
2222
{(matches) => {
2323
if (matches) {
2424
return (
25-
<Sticky top={60}>
25+
<Sticky top={60} bottomBoundary="#wrapper-main">
2626
<UserSidebar user={props.user}/>
2727
</Sticky>
2828
)

0 commit comments

Comments
 (0)