From 7969ed14c8abf795e02f5b2683d517f040e7e3a7 Mon Sep 17 00:00:00 2001
From: Evan Morikawa <evan@evanmorikawa.com>
Date: Wed, 21 Oct 2015 12:17:15 -0700
Subject: [PATCH] feat(win32): improve button styles for Win 8.1 spec

---
 .../stylesheets/category-picker.less          | 10 ++++++
 .../stylesheets/message-list.less             | 34 +++++++++++++++++++
 static/workspace.less                         | 25 ++++++++++----
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/internal_packages/category-picker/stylesheets/category-picker.less b/internal_packages/category-picker/stylesheets/category-picker.less
index c6aecd836..402e1e943 100644
--- a/internal_packages/category-picker/stylesheets/category-picker.less
+++ b/internal_packages/category-picker/stylesheets/category-picker.less
@@ -1,5 +1,15 @@
 @import "ui-variables";
 
+
+body.platform-win32 {
+  .category-picker {
+    margin-left: 0;
+  }
+  img.content-mask {
+    top: 0;
+  }
+}
+
 .category-picker {
   margin-left: @spacing-three-quarters;
   .popover {
diff --git a/internal_packages/message-list/stylesheets/message-list.less b/internal_packages/message-list/stylesheets/message-list.less
index 76312abc4..6c366e689 100644
--- a/internal_packages/message-list/stylesheets/message-list.less
+++ b/internal_packages/message-list/stylesheets/message-list.less
@@ -13,6 +13,40 @@
     }
 }
 
+body.platform-win32 {
+  .sheet-toolbar {
+    .message-toolbar-arrow.down {
+      margin: 0 0 0 1px;
+      padding: 6px 5px 0 5px;
+      transition: background 300ms;
+      &:hover {
+        background: #e5e5e5;
+      }
+      &.btn-icon:hover {
+        color: @text-color;
+        img.content-mask { background: rgba(35, 31, 32, 0.8); }
+      }
+    }
+    .message-toolbar-arrow.up {
+      margin: 0 0 0 1px;
+      padding: 6px 5px 0 5px;
+      transition: background 300ms;
+      &:hover {
+        background: #e5e5e5;
+      }
+      &.btn-icon:hover {
+        color: @text-color;
+        img.content-mask { background: rgba(35, 31, 32, 0.8); }
+      }
+    }
+    .message-toolbar-arrow.disabled {
+      &:hover {
+        background: transparent;
+      }
+    }
+  }
+}
+
 .sheet-toolbar {
   // This class wraps the items that appear above the message list in the
   // toolbar. We want the toolbar items to sit right above the centered
diff --git a/static/workspace.less b/static/workspace.less
index f2f10cf70..c2ddeb538 100644
--- a/static/workspace.less
+++ b/static/workspace.less
@@ -223,13 +223,6 @@ body.is-blurred {
     }
   }
 
-  .toolbar-menu-control {
-    order:10000;
-    padding-top: 5px;
-    .btn { margin-left: 0; }
-    img.content-mask { background-color: @text-color-heading; }
-  }
-
   .btn-toolbar {
     margin-top: @spacing-three-quarters;
     margin-left: @spacing-three-quarters;
@@ -358,7 +351,18 @@ body.platform-win32 {
   &.window-type-default {
     .toolbar-menu-control {
       display:inherit;
+      order:10000;
+      .btn { margin-left: 0; }
+      .btn-toolbar {
+        padding: 0 17px;
+      }
+      img.content-mask {
+        position: relative;
+        top: 30px;
+        background-color: @text-color-heading;
+      }
     }
+
   }
 
   .item-compose {
@@ -384,9 +388,16 @@ body.platform-win32 {
     background-image: none;
     background: @background-primary;
     .btn-toolbar {
+      transition: background 300ms;
+      margin: 0 0 0 1px;
+      height: 49px;
+      padding: 0 14px;
       border: 0;
       box-shadow: none;
       background: none;
+      &:hover {
+        background: #e5e5e5;
+      }
     }
   }
 }