diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx index 8fa20a554d..3b2692adf4 100644 --- a/app/javascript/mastodon/features/ui/components/navigation_panel.jsx +++ b/app/javascript/mastodon/features/ui/components/navigation_panel.jsx @@ -30,7 +30,7 @@ import StarActiveIcon from '@/material-icons/400-24px/star-fill.svg?react'; import StarIcon from '@/material-icons/400-24px/star.svg?react'; import { fetchFollowRequests } from 'mastodon/actions/accounts'; import { IconWithBadge } from 'mastodon/components/icon_with_badge'; -import { WordmarkLogo } from 'mastodon/components/logo'; +import { IconLogo } from 'mastodon/components/logo'; import { NavigationPortal } from 'mastodon/components/navigation_portal'; import { identityContextPropShape, withIdentity } from 'mastodon/identity_context'; import { timelinePreview, trendsEnabled } from 'mastodon/initial_state'; @@ -135,7 +135,7 @@ class NavigationPanel extends Component { return (
- +
{banner && diff --git a/app/javascript/styles/tangerine/cherry.scss b/app/javascript/styles/tangerine/cherry.scss index 4a8353bd5b..18a315eebc 100644 --- a/app/javascript/styles/tangerine/cherry.scss +++ b/app/javascript/styles/tangerine/cherry.scss @@ -4614,7 +4614,10 @@ div[tabindex='-1'] position: fixed; } - .app-body:not(.layout-multiple-columns, :has(.ui .ui__header__links > .button[href='/auth/sign_in'])) + .app-body:not( + .layout-multiple-columns, + :has(.ui .ui__header__links > .button[href='/auth/sign_in']) + ) .tabs-bar__wrapper { z-index: 3; } @@ -4941,16 +4944,17 @@ div[tabindex='-1'] border: 0; width: 50px; height: 50px; - background-image: var(--logo); - background-repeat: no-repeat; - background-position: center; - background-size: 32px auto; + + // background-image: var(--logo); + // background-repeat: no-repeat; + // background-position: center; + // background-size: 32px auto; } -.app-body .column-link.column-link--logo svg, -.app-body .ui__header__logo svg { - display: none; -} +// .app-body .column-link.column-link--logo img, +// .app-body .ui__header__logo img { +// display: none; +// } .app-body .navigation-panel__logo { margin-bottom: 5px; diff --git a/app/javascript/styles/tangerine/grape.scss b/app/javascript/styles/tangerine/grape.scss index b9d04fabad..4aa0870a8b 100644 --- a/app/javascript/styles/tangerine/grape.scss +++ b/app/javascript/styles/tangerine/grape.scss @@ -4628,16 +4628,17 @@ button { border: 0; width: 50px; height: 50px; - background-image: var(--logo); - background-repeat: no-repeat; - background-position: center; - background-size: 32px auto; + +// background-image: var(--logo); +// background-repeat: no-repeat; +// background-position: center; +// background-size: 32px auto; } -.app-body .column-link.column-link--logo svg, -.app-body .ui__header__logo svg { - display: none; -} +// .app-body .column-link.column-link--logo img, +// .app-body .ui__header__logo img { +// display: none; +// } .app-body .navigation-panel__logo { margin-bottom: 5px; diff --git a/app/javascript/styles/tangerine/lagoon.scss b/app/javascript/styles/tangerine/lagoon.scss index 1fd47ef24b..3cf0ba0612 100644 --- a/app/javascript/styles/tangerine/lagoon.scss +++ b/app/javascript/styles/tangerine/lagoon.scss @@ -4628,16 +4628,17 @@ button { border: 0; width: 50px; height: 50px; - background-image: var(--logo); - background-repeat: no-repeat; - background-position: center; - background-size: 32px auto; + + // background-image: var(--logo); + // background-repeat: no-repeat; + // background-position: center; + // background-size: 32px auto; } -.app-body .column-link.column-link--logo svg, -.app-body .ui__header__logo svg { - display: none; -} +// .app-body .column-link.column-link--logo img, +// .app-body .ui__header__logo img { +// display: none; +// } .app-body .navigation-panel__logo { margin-bottom: 5px; diff --git a/app/javascript/styles/tangerine/orange.scss b/app/javascript/styles/tangerine/orange.scss index 0abc8abc9c..a9227d9d71 100644 --- a/app/javascript/styles/tangerine/orange.scss +++ b/app/javascript/styles/tangerine/orange.scss @@ -4628,16 +4628,17 @@ button { border: 0; width: 50px; height: 50px; - background-image: var(--logo); - background-repeat: no-repeat; - background-position: center; - background-size: 32px auto; + +// background-image: var(--logo); +// background-repeat: no-repeat; +// background-position: center; +// background-size: 32px auto; } -.app-body .column-link.column-link--logo svg, -.app-body .ui__header__logo svg { - display: none; -} +// .app-body .column-link.column-link--logo img, +// .app-body .ui__header__logo img { +// display: none; +// } .app-body .navigation-panel__logo { margin-bottom: 5px;