bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Add scrolling SubNavigation to Home and Account timelines"

Browse source 
This reverts commit b1da9dc455.

This solution feels wrong
This commit is contained in:
Alex Gleason 2021-10-15 22:05:59 -05:00
parent b1da9dc455
commit 5017804b0a
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
9 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/components/sub_navigation.js
View file

Binary file not shown.

BIN
app/soapbox/features/account_timeline/components/column_settings.js
View file

Binary file not shown.

BIN
app/soapbox/features/account_timeline/index.js
View file

Binary file not shown.

BIN
app/soapbox/features/home_timeline/index.js
View file

Binary file not shown.

10
app/styles/components/account-header.scss
View file

@ -335,13 +335,3 @@
}
}
}
.account__sub-navigation {
display: none;
@media (max-width: 897px) {
display: flex;
position: fixed;
margin: 0;
}
}

6
app/styles/components/columns.scss
View file

@ -924,8 +924,8 @@
}
// Make MaterialStatus flush against SubNavigation
.sub-navigation:not(.sub-navigation--hidden) ~ .slist .item-list > article:first-child .material-status__status,
.sub-navigation:not(.sub-navigation--hidden) ~ .material-status:not(.material-status + .material-status) .material-status__status {
.sub-navigation ~ .slist .item-list > article:first-child .material-status__status,
.sub-navigation ~ .material-status:not(.material-status + .material-status) .material-status__status {
border-top-left-radius: 0;
border-top-right-radius: 0;
}
@ -940,7 +940,7 @@
}
}
.sub-navigation:not(.sub-navigation--hidden) ~ .slist .slist__append {
.sub-navigation ~ .slist .slist__append {
border-top-left-radius: 0;
border-top-right-radius: 0;
}

2
app/styles/components/timeline-queue-header.scss
View file

@ -15,7 +15,7 @@
padding: 0 10px;
z-index: 500;
.sub-navigation:not(.sub-navigation--hidden) ~ & {
.sub-navigation ~ & {
top: calc(60px + 41px);
}

2
app/styles/components/wtf-panel.scss
View file

@ -162,7 +162,7 @@
}
}
.column .sub-navigation:not(.sub-navigation--hidden) ~ .wtf-panel {
.column .sub-navigation ~ .wtf-panel {
border-top-left-radius: 0;
border-top-right-radius: 0;
}

18
app/styles/navigation.scss
View file

@ -128,22 +128,11 @@
align-items: center;
justify-content: center;
z-index: 999;
transition: transform 0.2s, border-radius 0.2s;
&--sticking {
&--scrolled {
border-radius: 0 !important;
}
&--show-after {
transform: translateY(-41px) scaleY(0);
margin-top: -1041px;
margin-bottom: 1000px;
&.sub-navigation--visible {
transform: translateY(0) scaleY(1);
}
}
&__content {
width: 100%;
height: 100%;
@ -181,7 +170,6 @@
display: flex;
align-items: center;
justify-content: center;
margin-left: auto;
.svg-icon {
width: 20px;
@ -194,7 +182,3 @@
border-top-right-radius: 10px;
}
}
.home-timeline .sub-navigation__back {
display: none;
}