Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-07 13:14:47 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(button-dropdown): merge causing style conflicts

Browse source
This commit is contained in:
Ben Gotow 2015-06-26 18:03:28 -07:00
parent e6cbc47716
commit 4b8a081c14
3 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
internal_packages/message-list/lib/message-controls.cjsx
View file

@ -31,16 +31,6 @@ class MessageControls extends React.Component
{button}
</div>
_primaryMessageAction: =>
if @_replyType() is "reply"
<div className="primary-message-action" onClick={@_onReply}>
<RetinaImg name="reply-footer.png" mode={RetinaImg.Mode.ContentIsMask}/>
</div>
else # if "reply-all"
<div className="primary-message-action" onClick={@_onReplyAll}>
<RetinaImg name="reply-all-footer.png" mode={RetinaImg.Mode.ContentIsMask}/>
</div>
_secondaryMessageActions: ->
if @_replyType() is "reply"
return [@_replyAllAction(), @_forwardAction()]

4
internal_packages/message-list/stylesheets/message-list.less
View file

@ -255,10 +255,6 @@
padding-bottom: @spacing-standard;
padding-top: 19px;
.primary-message-action{
padding: 7px 1em;
}
.message-actions-wrap {
text-align: right;
}

2
static/components/button-dropdown.less
View file

@ -7,7 +7,7 @@
.btn();
height: 32px;
border-radius: 4px 0 0 4px;
padding: 0;
padding-top: 7px;
}
.secondary-picker {
.btn();