diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-14 21:39:07 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2019-07-15 00:48:28 +0200 |
| commit | 707b8d7d75d8f44b4a638752b6a24824c0ba4bbd (patch) | |
| tree | b142a83721216419eca4b43f00b5da2ce3d982a3 /app/javascript | |
| parent | 85f3bc1ab39bb4244e910de24eac8415c0d66207 (diff) | |
Move the “Show why” button inline
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index 4cd6b3a36..e94ce6dfe 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -506,9 +506,10 @@ class Status extends ImmutablePureComponent { <HotKeys handlers={minHandlers}> <div className='status__wrapper status__wrapper--filtered focusable' tabIndex='0' ref={this.handleRef}> <FormattedMessage id='status.filtered' defaultMessage='Filtered' /> + {settings.get('filtering_behavior') !== 'upstream' && ' '} {settings.get('filtering_behavior') !== 'upstream' && ( <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> )} </div> diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index cf8f39693..4ffbb2c21 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -998,14 +998,13 @@ a.status-card.compact:hover { } .status__wrapper--filtered__button { - display: block; - font-size: 15px; - line-height: 20px; + display: inline; color: lighten($ui-highlight-color, 8%); border: 0; background: transparent; padding: 0; - padding-top: 8px; + font-size: inherit; + line-height: inherit; &:hover, &:active { |