Merge branch 'master' into feature/introduce-ember-concurrency

HospitalRun · Mar 8, 2017 · 5b37175 · 5b37175
2 parents 57e63fb + cab65ea
commit 5b37175
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss
@@ -21,6 +21,7 @@ $blue_lightest:         #eff2f5;
 $blue_lightest2:        #dee2e7;
 $red:                   #ff6d6f;
 $red_light:             rgba($red,.3);
+$red_lighter:           rgba($red,.75);
 $red_dark:              #c3124e;
 $gray_light:            #d9d9d9;
 $gray:                  rgba($navy,.65);
@@ -31,6 +32,7 @@ $sidebar_icon_lighter:  $navy_light;
 $sidebar_sublink_text:  #c2d2e3;
 $view_sub_nav:          #6784a2;
 $content_border:        $blue_lightest;
+$brown:                 #711214;
 
 // from misc
 

diff --git a/app/styles/components/_buttons.scss b/app/styles/components/_buttons.scss
@@ -1,17 +1,17 @@
 .btn {
   &.on-white {
-    background-color: $blue_light;
-    color: $navy;
+    background-color: #00c4a2;
+    color: $white;
   }
 
   &.warning {
-    background-color: $red_light;
-    color: $red;
+    background-color: #ff6d6f;
+    color: $white;
 
     &:hover,
     &:focus {
-      background-color: $red;
-      color: $white;
+      background-color: $red_lighter;
+      color: $brown;
     }
   }
 
@@ -50,7 +50,7 @@
 
   // needs converted to variable
   &:hover,
-  &:focus { background-color: #00c4a2; }
+  &:focus { background-color: #08987f; }
 
   // needs converted to variable
   &:active,
@@ -64,8 +64,8 @@
   &.disabled:active,
   &[disabled]:active {
     opacity: .7;
-    background-color: $green;
-    color: $white;
+    background-color: #dbebff;
+    color: $black;
   }
 }