Merge pull request #2 from jackiehluo/solarized

Update UI variables and add theme colors
NSHenry · Mar 12, 2016 · da2ec89 · da2ec89
2 parents 7adb0f5 + 29aa87a
commit da2ec89
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 27 deletions.
diff --git a/N1-Solarized-Dark/index.less → index.less b/N1-Solarized-Dark/index.less → index.less
diff --git a/N1-Solarized-Dark/package.json → package.json b/N1-Solarized-Dark/package.json → package.json
@@ -1,5 +1,6 @@
 {
   "name": "N1-Solarized-Dark",
+  "displayName": "Solarized Dark",
   "theme": "Solarized Dark",
   "version": "0.2.0",
   "description": "A clean, Mailbox-inspired theme for Nylas N1",

diff --git a/N1-Solarized-Dark/styles/controls.less → styles/controls.less b/N1-Solarized-Dark/styles/controls.less → styles/controls.less
@@ -10,25 +10,27 @@
   border-radius: @base-border-radius !important;
   cursor: pointer !important;
   img.content-mask {
-      background-color: @background-tertiary !important;
+    margin-top: -5px;
+    background-color: @background-tertiary !important;
   }
 }
-    .btn-toolbar:hover {
-      background: @background-tertiary !important;
-      img.content-mask {
-          background-color: @background-secondary !important;
-      }
+
+.btn-toolbar:hover {
+  background: @background-tertiary !important;
+  img.content-mask {
+    background-color: @background-secondary !important;
+  }
 }
 
 .mode-false {
+  img.content-mask {
+    background-color: @white !important;
+  }
+  &:hover {
     img.content-mask {
-        background-color: @white !important;
-    }
-    &:hover {
-        img.content-mask {
-            background-color: @white !important;
-        }
+      background-color: @white !important;
     }
+  }
 }
 
 body.platform-win32 {
@@ -58,13 +60,13 @@ body.platform-win32 {
     border-top-left-radius: @base-border-radius !important;
     border-bottom-left-radius: @base-border-radius !important;
     padding-top: 5px;
-  }
-  .primary-item:hover{
+    &:hover {
       background: @background-tertiary !important;
       color: @background-secondary !important;
       img.content-mask {
-          background-color: @background-secondary !important;
+        background-color: @background-secondary !important;
       }
+    }
   }
 
   .secondary-picker {
@@ -75,12 +77,12 @@ body.platform-win32 {
     border-top-right-radius: @base-border-radius !important;
     border-bottom-right-radius: @base-border-radius !important;
     margin-left: -1px !important;
-  }
-  .secondary-picker:hover {
+    &:hover {
       background: @background-tertiary !important;
       img.content-mask {
-          background-color: @background-secondary !important;
+        background-color: @background-secondary !important;
       }
+    }
   }
 
   .secondary-items {
@@ -93,14 +95,13 @@ body.platform-win32 {
           background: @background-primary !important;
         }
       }
-    }
-    .item:hover {
+      &:hover {
         color: @white !important;
+        background: @background-primary !important;
         img.content-mask {
             background-color: @white !important;
         }
-        background: @background-primary !important;
-
+      }
     }
   }
 }
@@ -138,6 +139,10 @@ body.platform-win32 {
   }
 }
 
+.button-dropdown.bordered .primary-item {
+  padding-top: 0px;
+}
+
 /**
  * Plugin page
  */

diff --git a/N1-Solarized-Dark/styles/email-frame.less → styles/email-frame.less b/N1-Solarized-Dark/styles/email-frame.less → styles/email-frame.less
diff --git a/N1-Solarized-Dark/styles/notifications.less → styles/notifications.less b/N1-Solarized-Dark/styles/notifications.less → styles/notifications.less
diff --git a/N1-Solarized-Dark/styles/sidebar.less → styles/sidebar.less b/N1-Solarized-Dark/styles/sidebar.less → styles/sidebar.less
@@ -5,9 +5,6 @@
 }
 
 .account-sidebar-sections {
-  background-color: darken(@accent-primary-dark, 1%) !important;
-  box-shadow: inset -3px 0 3px rgba(0,0,0, .1);
-
   section {
     .item-container {
       margin: 0 10px !important;

diff --git a/styles/theme-colors.less b/styles/theme-colors.less
@@ -0,0 +1,4 @@
+@component-active-color: #1290af;
+@toolbar-background-color: #00647D;
+@panel-background-color: rgb(7,54,66);
+
diff --git a/N1-Solarized-Dark/styles/threads.less → styles/threads.less b/N1-Solarized-Dark/styles/threads.less → styles/threads.less
diff --git a/N1-Solarized-Dark/styles/ui-variables.less → styles/ui-variables.less b/N1-Solarized-Dark/styles/ui-variables.less → styles/ui-variables.less
@@ -35,8 +35,7 @@
 @text-color-inverse-very-subtle:  fadeout(@text-color-inverse, 50%);
 @text-color-heading:              #FFF;
 
-@panel-background-color: @accent-primary-dark;
-@toolbar-background-color: @accent-primary-dark;
+@panel-background-color: darken(@accent-primary-dark, 1%);
 
 @btn-default-bg-color: @accent-primary-light;
 @btn-default-text-color: @background-tertiary;