Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2024-09-22 00:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(send-later): Re-order so send later always appears beside send

Browse source
This commit is contained in:
Ben Gotow 2016-02-23 14:20:26 -08:00
parent ac5266a1a5
commit d674a665fe
3 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
internal_packages/send-later/lib/send-later-popover.jsx
View file

@ -21,6 +21,9 @@ const SendLaterOptions = {
class SendLaterPopover extends Component {
static displayName = 'SendLaterPopover';
static containerStyles = {
order: -99,
};
static propTypes = {
draftClientId: PropTypes.string,
@ -102,10 +105,12 @@ class SendLaterPopover extends Component {
if (scheduledDate === 'saving') {
return (
<button className={className}>
<RetinaImg
name="inline-loading-spinner.gif"
mode={RetinaImg.Mode.ContentDark}
style={{width: 14, height: 14}}/>
</button>
);
}
@ -122,7 +127,8 @@ class SendLaterPopover extends Component {
<button className={className}>
<RetinaImg name="icon-composer-sendlater.png" mode={RetinaImg.Mode.ContentIsMask}/>
{dateInterpretation}
<RetinaImg name="composer-caret.png" style={{marginLeft: 6}} mode={RetinaImg.Mode.ContentIsMask}/>
<span data-reactid=".s.0.0.1">&nbsp;</span>
<RetinaImg name="icon-composer-dropdown.png" mode={RetinaImg.Mode.ContentIsMask}/>
</button>
);
}

19
static/components/menu.less
View file

@ -17,25 +17,6 @@
position: relative;
}
.header-container,
.footer-container {
input[type=text] {
border: 1px solid darken(@background-secondary, 10%);
border-radius: 3px;
background-color: white;
box-shadow: inset 0 1px 0 rgba(0,0,0,0.05), 0 1px 0 rgba(0,0,0,0.05);
&.search {
padding-left: 0;
background-repeat: no-repeat;
background-image: url("../static/images/search/searchloupe@2x.png");
background-size: 15px 15px;
background-position: 7px 4px;
text-indent: 31px;
}
}
}
.content-container {
background: @background-secondary;
width: 100%;

16
static/components/popover.less
View file

@ -30,6 +30,22 @@
border-bottom-right-radius: @border-radius-base;
}
}
input[type=text] {
border: 1px solid darken(@background-secondary, 10%);
border-radius: 3px;
background-color: white;
box-shadow: inset 0 1px 0 rgba(0,0,0,0.05), 0 1px 0 rgba(0,0,0,0.05);
&.search {
padding-left: 0;
background-repeat: no-repeat;
background-image: url("../static/images/search/searchloupe@2x.png");
background-size: 15px 15px;
background-position: 7px 4px;
text-indent: 31px;
}
}
}
.popover-pointer {