Revert "Random WIP mostly for changing layout, should look and then discard"

This reverts commit 6ceb7f2783.

app/javascript/mastodon/features/about/index.js

@@ -110,7 +110,6 @@ class About extends React.PureComponent {
 
   render () {
     const { multiColumn, intl, server, extendedDescription, domainBlocks } = this.props;
-    console.log('~~~~',server);
     const isLoading = server.get('isLoading');
 
     return (
@@ -127,8 +126,6 @@ class About extends React.PureComponent {
               <h4><FormattedMessage id='server_banner.administered_by' defaultMessage='Administered by:' /></h4>
 
               <Account id={server.getIn(['contact', 'account', 'id'])} size={36} />
-              <Account id={'108318724568238438'} size={36} />
-              <Account id={server.getIn(['contact', 'account', 'id'])+2} size={36} />
             </div>
 
             <hr className='about__meta__divider' />

app/javascript/mastodon/features/ui/components/header.js

@@ -50,6 +50,8 @@ class Header extends React.PureComponent {
 
     return (
       <div className='ui__header'>
+        <Link to='/' className='ui__header__logo'><Logo /></Link>
+
         <div className='ui__header__links'>
           {content}
         </div>

app/javascript/mastodon/features/ui/components/navigation_panel.js

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 import { Link } from 'react-router-dom';
 import Logo from 'mastodon/components/logo';
-import { timelinePreview, showTrends, me } from 'mastodon/initial_state';
+import { timelinePreview, showTrends } from 'mastodon/initial_state';
 import ColumnLink from './column_link';
 import DisabledAccountBanner from './disabled_account_banner';
 import FollowRequestsColumnLink from './follow_requests_column_link';
@@ -11,16 +11,6 @@ import ListPanel from './list_panel';
 import NotificationsCounterIcon from './notifications_counter_icon';
 import SignInBanner from './sign_in_banner';
 import NavigationPortal from 'mastodon/components/navigation_portal';
-import Avatar from 'mastodon/components/avatar';
-import { connect } from 'react-redux';
-
-const Account = connect(state => ({
-  account: state.getIn(['accounts', me]),
-}))(({ account }) => (
-  <Link to={`/@${account.get('acct')}`} title={account.get('acct')}>
-    <Avatar account={account} size={35} />
-  </Link>
-));
 
 const messages = defineMessages({
   home: { id: 'tabs_bar.home', defaultMessage: 'Home' },
@@ -59,8 +49,6 @@ class NavigationPanel extends React.Component {
 
         {signedIn && (
           <React.Fragment>
-            {window.location.pathname !== '/publish' && <Link to='/publish' className='button'>✏️</Link>}
-            <Account />
             <ColumnLink transparent to='/home' icon='home' text={intl.formatMessage(messages.home)} />
             <ColumnLink transparent to='/notifications' icon={<NotificationsCounterIcon className='column-link__icon' />} text={intl.formatMessage(messages.notifications)} />
             <FollowRequestsColumnLink />

app/javascript/mastodon/features/ui/index.js

@@ -568,6 +568,7 @@ class UI extends React.PureComponent {
     return (
       <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef} style={{ pointerEvents: dropdownMenuIsOpen ? 'none' : null }}>
+          <Header />
 
           <SwitchingColumnsArea location={location} mobile={layout === 'mobile' || layout === 'single-column'}>
             {children}

app/javascript/styles/mastodon/components.scss

@@ -2282,7 +2282,7 @@ a.account__display-name {
   }
 }
 
-$ui-header-height: 0px;
+$ui-header-height: 55px;
 
 .ui__header {
   display: none;