From ab639798d7efe11e6b77232837567f191caba5d0 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Thu, 27 Nov 2014 17:43:11 +0900
Subject: [PATCH] only apply primary button color to .btn-primary style

---
 client/views/common/css.html                         |  2 +-
 .../lib/client/scss/global/_forms.scss               | 12 +++++++-----
 packages/telescope-theme-base/versions.json          |  2 +-
 packages/telescope-theme-hubble/versions.json        |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/client/views/common/css.html b/client/views/common/css.html
index 9cd2ae1b0..39e9af0e5 100644
--- a/client/views/common/css.html
+++ b/client/views/common/css.html
@@ -3,7 +3,7 @@
       body{
         background: {{getSetting "backgroundCSS"}};
       }
-      input[type="submit"], button, .button, .auth-buttons #login-buttons #login-buttons-password, .btn, .error, .mobile-menu-button, .login-link-text{
+      input[type="submit"], button, .button, .auth-buttons #login-buttons #login-buttons-password, .btn-primary, .error, .mobile-menu-button, .login-link-text{
         background-color: {{getSetting "buttonColor"}} !important;
         color: {{getSetting "buttonTextColor"}} !important;
       }
diff --git a/packages/telescope-theme-base/lib/client/scss/global/_forms.scss b/packages/telescope-theme-base/lib/client/scss/global/_forms.scss
index d45fd42ff..1ef63161f 100644
--- a/packages/telescope-theme-base/lib/client/scss/global/_forms.scss
+++ b/packages/telescope-theme-base/lib/client/scss/global/_forms.scss
@@ -110,8 +110,6 @@ form, .accounts-dialog{
 input[type="submit"], button, .button, .btn{
   -webkit-appearance: none;
   border-radius: 3px;
-  background:$red;
-  color:white;
   text-align:center;
   display:block;
   max-width: 300px;
@@ -128,12 +126,16 @@ input[type="submit"], button, .button, .btn{
     background:$lighter-grey;
     pointer-events:none;
   }
-  &:link, &:hover, &:active, &:visited{
-    color:white;
-  }
   &.inline{
     display: inline-block;
   }
+  &.btn-primary{
+    background:$red;
+    color:white;
+    &:link, &:hover, &:active, &:visited{
+      color:white;
+    }
+  }
 }
 input[type="search"]{
   font-size:14px;
diff --git a/packages/telescope-theme-base/versions.json b/packages/telescope-theme-base/versions.json
index a0b371921..c42d4f71a 100644
--- a/packages/telescope-theme-base/versions.json
+++ b/packages/telescope-theme-base/versions.json
@@ -58,7 +58,7 @@
     ],
     [
       "fourseven:scss",
-      "0.9.4"
+      "1.0.0"
     ],
     [
       "geojson-utils",
diff --git a/packages/telescope-theme-hubble/versions.json b/packages/telescope-theme-hubble/versions.json
index a0b371921..c42d4f71a 100644
--- a/packages/telescope-theme-hubble/versions.json
+++ b/packages/telescope-theme-hubble/versions.json
@@ -58,7 +58,7 @@
     ],
     [
       "fourseven:scss",
-      "0.9.4"
+      "1.0.0"
     ],
     [
       "geojson-utils",