Fix NavigationBar styling
This commit is contained in:
parent
900db91d96
commit
b468639015
2 changed files with 21 additions and 16 deletions
|
@ -20,16 +20,18 @@ export default class NavigationBar extends ImmutablePureComponent {
|
||||||
<Avatar account={this.props.account} size={48} />
|
<Avatar account={this.props.account} size={48} />
|
||||||
</Permalink>
|
</Permalink>
|
||||||
|
|
||||||
<Permalink className='acct' href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`}>
|
<div className='navigation-bar__profile'>
|
||||||
<strong>@{this.props.account.get('acct')}</strong>
|
<Permalink className='acct' href={this.props.account.get('url')} to={`/accounts/${this.props.account.get('id')}`}>
|
||||||
</Permalink>
|
<strong>@{this.props.account.get('acct')}</strong>
|
||||||
|
</Permalink>
|
||||||
|
|
||||||
{ profileLink !== undefined && (
|
{ profileLink !== undefined && (
|
||||||
<a
|
<a
|
||||||
className='edit'
|
className='edit'
|
||||||
href={ profileLink }
|
href={ profileLink }
|
||||||
><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
|
><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -163,18 +163,15 @@
|
||||||
.drawer--account {
|
.drawer--account {
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
color: $darker-text-color;
|
color: $darker-text-color;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
& > a {
|
a {
|
||||||
color: inherit;
|
color: inherit;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
& > .avatar {
|
.acct {
|
||||||
float: left;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
& > .acct {
|
|
||||||
display: block;
|
display: block;
|
||||||
color: $secondary-text-color;
|
color: $secondary-text-color;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
@ -184,6 +181,12 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.navigation-bar__profile {
|
||||||
|
flex: 1 1 auto;
|
||||||
|
margin-left: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
.drawer--results {
|
.drawer--results {
|
||||||
background: $ui-base-color;
|
background: $ui-base-color;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
|
Loading…
Reference in a new issue