mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Move the “Show why” button inline

This commit is contained in:
Thibaut Girka 2019-07-14 21:39:07 +02:00 committed by ThibG
parent 85f3bc1ab3
commit 707b8d7d75
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/components/status.js
View File

@ -506,9 +506,10 @@ class Status extends ImmutablePureComponent {
<HotKeys handlers={minHandlers}> <HotKeys handlers={minHandlers}>
<div className='status__wrapper status__wrapper--filtered focusable' tabIndex='0' ref={this.handleRef}> <div className='status__wrapper status__wrapper--filtered focusable' tabIndex='0' ref={this.handleRef}>
<FormattedMessage id='status.filtered' defaultMessage='Filtered' /> <FormattedMessage id='status.filtered' defaultMessage='Filtered' />
{settings.get('filtering_behavior') !== 'upstream' && ' '}
{settings.get('filtering_behavior') !== 'upstream' && ( {settings.get('filtering_behavior') !== 'upstream' && (
<button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}> <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
<FormattedMessage id='status.show_filter_reason' defaultMessage='Show why' /> <FormattedMessage id='status.show_filter_reason' defaultMessage='(show why)' />
</button> </button>
)} )}
</div> </div>

7
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -998,14 +998,13 @@ a.status-card.compact:hover {
} }
.status__wrapper--filtered__button { .status__wrapper--filtered__button {
display: block; display: inline;
font-size: 15px;
line-height: 20px;
color: lighten($ui-highlight-color, 8%); color: lighten($ui-highlight-color, 8%);
border: 0; border: 0;
background: transparent; background: transparent;
padding: 0; padding: 0;
padding-top: 8px; font-size: inherit;
line-height: inherit;
&:hover, &:hover,
&:active { &:active {