From 6e9384792a373f06241bfe4343de089f31d10b2e Mon Sep 17 00:00:00 2001
From: Jackie Luo <jacquelineluo95@gmail.com>
Date: Sat, 12 Mar 2016 11:43:49 -0800
Subject: [PATCH] :art:(themes): Fixes Windows button UI issues in #1649

---
 .../thread-list/stylesheets/thread-list.less        | 13 ++-----------
 internal_packages/ui-darkside/styles/darkside.less  |  4 ++++
 src/sheet-toolbar.cjsx                              |  4 ++--
 static/workspace.less                               |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/internal_packages/thread-list/stylesheets/thread-list.less b/internal_packages/thread-list/stylesheets/thread-list.less
index b1f2335c9..f9824c6c9 100644
--- a/internal_packages/thread-list/stylesheets/thread-list.less
+++ b/internal_packages/thread-list/stylesheets/thread-list.less
@@ -301,9 +301,9 @@
 .thread-list .list-item .list-column-HoverActions {
   display:none;
   .action {
-    display:inline-block;
+    display: inline-block;
     background-size: 100%;
-    zoom:0.5;
+    zoom: 0.5;
     width: 81px;
     height: 51px;
     margin: 9px 16px 0 16px;
@@ -324,15 +324,6 @@ body.platform-win32 {
       border: 0;
       margin: 9px 0 0 0;
     }
-    .action.action-archive {
-      background: url(@archive-img) center no-repeat;
-    }
-    .action.action-trash {
-      background: url(@trash-img) center no-repeat;
-    }
-    .action.action-snooze {
-      background: url(@snooze-img) center no-repeat;
-    }
   }
 }
 .thread-list .list-item:hover .list-column-HoverActions {
diff --git a/internal_packages/ui-darkside/styles/darkside.less b/internal_packages/ui-darkside/styles/darkside.less
index a0a94d908..5f6bc2001 100644
--- a/internal_packages/ui-darkside/styles/darkside.less
+++ b/internal_packages/ui-darkside/styles/darkside.less
@@ -698,6 +698,10 @@ body.is-blurred .list-tabular .list-tabular-item.keyboard-cursor {
   background: transparent;
 }
 
+body.platform-win32 .sheet-toolbar-container .btn-toolbar:hover {
+  background: none;
+}
+
 // Centering vertially without magic numbers
 .layout-mode-popout .toolbar-window-controls {
   margin-top: 0;
diff --git a/src/sheet-toolbar.cjsx b/src/sheet-toolbar.cjsx
index 4bbd35b4e..13021e6f9 100644
--- a/src/sheet-toolbar.cjsx
+++ b/src/sheet-toolbar.cjsx
@@ -105,9 +105,9 @@ class ToolbarMenuControl extends React.Component
   @displayName: 'ToolbarMenuControl'
   render: =>
     <div className="toolbar-menu-control">
-      <div className="btn btn-toolbar" onClick={@_openMenu}>
+      <button className="btn btn-toolbar" onClick={@_openMenu}>
         <RetinaImg name="windows-menu-icon.png" mode={RetinaImg.Mode.ContentIsMask} />
-      </div>
+      </button>
     </div>
 
   _openMenu: =>
diff --git a/static/workspace.less b/static/workspace.less
index b4b325a91..f3b6332a5 100644
--- a/static/workspace.less
+++ b/static/workspace.less
@@ -390,7 +390,7 @@ body.platform-win32 {
       box-shadow: none;
       background: none;
       &:hover {
-        background: #e5e5e5;
+        background: darken(@list-hover-bg, 5%);
       }
     }
   }