diff --git a/app/soapbox/components/sub_navigation.js b/app/soapbox/components/sub_navigation.js index abaceedfaf..063448b5cd 100644 Binary files a/app/soapbox/components/sub_navigation.js and b/app/soapbox/components/sub_navigation.js differ diff --git a/app/soapbox/features/account_timeline/components/column_settings.js b/app/soapbox/features/account_timeline/components/column_settings.js index 7836c01f00..130cb47db0 100644 Binary files a/app/soapbox/features/account_timeline/components/column_settings.js and b/app/soapbox/features/account_timeline/components/column_settings.js differ diff --git a/app/soapbox/features/account_timeline/index.js b/app/soapbox/features/account_timeline/index.js index 003ab8dda4..b55decbbac 100644 Binary files a/app/soapbox/features/account_timeline/index.js and b/app/soapbox/features/account_timeline/index.js differ diff --git a/app/styles/components/account-header.scss b/app/styles/components/account-header.scss index 401e3fcc51..69902227c6 100644 --- a/app/styles/components/account-header.scss +++ b/app/styles/components/account-header.scss @@ -335,3 +335,9 @@ } } } + +@media (min-width: 896px) { + .account-timeline .sub-navigation { + top: 134px; + } +} diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss index 61c3ab4898..36b172599f 100644 --- a/app/styles/components/columns.scss +++ b/app/styles/components/columns.scss @@ -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); +} diff --git a/app/styles/components/tabs-bar.scss b/app/styles/components/tabs-bar.scss index a0226aef8c..90ff85ddfc 100644 --- a/app/styles/components/tabs-bar.scss +++ b/app/styles/components/tabs-bar.scss @@ -8,7 +8,7 @@ width: 100%; position: sticky; top: 0; - z-index: 1000; + z-index: 1100; transition: transform 0.2s ease; &--collapsed { diff --git a/app/styles/ui.scss b/app/styles/ui.scss index f47c10f87f..62aba15105 100644 --- a/app/styles/ui.scss +++ b/app/styles/ui.scss @@ -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) {