From 9545af9026138c5c292d13e4edf3954b94f79089 Mon Sep 17 00:00:00 2001
From: Darius Kazemi <darius@meedan.com>
Date: Wed, 16 Nov 2022 21:49:51 -0800
Subject: [PATCH] Basic tweaks and fixes to the merge

---
 app/javascript/mastodon/components/status_action_bar.js   | 8 ++++----
 .../mastodon/features/ui/components/link_footer.js        | 1 +
 .../mastodon/features/ui/components/navigation_panel.js   | 4 ----
 app/views/layouts/admin.html.haml                         | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js
index 3a1db236e..a147aa5e3 100644
--- a/app/javascript/mastodon/components/status_action_bar.js
+++ b/app/javascript/mastodon/components/status_action_bar.js
@@ -359,10 +359,13 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         {shareButton}
-        <IconButton className='status__action-bar-button bookmark-icon' disabled={anonymousAccess} active={status.get('bookmarked')} pressed={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' onClick={this.handleBookmarkClick} />
 
         {filterButton}
 
+        { !federated &&
+          <IconButton className='status__action-bar-button' disabled title={intl.formatMessage(messages.local_only)} icon='chain-broken' />
+        }
+
         <div className='status__action-bar__dropdown'>
           <DropdownMenuContainer
             scrollKey={scrollKey}
@@ -375,9 +378,6 @@ class StatusActionBar extends ImmutablePureComponent {
             title={intl.formatMessage(messages.more)}
           />
         </div>
-        { !federated &&
-          <IconButton className='status__action-bar-button' disabled title={intl.formatMessage(messages.local_only)} icon='chain-broken' />
-        }
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js
index d9de7980c..7d0db7bae 100644
--- a/app/javascript/mastodon/features/ui/components/link_footer.js
+++ b/app/javascript/mastodon/features/ui/components/link_footer.js
@@ -80,6 +80,7 @@ class LinkFooter extends React.PureComponent {
           <a href='https://github.com/hometown-fork/hometown/wiki' target='_blank'><FormattedMessage id='footer.about' defaultMessage='About' /></a>
           {' · '}
           <a href='https://github.com/hometown-fork/hometown/' rel='noopener noreferrer' target='_blank'><FormattedMessage id='footer.source_code' defaultMessage='View source code' /></a>
+          {' · '}
           v{version}
         </p>
 
diff --git a/app/javascript/mastodon/features/ui/components/navigation_panel.js b/app/javascript/mastodon/features/ui/components/navigation_panel.js
index 9a9309be0..43bfaabdb 100644
--- a/app/javascript/mastodon/features/ui/components/navigation_panel.js
+++ b/app/javascript/mastodon/features/ui/components/navigation_panel.js
@@ -46,10 +46,6 @@ class NavigationPanel extends React.Component {
 
     return (
       <div className='navigation-panel'>
-        <div className='navigation-panel__logo'>
-          <Link to='/' className='column-link column-link--logo'><Logo /></Link>
-          <hr />
-        </div>
 
         {signedIn && (
           <React.Fragment>
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 6fef21943..9fd8857f0 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -7,8 +7,10 @@
     .sidebar-wrapper
       .sidebar-wrapper__inner
         .sidebar
-          = link_to root_path do
-            = site_title
+          .logo
+            %h2
+              = link_to root_path, class: 'brand' do
+                = site_title
 
           .sidebar__toggle
             .sidebar__toggle__logo