Merge pull request RefugeRestrooms#223 from RefugeRestrooms/feature/c…

…ommon.css Feature/common.css
aitchabee · Mar 1, 2015 · 6cc5614 · 6cc5614
2 parents 937819e + 534d6c9
commit 6cc5614
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -15,6 +15,7 @@
  *= require search
  *= require _mobile
  *= require top_cities
+ *= require common
  */
 
 @import 'variables';
@@ -65,7 +66,7 @@ h1 {
     background: $light-purple;
     cursor: pointer;
 }
-.addForm input[name=commit]:hover, .addForm input[type=button]:hover {
+.addForm input[name=commit]:hover, .addForm {
     background-color: $light-purple;
     color: white;
 }

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
diff --git a/app/assets/stylesheets/framework_and_overrides.css.scss b/app/assets/stylesheets/framework_and_overrides.css.scss
@@ -18,10 +18,12 @@ img {
     background-color: transparent;
     border-color: #41326B;
 }
-.btn:hover, .submit:hover, .btn:focus, .submit:focus {
+button.btn:hover, button.btn:focus {
     color: white;
-    text-decoration: none;
+    background-color: #8377af;
+    border-color: #8377af;
 }
+
 header {
     background-color: $purple;
 }

diff --git a/app/assets/stylesheets/search.css.scss b/app/assets/stylesheets/search.css.scss
@@ -58,8 +58,4 @@
     .fa-spinner {
         display: inherit;
     }
-}
-.searchButton:hover, .splashcontainer .currentLocationButton:hover {
-    background-color: #8377af;
-    border-color: #8377af;
 }