commit: 71b266377c44ffb23a4e6ea871cfc2d656a8e32b
parent: 08dce5e60792112ca8df4aa5de3663fd7ad51e77
Author: Nolan Lawson <nolan@nolanlawson.com>
Date: Thu, 25 May 2017 05:15:12 -0700
Remove unnecessary action bar wrapper divs (#3299)
Diffstat:
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
@@ -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
@@ -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
@@ -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;