treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Remove unnecessary action bar wrapper divs (#3299)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Nolan Lawson 2017-05-25 05:15:12 -07:00 committed by Eugen Rochko
parent 08dce5e607
commit 71b266377c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/mastodon/components/status_action_bar.js
View File

@ -128,9 +128,9 @@ class StatusActionBar extends React.PureComponent {
return ( return (
<div className='status__action-bar'> <div className='status__action-bar'>
<div className='status__action-bar-button-wrapper'><IconButton title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} /></div> <IconButton className='status__action-bar-button' title={replyTitle} icon={replyIcon} onClick={this.handleReplyClick} />
<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> <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} />
<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 star-icon' animate={true} active={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
<div className='status__action-bar-dropdown'> <div className='status__action-bar-dropdown'>
<DropdownMenu items={menu} icon='ellipsis-h' size={18} direction="right" ariaLabel="More"/> <DropdownMenu items={menu} icon='ellipsis-h' size={18} direction="right" ariaLabel="More"/>

2
app/javascript/styles/components.scss
View File

@ -676,7 +676,7 @@
margin-top: 10px; margin-top: 10px;
} }
.status__action-bar-button-wrapper { .status__action-bar-button {
float: left; float: left;
margin-right: 18px; margin-right: 18px;
} }

2
app/javascript/styles/rtl.scss
View File

@ -66,7 +66,7 @@ body.rtl {
float: left; float: left;
} }
.status__action-bar-button-wrapper { .status__action-bar-button {
float: right; float: right;
margin-right: 0; margin-right: 0;
margin-left: 18px; margin-left: 18px;