Show...
+ actions.push Show...
else if @props.package.installing
- actions.push Installing...
+ actions.push Installing...
else
- actions.push
diff --git a/internal_packages/preferences/stylesheets/preferences-accounts.less b/internal_packages/preferences/stylesheets/preferences-accounts.less
index e69a48fce..f845c945a 100644
--- a/internal_packages/preferences/stylesheets/preferences-accounts.less
+++ b/internal_packages/preferences/stylesheets/preferences-accounts.less
@@ -31,8 +31,9 @@
}
.btn-editable-list {
- height: 35px;
- width: 35px;
+ height: 29px;
+ width: 29px;
+ line-height: 29px;
font-size: 1.3em;
}
}
diff --git a/internal_packages/preferences/stylesheets/preferences-mail-rules.less b/internal_packages/preferences/stylesheets/preferences-mail-rules.less
index d39c1fe61..4b03429db 100644
--- a/internal_packages/preferences/stylesheets/preferences-mail-rules.less
+++ b/internal_packages/preferences/stylesheets/preferences-mail-rules.less
@@ -74,13 +74,13 @@
vertical-align: middle;
.btn {
padding: 0;
- padding-top: 3px;
- padding-bottom: 6px;
border-radius: 100%;
text-align: center;
margin-left:10px;
margin-top:1px;
width:24px;
+ line-height: 24px;
+ height: 24px;
}
}
}
diff --git a/internal_packages/search-bar/stylesheets/search-bar.less b/internal_packages/search-bar/stylesheets/search-bar.less
index dd024f898..49421bddb 100644
--- a/internal_packages/search-bar/stylesheets/search-bar.less
+++ b/internal_packages/search-bar/stylesheets/search-bar.less
@@ -7,21 +7,23 @@
overflow: visible;
z-index: 100;
width:450px;
- margin-top: (50px - 30px) / 2;
+ margin-top: (38px - 23px) / 2;
margin-left: 12px;
margin-right: 12px;
.menu .header-container {
padding:0;
- height:30px;
+ height:23px;
background-color: transparent;
border:none;
input {
- padding-left: 30px;
+ padding-left: 26px;
padding-right: 26px;
width: 100%;
- height: 30px;
+ height: 23px;
+ border: 0;
+ box-shadow: 0 0.5px 0 rgba(0,0,0,0.15), 0 -0.5px 0 rgba(0,0,0,0.15), 0.5px 0 0 rgba(0,0,0,0.15), -0.5px 0 0 rgba(0,0,0,0.15);
}
input.empty {
text-align: left;
@@ -67,16 +69,23 @@
&.search {
position: absolute;
- top: floor(40px - 16px)/2;
+ top: 8px;
left: @padding-base-horizontal;
}
&.clear {
position: absolute;
- top: 4px;
+ top: 0px;
right: 4px;
color: @input-accessory-color;
display: none;
}
}
}
+
+body.is-blurred {
+ .search-bar .menu .header-container input {
+ background: none;
+ box-shadow: 0 0.5px 0 rgba(0,0,0,0.15), 0 -0.5px 0 rgba(0,0,0,0.15), 0.5px 0 0 rgba(0,0,0,0.15), -0.5px 0 0 rgba(0,0,0,0.15);
+ }
+}
diff --git a/spec/n1-spec-reporter.coffee b/spec/n1-spec-reporter.coffee
index adcb18fa7..8666de3af 100644
--- a/spec/n1-spec-reporter.coffee
+++ b/spec/n1-spec-reporter.coffee
@@ -40,7 +40,7 @@ class N1SpecReporter extends View
@content: ->
@div class: 'spec-reporter', =>
@div class: 'padded pull-right', =>
- @button outlet: 'reloadButton', class: 'btn btn-small reload-button', 'Reload Specs'
+ @button outlet: 'reloadButton', class: 'btn reload-button', 'Reload Specs'
@div outlet: 'coreArea', class: 'symbol-area', =>
@div outlet: 'coreHeader', class: 'symbol-header'
@ul outlet: 'coreSummary', class: 'symbol-summary list-unstyled'
diff --git a/spec_integration/fixtures/test_account_data/threads/er75i8rdn5pbcaa1ewytmha70.json b/spec_integration/fixtures/test_account_data/threads/er75i8rdn5pbcaa1ewytmha70.json
index 1a150bf12..a4b20ee65 100644
--- a/spec_integration/fixtures/test_account_data/threads/er75i8rdn5pbcaa1ewytmha70.json
+++ b/spec_integration/fixtures/test_account_data/threads/er75i8rdn5pbcaa1ewytmha70.json
@@ -2,7 +2,7 @@
{
"account_id": "1nqpfzd0l7djj2xhega8i3iyc",
"bcc": [],
- "body": "\n\n\n \n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n \n \n \n \n \n \n\n\n\n \n \n
\n \n \n \n \n
\n \n \n \n\n\n
\n \n \n \n \n
\n \n Hi Ben,\n\n
\n\n\n
\n\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n
\n \n \n \n \n\n
\n \n Here's the message from Frank:\n\n
\n\n\n
\n \n
\u201cHere are the directions and check-in time. See you there!\u201d
\n\n
\n\n\n
\n\n
\n \n
\n\n\n\n
\n \n
\n\n
\n\n
\n \n \n
\n \n \n \n \n
\n \n
\n \n Getting there\n\n
\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n \n \n \n \n \n \n\n\n \n \n
\n\n
\n \n
\n
\n \n \n \n \n
\n \n
Chestnut Flats:
\n\n
The address will be emailed to you as part of your welcoming information the week of your reservation.
\n\n
Thank you for your reservation.
\n\n
\n\n\n\n
\n \n
\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n \n \n\n
\n \n \n \n \n
\n \n
\n \n Meet your host\n\n
\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n \n \n \n \n \n Samantha Westerwelle \n \n \n
\n\n
\n \n
\n\n\n
\n \n
\n About Me\n \n\n
\n \n
I love Bellingham, with its quirks and attitude it proves to be an ideal place for me. Art, music, the great outdoors, a good beer and delicious food are all things I could not live without.
\n\n
I am an associate at Ben Bridge... more
\n\n
\n\n\n\n
\n\n\n\n
\n \n
\n House Manual\n \n\n
\n \n
I love a clean space and hope that others would too, so please remove your shoes upon entering.
\n\n
Feel free to use anything in the kitchen. If you only use a few dishes please wash them and place them in the dishwasher to dry.... more
\n\n
\n\n\n\n
\n\n\n\n
\n \n
\n House Rules\n \n\n
\n \n
Please remove your shoes upon entry to help keep the carpet clean.
\n\n
Apartment quiet hours are 9pm-9am but other than that please just respect the space.
\n\n
\n\n\n\n
\n\n\n\n
\n\n\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n \n \n
\n \n \n \n \n
\n \n Customer support\n\n
\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n Confirmation code:\n 3APM2H\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n If you need assistance with your reservation or for urgent situations, such as check-in trouble or arriving to something unexpected, we\u2019re here to help!\n\n
\n \n \n
\n\n
\n \n \n \n \n
\n\n\n\n
\n\n
\n \n \n\n
\n \n\n \n \n\n \n \n \n\n \n \n \n Contact Support \n\n \n\n \n
\n\n
\n\n\n\n
\n\n
\n \n \n\n
\n \n\n \n \n\n \n \n \n\n \n \n \n \n \n\n \n\n \n
\n\n
\n\n\n\n
\n \n
\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n
\n \n \n
\n \n
\n\n
\n\n",
+ "body": "\n\n\n \n
\n
\n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n \n \n \n \n \n \n\n\n\n \n \n
\n \n \n \n \n
\n \n \n \n\n\n
\n \n \n \n \n
\n \n Hi Ben,\n\n
\n\n\n
\n\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n
\n \n \n \n \n\n
\n \n Here's the message from Frank:\n\n
\n\n\n
\n \n
\u201cHere are the directions and check-in time. See you there!\u201d
\n\n
\n\n\n
\n\n
\n \n
\n\n\n\n
\n \n
\n\n
\n\n
\n \n \n
\n \n \n \n \n
\n \n
\n \n Getting there\n\n
\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n \n \n \n \n \n \n\n\n \n \n
\n\n
\n \n
\n
\n \n \n \n \n
\n \n
Chestnut Flats:
\n\n
The address will be emailed to you as part of your welcoming information the week of your reservation.
\n\n
Thank you for your reservation.
\n\n
\n\n\n\n
\n \n
\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n \n \n\n
\n \n \n \n \n
\n \n
\n \n Meet your host\n\n
\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n \n \n \n \n \n Samantha Westerwelle \n \n \n
\n\n
\n \n
\n\n\n
\n \n
\n About Me\n \n\n
\n \n
I love Bellingham, with its quirks and attitude it proves to be an ideal place for me. Art, music, the great outdoors, a good beer and delicious food are all things I could not live without.
\n\n
I am an associate at Ben Bridge... more
\n\n
\n\n\n\n
\n\n\n\n
\n \n
\n House Manual\n \n\n
\n \n
I love a clean space and hope that others would too, so please remove your shoes upon entering.
\n\n
Feel free to use anything in the kitchen. If you only use a few dishes please wash them and place them in the dishwasher to dry.... more
\n\n
\n\n\n\n
\n\n\n\n
\n \n
\n House Rules\n \n\n
\n \n
Please remove your shoes upon entry to help keep the carpet clean.
\n\n
Apartment quiet hours are 9pm-9am but other than that please just respect the space.
\n\n
\n\n\n\n
\n\n\n\n
\n\n\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n \n \n
\n \n \n \n \n
\n \n Customer support\n\n
\n\n
\n \n
\n\n
\n \n \n \n \n
\n \n Confirmation code:\n 3APM2H\n\n
\n\n\n\n
\n \n
\n\n
\n \n \n \n \n If you need assistance with your reservation or for urgent situations, such as check-in trouble or arriving to something unexpected, we\u2019re here to help!\n\n
\n \n \n
\n\n
\n \n \n \n \n
\n\n\n\n
\n\n
\n \n \n\n
\n \n\n \n \n\n \n \n \n\n \n \n \n Contact Support \n\n \n\n \n
\n\n
\n\n\n\n
\n\n
\n \n \n\n
\n \n\n \n \n\n \n \n \n\n \n \n \n \n \n\n \n\n \n
\n\n
\n\n\n\n
\n \n
\n\n\n
2015-09-26 03:21:54 +0000
\n
\n
\n
\n
\n
\n \n \n
\n \n
\n\n
\n\n",
"cc": [],
"date": 1443237717,
"events": [],
diff --git a/src/components/newsletter-signup.cjsx b/src/components/newsletter-signup.cjsx
index 7065a18df..eb373c927 100644
--- a/src/components/newsletter-signup.cjsx
+++ b/src/components/newsletter-signup.cjsx
@@ -69,7 +69,7 @@ class NewsletterSignup extends React.Component
if @state.status is 'Pending'
else if @state.status is 'Error'
-
Retry
+
Retry
else if @state.status in ['Subscribed', 'Active']
else
diff --git a/static/buttons.less b/static/buttons.less
index c4afb31b5..72a2fdc65 100644
--- a/static/buttons.less
+++ b/static/buttons.less
@@ -47,13 +47,15 @@ body.platform-win32 {
}
.btn {
- padding: 0.33em 1em;
+ padding: 0 0.8em;
border-radius: @border-radius-base;
border: 0;
cursor: default;
display:inline-block;
- color: @btn-default-text-color;
- img.content-mask { background-color:@btn-default-text-color; }
+ color: @btn-default-text-color;
+
+ img.content-mask { background-color: @btn-default-text-color; }
+
.btn-gradient;
// Use 4 box shadows to create a 0.5px hairline around the button, and another
@@ -61,32 +63,33 @@ body.platform-win32 {
// Yes, 1px border looks really bad on retina.
box-shadow: 0 0.5px 0 rgba(0,0,0,0.15), 0 -0.5px 0 rgba(0,0,0,0.15), 0.5px 0 0 rgba(0,0,0,0.15), -0.5px 0 0 rgba(0,0,0,0.15), 0 1px 1px rgba(0, 0, 0, 0.15);
- height: auto;
- line-height: 1;
+ height: 1.9em;
+ line-height: 1.9em;
+
+ .text {
+ margin-left: 6px;
+ }
&:active {
cursor: default;
- background-color: darken(@btn-default-bg-color, 9%);
- box-shadow: 0 0.5px 0 rgba(0,0,0,0.15), 0 -0.5px 0 rgba(0,0,0,0.15), 0.5px 0 0 rgba(0,0,0,0.15), -0.5px 0 0 rgba(0,0,0,0.15), 0 -1px 1px rgba(0, 0, 0, 0.21);
+ background: darken(@btn-default-bg-color, 9%);
}
&:focus {
outline: none
}
- font-size: @font-size-base;
- &.btn-smaller {
+ font-size: @font-size-small;
+
+ &.btn-small {
font-size: @font-size-smaller;
}
- &.btn-small {
- font-size: @font-size-small;
- }
&.btn-large {
- font-size: @font-size-large;
- padding: 0.5em 1.3em;
+ font-size: @font-size-base;
+ padding: 0 1.3em;
}
&.btn-larger {
- font-size: @font-size-larger;
- padding: 0.66em 1.6em;
+ font-size: @font-size-large;
+ padding: 0 1.6em;
}
&.btn-action {
@@ -111,27 +114,14 @@ body.platform-win32 {
width: calc(~"100% + 2px");
height: calc(~"100% + 2px");
border-radius: 5px;
- padding: 0;
top: -1px;
left: -1px;
position: absolute;
z-index: -1;
background: linear-gradient(to bottom, #4ca2f9 0%, #015cff 100%);
}
- }
-
- &.btn-emphasis:active {
- background-image: -webkit-gradient(linear, left top, left bottom, from(darken(@btn-emphasis-bg-color,10%)), to(darken(@btn-emphasis-bg-color, 4%)));
- box-shadow: 0 1px 1px rgba(0, 0, 0, 0.21);
- }
-
- &.btn-text {
- font-size: 13px;
- padding: 2px 14px 2px 7px;
- .text {
- position: relative;
- top: 1px;
- margin-left: 6px;
+ &:active {
+ background: -webkit-gradient(linear, left top, left bottom, from(darken(@btn-emphasis-bg-color,10%)), to(darken(@btn-emphasis-bg-color, 4%)));
}
}
@@ -143,15 +133,14 @@ body.platform-win32 {
}
.btn-toolbar {
- height: 24px;
- padding: 2px 13px;
+ padding: 0 13px;
&.narrow {
- padding: 2px 9px;
+ padding: 0 9px;
}
}
.btn-gradient {
- background: -webkit-gradient(linear, left top, left bottom, from(@btn-default-bg-color), to(darken(@btn-default-bg-color, 4.5%)));
+ background: -webkit-gradient(linear, left top, left bottom, from(@btn-default-bg-color), to(darken(@btn-default-bg-color, 4.8%)));
}
.btn-gradient:active {
background: -webkit-gradient(linear, left top, left bottom, from(darken(@btn-default-bg-color, 9%)), to(darken(@btn-default-bg-color, 13.5%)));
diff --git a/static/components/button-dropdown.less b/static/components/button-dropdown.less
index 513000b6f..cc72c69e0 100644
--- a/static/components/button-dropdown.less
+++ b/static/components/button-dropdown.less
@@ -15,7 +15,7 @@
border-radius: 4px 4px 0 4px;
box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.20);
top: -100%;
- transform:translate(0, -2px);
+ transform:translate(0, -8px);
}
.secondary-picker {
border-top-right-radius: 0;
@@ -32,68 +32,22 @@
}
- &.bordered,
- &:hover {
- .primary-item,
- .only-item {
- .btn();
- height: 32px;
- padding-top: 7px;
- line-height: 18px;
- border-radius: 4px 0 0 4px;
- }
- }
-
&.btn-emphasis {
.primary-item,
.secondary-picker,
.only-item {
- .btn.btn-emphasis;
+ .btn.btn-emphasis();
}
.primary-item {
border-right:0;
}
}
- &.btn-text {
- .primary-item,
- .secondary-picker,
- .only-item {
- .btn.btn-text;
- height: 28px;
- line-height: 1;
- }
- .primary-item, .only-item {
- padding-top: 5px;
- }
- .secondary-picker {
- padding: 4px 8px 2px 8px;
- }
- .secondary-items {
- .menu {
- .item {
- font-size: 13px;
- padding: 6px 11px;
- &:first-child {
- padding-top: 6px;
- }
- &:last-child {
- padding-bottom: 6px;
- }
- }
- }
- }
- }
-
.primary-item,
.only-item {
- padding: 0.33em 1em;
+ .btn();
cursor: default;
color: @btn-default-text-color;
- height: 32px;
- padding-top: 7px;
- line-height: 18px;
- vertical-align:top;
}
.primary-item {
border-radius: 4px 0 0 4px;
@@ -101,12 +55,9 @@
.secondary-picker {
.btn();
- height: 32px;
border-radius: 0 4px 4px 0;
border-left: 0;
- padding: 7px 8px 3px 8px;
- vertical-align:top;
- img { vertical-align: baseline; }
+ padding: 0 8px;
}
.secondary-items {
&:hover {
@@ -121,7 +72,6 @@
border: 1px solid rgba(0, 0, 0, 0.15);
z-index: 2;
background-color: @background-primary;
- line-height: 14px;
position: absolute;
right: -1px; // -1, because of the border above
white-space:nowrap;
@@ -137,7 +87,14 @@
margin-top:0;
}
.item {
- padding: 6px 15px;
+ font-size: 13px;
+ padding: 4px 11px;
+ &:first-child {
+ padding-top: 6px;
+ }
+ &:last-child {
+ padding-bottom: 6px;
+ }
img {
margin-right:4px;
vertical-align: text-bottom;
@@ -148,11 +105,9 @@
}
}
.item:first-child {
- padding-top: 9px;
border-top-left-radius: 4px;
}
.item:last-child {
- padding-bottom: 9px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
@@ -173,16 +128,11 @@ body.platform-win32 {
.windows-btn-bg;
.windows-btn-border;
border-radius: 0;
- height: 34px;
- padding-top: 5px;
}
.secondary-picker {
.windows-btn-bg;
.windows-btn-border;
border-left: 0;
- height: 34px;
- padding-top: 5px;
- box-shadow: 0 0 0;
}
.secondary-picker,
.secondary-items {
@@ -200,21 +150,8 @@ body.platform-win32 {
}
&:active {
background: @btn-emphasis-bg-color;
- box-shadow: 0 0 0;
}
}
}
- &.btn-text {
- .primary-item,
- .secondary-picker,
- .only-item {
- .btn.btn-text;
- padding-top: 5px;
- height: 28px;
- }
- .secondary-picker {
- padding: 4px 8px 2px 8px;
- }
- }
}
}
diff --git a/static/components/editable-list.less b/static/components/editable-list.less
index ff7c6f9d7..f33deb1cf 100644
--- a/static/components/editable-list.less
+++ b/static/components/editable-list.less
@@ -106,6 +106,7 @@
justify-content: center;
height: 25px;
width: 25px;
+ line-height: 25px;
border-right: 1px solid @border-secondary-bg;
font-size: 1em;
cursor: default;
diff --git a/static/components/extra.less b/static/components/extra.less
index 54270836b..de80dc8ca 100644
--- a/static/components/extra.less
+++ b/static/components/extra.less
@@ -43,7 +43,7 @@ body.platform-win32 {
.mail-label {
font-size: 0.9em;
- padding: 2px 8px;
+ padding: 1px 8px;
margin-right: 6px;
flex-shrink: 0;
border-radius: 3px;
diff --git a/static/components/tokenizing-text-field.less b/static/components/tokenizing-text-field.less
index 2397ff534..fb95b7141 100644
--- a/static/components/tokenizing-text-field.less
+++ b/static/components/tokenizing-text-field.less
@@ -52,13 +52,12 @@
display: inline-block;
position: relative;
color: @text-color;
- padding: 0.5em @spacing-three-quarters 0.5em @spacing-three-quarters;
+ padding: 0 @spacing-three-quarters;
padding-right: 1.5em;
- margin: 3px 6px 6px 1px;
+ margin: 1px 5px 1px 1px;
border-radius: @border-radius-base * 0.8;
max-width: 100%;
- font-size: 15px;
- line-height: 17px;
+ line-height: 1.9em;
background: linear-gradient(to bottom, @token-top 0%, @token-bottom 100%);
box-shadow: 0 0.5px 0 rgba(0,0,0,0.17), 0 -0.5px 0 rgba(0,0,0,0.17), 0.5px 0 0 rgba(0,0,0,0.17), -0.5px 0 0 rgba(0,0,0,0.17), 0 1px 1px rgba(0, 0, 0, 0.1);
@@ -105,7 +104,7 @@
// Note: we switch from 0.5px borders with box shadows to a real border,
// because the 0.5px shadows can't be as dark as we want. This means
// margins / border radius change by 1px.
- margin: 2px 5px 5px 0;
+ margin: 0 4px 0 0;
color: @text-color-inverse;
.action {
@@ -126,7 +125,7 @@
color: @text-color-very-subtle;
float: left;
text-transform: capitalize;
- padding-top: 9px;
+ padding-top: 4px;
display: block;
}
@@ -152,8 +151,7 @@
// The padding-left and padding-right must be 0 so we can manually
// set the width properly to always match the size of the input
// test.
- padding: 0.4em 0 0.4em 0;
- margin: 2px 0 3px 0;
+ padding: 0.3em 0 0.3em 0;
&.noop-input {
position: absolute;
diff --git a/static/email-frame.less b/static/email-frame.less
index c6cbc9ca0..cf9ef49ad 100644
--- a/static/email-frame.less
+++ b/static/email-frame.less
@@ -50,7 +50,7 @@
html, body {
font-family: "Nylas-Pro", "Helvetica", "Lucidia Grande", sans-serif;
- font-size: 16px;
+ font-size: 14.5px;
line-height: 1.5;
color: @text-color;
background-color: transparent !important;
diff --git a/static/images/composer/icon-composer-send@2x.png b/static/images/composer/icon-composer-send@2x.png
index 7c9cb2fb0..8ba2f5667 100644
Binary files a/static/images/composer/icon-composer-send@2x.png and b/static/images/composer/icon-composer-send@2x.png differ
diff --git a/static/images/message-list/collapse@2x.png b/static/images/message-list/collapse@2x.png
index a3dcec029..a35f962c7 100644
Binary files a/static/images/message-list/collapse@2x.png and b/static/images/message-list/collapse@2x.png differ
diff --git a/static/images/message-list/expand@2x.png b/static/images/message-list/expand@2x.png
index 75c55525a..1512159e5 100644
Binary files a/static/images/message-list/expand@2x.png and b/static/images/message-list/expand@2x.png differ
diff --git a/static/images/message-list/print@2x.png b/static/images/message-list/print@2x.png
index d557b1797..a7298dc01 100644
Binary files a/static/images/message-list/print@2x.png and b/static/images/message-list/print@2x.png differ
diff --git a/static/images/search/searchclear@2x.png b/static/images/search/searchclear@2x.png
index e090b5b81..7ad5e9ddb 100644
Binary files a/static/images/search/searchclear@2x.png and b/static/images/search/searchclear@2x.png differ
diff --git a/static/images/sheets/sheet-back@2x.png b/static/images/sheets/sheet-back@2x.png
index e5f4472c4..932f75f6a 100644
Binary files a/static/images/sheets/sheet-back@2x.png and b/static/images/sheets/sheet-back@2x.png differ
diff --git a/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png b/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png
deleted file mode 100644
index a31cad911..000000000
Binary files a/static/images/splitpane/icon-toolbar-ViewMode-TwoPane-active@2x.png and /dev/null differ
diff --git a/static/images/splitpane/toolbar-icon-toggle-pane@2x.png b/static/images/splitpane/toolbar-icon-toggle-pane@2x.png
deleted file mode 100644
index e5f8857ac..000000000
Binary files a/static/images/splitpane/toolbar-icon-toggle-pane@2x.png and /dev/null differ
diff --git a/static/images/toolbar/searchloupe@2x.png b/static/images/toolbar/searchloupe@2x.png
index d9f68ed54..3358a266a 100644
Binary files a/static/images/toolbar/searchloupe@2x.png and b/static/images/toolbar/searchloupe@2x.png differ
diff --git a/static/images/toolbar/toolbar-archive@1x.png b/static/images/toolbar/toolbar-archive@1x.png
new file mode 100644
index 000000000..177e4d7d4
Binary files /dev/null and b/static/images/toolbar/toolbar-archive@1x.png differ
diff --git a/static/images/toolbar/toolbar-archive@2x.png b/static/images/toolbar/toolbar-archive@2x.png
index da7fa3878..22498fc1e 100644
Binary files a/static/images/toolbar/toolbar-archive@2x.png and b/static/images/toolbar/toolbar-archive@2x.png differ
diff --git a/static/images/toolbar/toolbar-compose@1x.png b/static/images/toolbar/toolbar-compose@1x.png
new file mode 100644
index 000000000..ea8821fa4
Binary files /dev/null and b/static/images/toolbar/toolbar-compose@1x.png differ
diff --git a/static/images/toolbar/toolbar-compose@2x.png b/static/images/toolbar/toolbar-compose@2x.png
index 2b7d84ee4..84dbd0190 100644
Binary files a/static/images/toolbar/toolbar-compose@2x.png and b/static/images/toolbar/toolbar-compose@2x.png differ
diff --git a/static/images/toolbar/toolbar-icon-toggle-pane@1x.png b/static/images/toolbar/toolbar-icon-toggle-pane@1x.png
new file mode 100644
index 000000000..2724421a9
Binary files /dev/null and b/static/images/toolbar/toolbar-icon-toggle-pane@1x.png differ
diff --git a/static/images/toolbar/toolbar-icon-toggle-pane@2x.png b/static/images/toolbar/toolbar-icon-toggle-pane@2x.png
new file mode 100644
index 000000000..51bb84cff
Binary files /dev/null and b/static/images/toolbar/toolbar-icon-toggle-pane@2x.png differ
diff --git a/static/images/toolbar/toolbar-markasread@1x.png b/static/images/toolbar/toolbar-markasread@1x.png
new file mode 100644
index 000000000..30a158e08
Binary files /dev/null and b/static/images/toolbar/toolbar-markasread@1x.png differ
diff --git a/static/images/toolbar/toolbar-markasread@2x.png b/static/images/toolbar/toolbar-markasread@2x.png
index a761b2859..aace3ba72 100644
Binary files a/static/images/toolbar/toolbar-markasread@2x.png and b/static/images/toolbar/toolbar-markasread@2x.png differ
diff --git a/static/images/toolbar/toolbar-markasunread@1x.png b/static/images/toolbar/toolbar-markasunread@1x.png
new file mode 100644
index 000000000..8c80b7b79
Binary files /dev/null and b/static/images/toolbar/toolbar-markasunread@1x.png differ
diff --git a/static/images/toolbar/toolbar-markasunread@2x.png b/static/images/toolbar/toolbar-markasunread@2x.png
index 192a461fe..9c7aa9e2f 100644
Binary files a/static/images/toolbar/toolbar-markasunread@2x.png and b/static/images/toolbar/toolbar-markasunread@2x.png differ
diff --git a/static/images/toolbar/toolbar-movetofolder@1x.png b/static/images/toolbar/toolbar-movetofolder@1x.png
new file mode 100644
index 000000000..69b698b29
Binary files /dev/null and b/static/images/toolbar/toolbar-movetofolder@1x.png differ
diff --git a/static/images/toolbar/toolbar-movetofolder@2x.png b/static/images/toolbar/toolbar-movetofolder@2x.png
index 7a5e54ff9..b104f41a5 100644
Binary files a/static/images/toolbar/toolbar-movetofolder@2x.png and b/static/images/toolbar/toolbar-movetofolder@2x.png differ
diff --git a/static/images/toolbar/toolbar-star-selected@1x.png b/static/images/toolbar/toolbar-star-selected@1x.png
new file mode 100644
index 000000000..aa93bdea8
Binary files /dev/null and b/static/images/toolbar/toolbar-star-selected@1x.png differ
diff --git a/static/images/toolbar/toolbar-star-selected@2x.png b/static/images/toolbar/toolbar-star-selected@2x.png
index ce1e7455e..83e3b9ba1 100644
Binary files a/static/images/toolbar/toolbar-star-selected@2x.png and b/static/images/toolbar/toolbar-star-selected@2x.png differ
diff --git a/static/images/toolbar/toolbar-star@1x.png b/static/images/toolbar/toolbar-star@1x.png
new file mode 100644
index 000000000..68c12cbc7
Binary files /dev/null and b/static/images/toolbar/toolbar-star@1x.png differ
diff --git a/static/images/toolbar/toolbar-star@2x.png b/static/images/toolbar/toolbar-star@2x.png
index 761d8d592..eb354c591 100644
Binary files a/static/images/toolbar/toolbar-star@2x.png and b/static/images/toolbar/toolbar-star@2x.png differ
diff --git a/static/images/toolbar/toolbar-tag@1x.png b/static/images/toolbar/toolbar-tag@1x.png
new file mode 100644
index 000000000..bc57ad6ca
Binary files /dev/null and b/static/images/toolbar/toolbar-tag@1x.png differ
diff --git a/static/images/toolbar/toolbar-tag@2x.png b/static/images/toolbar/toolbar-tag@2x.png
index d84713f47..1a00d48a8 100644
Binary files a/static/images/toolbar/toolbar-tag@2x.png and b/static/images/toolbar/toolbar-tag@2x.png differ
diff --git a/static/images/toolbar/toolbar-trash@1x.png b/static/images/toolbar/toolbar-trash@1x.png
new file mode 100644
index 000000000..ba8257f9f
Binary files /dev/null and b/static/images/toolbar/toolbar-trash@1x.png differ
diff --git a/static/images/toolbar/toolbar-trash@2x.png b/static/images/toolbar/toolbar-trash@2x.png
index 7236dc38a..4948c9ed1 100644
Binary files a/static/images/toolbar/toolbar-trash@2x.png and b/static/images/toolbar/toolbar-trash@2x.png differ
diff --git a/static/inputs.less b/static/inputs.less
index b35a0598f..1ff5dddbc 100644
--- a/static/inputs.less
+++ b/static/inputs.less
@@ -53,12 +53,14 @@ body.platform-win32 {
input[type="tel"],
input[type="time"],
input[type="url"] {
- border: 2px solid @input-border;
+ border: 0;
border-radius: 0;
+ box-shadow: 0 0 0 2px @input-border;
&:focus {
- box-shadow: 0 0 0;
- border: 2px solid darken(@input-border, 20%);
+ border: 0;
+ border-radius: 0;
+ box-shadow: 0 0 0 2px darken(@input-border, 20%);
}
}
}
diff --git a/static/mixins/windows.less b/static/mixins/windows.less
index fa7a06a95..66b70d8fa 100644
--- a/static/mixins/windows.less
+++ b/static/mixins/windows.less
@@ -7,6 +7,6 @@
}
}
.windows-btn-border {
- border: 2px solid #e5e5e5;
- box-shadow: 0 0 0;
+ border: 0;
+ box-shadow: 0 0 0 2px #e5e5e5;
}
diff --git a/static/variables/ui-variables.less b/static/variables/ui-variables.less
index b37f53f38..c9af9ec61 100644
--- a/static/variables/ui-variables.less
+++ b/static/variables/ui-variables.less
@@ -104,7 +104,7 @@
@headings-font-weight: 600;
// ----- Font Sizes -----
-@font-size-base: 15px;
+@font-size-base: 14px;
@font-size-tiny: @font-size-base * 0.70; // 10.5px
@font-size-smaller: @font-size-base * 0.80; // 12px
@@ -153,13 +153,13 @@
@spacing-super-double: @spacing-standard * 2.25;
-@padding-base-vertical: 6px;
+@padding-base-vertical: 5px;
@padding-base-horizontal: 12px;
-@padding-large-vertical: 10px;
+@padding-large-vertical: 9px;
@padding-large-horizontal: 16px;
-@padding-small-vertical: 5px;
+@padding-small-vertical: 4px;
@padding-small-horizontal: 10px;
@padding-xs-vertical: 1px;
@@ -181,7 +181,7 @@
@btn-shadow: @standard-shadow;
-@btn-default-bg-color: @background-primary;
+@btn-default-bg-color: darken(@background-primary, 0.5%);
@btn-default-text-color: @text-color;
@btn-action-bg-color: @success-color;
diff --git a/static/workspace.less b/static/workspace.less
index 71388e4fe..5bde6ff48 100644
--- a/static/workspace.less
+++ b/static/workspace.less
@@ -70,7 +70,7 @@ nylas-workspace {
}
.toolbar-window-controls {
- margin-top:14px;
+ margin-top:9px;
margin-left:@spacing-half;
order: -1000;
min-width: 72px;
@@ -147,6 +147,7 @@ body.is-blurred {
.btn.btn-toolbar {
background: none;
+ box-shadow: 0 0.5px 0 rgba(0,0,0,0.15), 0 -0.5px 0 rgba(0,0,0,0.15), 0.5px 0 0 rgba(0,0,0,0.15), -0.5px 0 0 rgba(0,0,0,0.15);
img { opacity:0.5; }
}
.item-container {
@@ -180,12 +181,12 @@ body.is-blurred {
-webkit-app-region: drag;
border-bottom: 1px solid darken(@toolbar-background-color, 9%);
width: 100%;
- height: 50px;
+ height: 38px;
// prevent flexbox from ever, ever resizing toolbars, no matter
// how much it thinks other content is being squished
- min-height: 50px;
- max-height: 50px;
+ min-height: 38px;
+ max-height: 38px;
// cover up the vertical resizing separators, so the toolbar appears
// to be one continuous bar.
@@ -218,8 +219,6 @@ body.is-blurred {
.item-back {
order:-999;
- padding-top: 5px;
- padding-left: @spacing-three-quarters;
img.content-mask { background-color: @text-color-heading; }
flex-grow: 0;
flex-shrink: 0;
@@ -236,13 +235,18 @@ body.is-blurred {
}
.btn-toolbar {
- margin-top: @spacing-three-quarters;
+ margin-top: 8px;
margin-left: @spacing-three-quarters;
margin-right: 0;
flex-shrink: 0;
- height:28px;
+ line-height: 1.75em;
+ height: 1.75em;
+ box-shadow: 0 0.5px 0.05px rgba(0,0,0,0.4), 0 -0.5px 0 rgba(0,0,0,0.12);
+ img.content-mask { background-color: fadeout(@text-color-heading, 10%); }
+ }
+ .btn-toolbar:active {
+ img.content-mask { background-color: fadeout(@text-color-heading, 3%); }
}
-
.btn-toolbar:only-of-type {
margin-right: @spacing-three-quarters;
}
@@ -298,7 +302,6 @@ body.is-blurred {
cursor: row-resize;
div {
width:100%;
- // border-top: 1px solid @border-color-divider;
}
&.flexbox-handle-top {
top:-3px;
@@ -339,14 +342,14 @@ body.platform-win32 {
.toolbar-menu-control {
display:inherit;
order:10000;
- .btn { margin-left: 0; }
.btn-toolbar {
+ margin-left: 0;
padding: 0 17px;
- }
- img.content-mask {
- position: relative;
- top: 30px;
- background-color: @text-color-heading;
+ line-height: 36px;
+ img.content-mask {
+ vertical-align: middle;
+ background-color: @text-color-heading;
+ }
}
}
@@ -377,8 +380,9 @@ body.platform-win32 {
.btn-toolbar {
transition: background 300ms;
margin: 0 0 0 1px;
- height: 49px;
+ height: 37px;
padding: 0 14px;
+ padding-bottom: 2px;
border: 0;
box-shadow: none;
background: none;
@@ -398,6 +402,9 @@ body.platform-win32.is-blurred {
.sheet-toolbar-container {
background-image: none;
background: @background-primary;
+ .btn-toolbar {
+ box-shadow: none;
+ }
}
}
![\"Airbnb\"](\"https://a1.muscache.com/airbnb/rookery/email/logos/white-logo-72df75b47c8301068a7b52efd5ff0ff7.png\"){kind=logo}
\n ![](\"https://a0.muscache.com/airbnb/rookery/email/icons/caret_8x14-1888365f294cd9e373b0f974bff8e3ba.png\"){kind=icon}
\n ![\"Cozy](\"https://a0.muscache.com/ac/pictures/108142402/36b5acf8_original.jpg?interpolation=lanczos-none&size=large_cover&output-format=jpg&output-quality=70\")
\n\n ![\"Full-star\"](\"https://a0.muscache.com/airbnb/rookery/email/icons/full-star-08b0207b2ec3308084b3bffc90fd2e15.jpg\"){kind=icon}
\n ![](\"https://a1.muscache.com/ac/users/31631437/profile_pic/1436289116/original.jpg?interpolation=lanczos-none&crop=w:w;*,*&crop=h:h;*,*&resize=68:*&output-format=jpg&output-quality=70\")
\n ![\"\"](\"https://a0.muscache.com/airbnb/rookery/email/icons/book-2eb9988b912ffd4c43d3893fe930a847.png\" "\\"\\""){kind=icon}
\n ![\"\"](\"https://a0.muscache.com/airbnb/rookery/email/icons/mail-4926cdaaedb188c431e113dc219b9638.png\" "\\"\\""){kind=icon}
\n ![\"\"](\"https://a1.muscache.com/airbnb/rookery/email/icons/phone-2217a4dc01d5e17bdfc36f49195661af.png\" "\\"\\""){kind=icon}
\n ![\"Facebook\"](\"https://a1.muscache.com/airbnb/rookery/email/footer/facebook-942db036304a4d7531bd634125b0ed95.png\")
\n![\"Twitter\"](\"https://a0.muscache.com/airbnb/rookery/email/footer/twitter-1b57cb4f627e51c567753c2b1d89bd9a.png\")
\n![\"Instagram\"](\"https://a1.muscache.com/airbnb/rookery/email/footer/instagram-a6066bd633da64d7acbaa7c2331ef40e.png\")
\n![\"Pinterest\"](\"https://a0.muscache.com/airbnb/rookery/email/footer/pinterest-d4e581eecbc64b8855c8464dedaa5c9c.png\")
\n![\"♥\"](\"https://a1.muscache.com/airbnb/rookery/email/footer/heart-40429bf8c39010bbdf3a3037be994609.png\")
from Airbnb HQ