{siteName}
-
-
+
-
+
-
-
+
-
+
{termsOfServiceEnabled && (
-
-
+
-
+
)}
diff --git a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
index 8bdd47341f1..6cd61227cd2 100644
--- a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
+++ b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
@@ -83,7 +83,8 @@ export const RedesignNavigationPanel: React.FC<{
* menu items are hidden and the design is tweaked slightly
*/
mode?: 'static' | 'slide-out';
-}> = ({ siteName, mode = 'static' }) => {
+ multiColumn?: boolean;
+}> = ({ siteName, mode = 'static', multiColumn }) => {
const intl = useIntl();
const dispatch = useAppDispatch();
const { signedIn } = useIdentity();
@@ -174,7 +175,7 @@ export const RedesignNavigationPanel: React.FC<{
>
@@ -189,7 +190,7 @@ export const RedesignNavigationPanel: React.FC<{
>
{customFeeds.map((feed) => (
@@ -271,14 +272,20 @@ export const RedesignNavigationPanel: React.FC<{
>
)}
-
+
>
)}
{!signedIn && (
)}
{bottomSensor}
diff --git a/app/javascript/mastodon/features/ui/components/columns_area/redesign.tsx b/app/javascript/mastodon/features/ui/components/columns_area/redesign.tsx
index b92d167618d..8ffe485fdf3 100644
--- a/app/javascript/mastodon/features/ui/components/columns_area/redesign.tsx
+++ b/app/javascript/mastodon/features/ui/components/columns_area/redesign.tsx
@@ -48,7 +48,7 @@ export const ColumnsAreaRedesign: React.FC<{
return (
-
+
{children}
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index da5328efee5..6ceb41f94df 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -1054,7 +1054,7 @@
"navigation_bar.saved_posts": "Saved Posts",
"navigation_bar.search": "Search",
"navigation_bar.search_trends": "Search / Trending",
- "navigation_bar.sign_out": "Sign out",
+ "navigation_bar.sign_out": "Sign Out",
"navigation_panel.collapse_followed_tags": "Collapse followed hashtags menu",
"navigation_panel.collapse_lists": "Collapse list menu",
"navigation_panel.expand_followed_tags": "Expand followed hashtags menu",
@@ -1467,7 +1467,7 @@
"subscribed_languages.target": "Change subscribed languages for {target}",
"tab_bar.messages": "Messages",
"tabs_bar.account_settings": "Account settings",
- "tabs_bar.create_custom_feed": "Create feed",
+ "tabs_bar.create_custom_feed": "Create Feed",
"tabs_bar.custom_feeds": "Custom Feeds",
"tabs_bar.custom_feeds_empty": "You have no custom feeds yet.",
"tabs_bar.explore": "Explore",