djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change styling and layout of account notes UI

This commit is contained in:
Thibaut Girka 2020-07-07 17:47:33 +02:00 committed by ThibG
parent a9b13804e2
commit 64b6c20676
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/javascript/flavours/glitch/features/account/components/account_note.js
View File

@ -63,6 +63,14 @@ class Header extends ImmutablePureComponent {
</button>
</div>
);
} else {
action_buttons = (
<div className='account__header__account-note__buttons'>
<button className='text-btn' tabIndex='0' onClick={this.props.onEditAccountNote} disabled={isSubmitting}>
<Icon id='pencil' size={15} /> <FormattedMessage id='account_note.edit' defaultMessage='Edit' />
</button>
</div>
);
}
let note_container = null;
@ -85,17 +93,10 @@ class Header extends ImmutablePureComponent {
return (
<div className='account__header__account-note'>
<div className='account__header__account-note__header'>
<strong><FormattedMessage id='account.account_note_header' defaultMessage='Your note for @{name}' values={{ name: account.get('username') }} /></strong>
{!isEditing && (
<div>
<button className='text-btn' tabIndex='0' onClick={this.props.onEditAccountNote} disabled={isSubmitting}>
<Icon id='pencil' size={15} /> <FormattedMessage id='account_note.edit' defaultMessage='Edit' />
</button>
</div>
)}
<strong><FormattedMessage id='account.account_note_header' defaultMessage='Note' /></strong>
{action_buttons}
</div>
{note_container}
{action_buttons}
</div>
);
}

32
app/javascript/flavours/glitch/styles/components/accounts.scss
View File

@ -714,42 +714,44 @@
}
&__account-note {
margin: 5px;
padding: 10px;
background: $ui-highlight-color;
color: $primary-text-color;
margin: 0 -5px;
padding: 10px 15px;
display: flex;
flex-direction: column;
border-radius: 4px;
font-size: 14px;
font-weight: 400;
border-top: 1px solid lighten($ui-base-color, 12%);
border-bottom: 1px solid lighten($ui-base-color, 12%);
&__header {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 5px;
color: $darker-text-color;
}
&__content {
white-space: pre-wrap;
margin-top: 5px;
padding: 10px 0;
}
&__buttons {
display: flex;
flex-direction: row;
justify-content: flex-end;
margin-top: 5px;
flex: 1 0;
.flex-spacer {
flex: 0 0 20px;
flex: 0 0 15px;
background: transparent;
}
}
strong {
font-size: 15px;
font-size: 12px;
font-weight: 500;
text-transform: uppercase;
}
button:hover span {
@ -759,18 +761,24 @@
textarea {
display: block;
box-sizing: border-box;
width: 100%;
width: calc(100% + 20px);
margin: 0;
margin-top: 5px;
color: $inverted-text-color;
background: $simple-background-color;
color: $secondary-text-color;
background: $ui-base-color;
padding: 10px;
margin: 0 -10px;
font-family: inherit;
font-size: 14px;
resize: none;
border: 0;
outline: 0;
border-radius: 4px;
&::placeholder {
color: $dark-text-color;
opacity: 1;
}
}
}
}