diff options
| author | Nolan Lawson <nolan@nolanlawson.com> | 2017-05-25 05:15:12 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-25 14:15:12 +0200 |
| commit | 71b266377c44ffb23a4e6ea871cfc2d656a8e32b (patch) | |
| tree | f6c670eff63d7905d6c0ecb0fe76fc7e94af171c | |
| parent | 08dce5e60792112ca8df4aa5de3663fd7ad51e77 (diff) | |
Remove unnecessary action bar wrapper divs (#3299)
| -rw-r--r-- | app/javascript/mastodon/components/status_action_bar.js | 6 | ||||
| -rw-r--r-- | app/javascript/styles/components.scss | 2 | ||||
| -rw-r--r-- | app/javascript/styles/rtl.scss | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js index 1f9fa4c67..5457dabac 100644 --- a/app/javascript/mastodon/components/status_action_bar.js +++ b/app/javascript/mastodon/components/status_action_bar.js @@ -128,9 +128,9 @@ class StatusActionBar extends React.PureComponent { return ( <div className='status__action-bar'> - <div className='status__action-bar-button-wrapper'><IconButton title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /></div> - <div className='status__action-bar-button-wrapper'><IconButton disabled={reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /></div> - <div className='status__action-bar-button-wrapper'><IconButton animate={true} active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} className='star-icon' /></div> + <IconButton className='status__action-bar-button' title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /> + <IconButton className='status__action-bar-button' disabled={reblogDisabled} active={status.get('reblogged')} title={reblogDisabled ? intl.formatMessage(messages.cannot_reblog) : intl.formatMessage(messages.reblog)} icon={reblogIcon} onClick={this.handleReblogClick} /> + <IconButton className='status__action-bar-button star-icon' animate={true} active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /> <div className='status__action-bar-dropdown'> <DropdownMenu items={menu} icon='ellipsis-h' size={18} direction="right" ariaLabel="More"/> diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss index 38fbda5a9..64a700852 100644 --- a/app/javascript/styles/components.scss +++ b/app/javascript/styles/components.scss @@ -676,7 +676,7 @@ margin-top: 10px; } -.status__action-bar-button-wrapper { +.status__action-bar-button { float: left; margin-right: 18px; } diff --git a/app/javascript/styles/rtl.scss b/app/javascript/styles/rtl.scss index 43463bc7d..16a1c9c05 100644 --- a/app/javascript/styles/rtl.scss +++ b/app/javascript/styles/rtl.scss @@ -66,7 +66,7 @@ body.rtl { float: left; } - .status__action-bar-button-wrapper { + .status__action-bar-button { float: right; margin-right: 0; margin-left: 18px; |