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

Merge branch 'profile-page-nav' into 'develop'

Browse source 
Profile navigation improvements

See merge request soapbox-pub/soapbox-fe!802
This commit is contained in:
Alex Gleason 2021-10-19 21:23:32 +00:00
commit 4fd9c90e69
9 changed files with 45 additions and 35 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/ui/components/tabs_bar.js
View file

Binary file not shown.

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

@ -335,3 +335,9 @@
}
}
}
@media (min-width: 896px) {
.account-timeline .sub-navigation {
top: 134px;
}
}

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

@ -625,6 +625,12 @@
overflow-y: auto;
}
&__description {
font-size: 14px;
margin: 5px 0 15px;
color: var(--primary-text-color--faint);
}
&__close {
display: flex;
align-items: center;
@ -949,3 +955,7 @@
.column .explanation-box {
background: var(--foreground-color);
}
.sub-navigation + .account__section-headline {
background: var(--foreground-color);
}

8
app/styles/components/icon.scss
View file

@ -25,14 +25,14 @@
svg.icon-tabler-bell,
svg.icon-tabler-messages {
path:nth-child(2) {
fill: var(--primary-text-color);
fill: currentColor;
}
}
svg.icon-tabler-users {
circle,
circle + path {
fill: var(--primary-text-color);
fill: currentColor;
}
}
@ -40,8 +40,8 @@
stroke: var(--background-color);
rect {
fill: var(--primary-text-color);
stroke: var(--primary-text-color);
fill: currentColor;
stroke: currentColor;
}
}
}

53
app/styles/components/tabs-bar.scss
View file

@ -8,7 +8,7 @@
width: 100%;
position: sticky;
top: 0;
z-index: 1000;
z-index: 1100;
transition: transform 0.2s ease;
&--collapsed {
@ -142,11 +142,13 @@
}
.theme-toggle {
@media screen and (max-width: $nav-breakpoint-3) { display: none; }
margin-left: 20px;
@media screen and (max-width: $nav-breakpoint-3) {
display: none;
}
.setting-toggle {
margin-left: 10px;
.react-toggle-track {
background-color: var(--foreground-color);
}
@ -168,7 +170,6 @@
.tabs-bar__link {
display: flex;
flex: 1 1 auto;
margin: 0 20px 0 0;
color: #fff;
text-decoration: none;
position: relative;
@ -183,14 +184,18 @@
width: 36px;
margin: 4px 4px 0 0;
justify-content: center;
& > span { display: none; }
display: none;
}
> span {
font-size: 15px;
line-height: 50px;
margin-left: 4px;
display: none;
}
& + & {
margin-left: 20px;
}
&--search {
@ -199,28 +204,12 @@
}
}
i.fa {
font-size: 14px;
transform: translate(-1px, -1px);
transition: 0.1s;
.svg-icon {
width: 22px;
height: 22px;
@media screen and (max-width: 895px) {
font-size: 20px;
}
&.fa-home {
font-size: 18px;
transform: translate(-1px, -2px);
@media screen and (max-width: 895px) {
font-size: 26px;
}
}
}
.icon-with-counter__counter {
@media screen and (min-width: 896px) {
left: 5px;
svg.icon-tabler {
stroke-width: 1.5px;
}
}
@ -244,8 +233,8 @@
height: 15px;
border-radius: 999px;
z-index: -1;
width: calc(100% + 20px);
margin-left: -12px;
width: calc(100% + 12px);
margin-left: -9px;
@media screen and (max-width: 895px) {
height: 0;
@ -339,3 +328,7 @@
}
}
}
.tabs-bar__link + .tabs-bar__profile {
margin-left: 20px;
}

3
app/styles/ui.scss
View file

@ -346,10 +346,11 @@
width: 100%;
&__top {
@include standard-panel-shadow;
display: flex;
width: 100%;
height: auto;
z-index: 105;
z-index: 1000;
background: var(--foreground-color);
@media (min-width: 896px) {