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

fix(composer-buttons): Fix broken icons on overflow, make buttons wrap

Browse source
This commit is contained in:
Drew Regitsky 2016-02-25 12:07:52 -08:00
parent d710ffd817
commit d5ba162e82
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal_packages/composer/lib/composer-view.cjsx
View file

@ -429,10 +429,10 @@ class ComposerView extends React.Component
_renderActionsRegion: => _renderActionsRegion: =>
return <div></div> unless @props.draftClientId return <div></div> unless @props.draftClientId
<div className="composer-action-bar-content">
<InjectedComponentSet className="composer-action-bar-content" <InjectedComponentSet className="composer-action-bar-plugins"
matching={role: "Composer:ActionButton"} matching={role: "Composer:ActionButton"}
exposedProps={draftClientId:@props.draftClientId, threadId: @props.threadId}> exposedProps={draftClientId:@props.draftClientId, threadId: @props.threadId}></InjectedComponentSet>
<button className="btn btn-toolbar btn-trash" style={order: 100} <button className="btn btn-toolbar btn-trash" style={order: 100}
title="Delete draft" title="Delete draft"
@ -448,7 +448,7 @@ class ComposerView extends React.Component
ref="sendActionButton" ref="sendActionButton"
isValidDraft={@_isValidDraft} /> isValidDraft={@_isValidDraft} />
</InjectedComponentSet> </div>
isForwardedMessage: => isForwardedMessage: =>
return false if not @_proxy return false if not @_proxy

6
internal_packages/composer/stylesheets/composer.less
View file

@ -66,6 +66,7 @@ body.platform-win32 {
box-shadow: 0 0 0; box-shadow: 0 0 0;
margin: 0; margin: 0;
padding: 0 9px; padding: 0 9px;
white-space: nowrap;
img.content-mask { img.content-mask {
background-color: fadeout(mix(@btn-default-text-color, @component-active-color, 88%), 30%); background-color: fadeout(mix(@btn-default-text-color, @component-active-color, 88%), 30%);
@ -85,6 +86,7 @@ body.platform-win32 {
.btn-send { .btn-send {
margin-right: 10px; margin-right: 10px;
white-space: nowrap;
} }
.composer-action-bar-content { .composer-action-bar-content {
@ -93,6 +95,10 @@ body.platform-win32 {
flex-direction:row; flex-direction:row;
max-width: @compose-width; max-width: @compose-width;
padding: 9px 22.5px; padding: 9px 22.5px;
.composer-action-bar-plugins {
flex-wrap: wrap;
}
} }
} }

1
static/components/popover.less
View file

@ -4,6 +4,7 @@
.popover-container { .popover-container {
display:inline-block; display:inline-block;
position:relative; position:relative;
white-space: nowrap; // prevent dropdown arrow from wrapping when space constrained
} }
.popover { .popover {