From a8aae53c00d4faacdad147dae7769fdf49c24b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20Juli=C3=A1n?= <xavier.julian@kaleidos.net>
Date: Tue, 10 Feb 2015 16:46:55 +0100
Subject: [PATCH] Desfault button refactor

---
 app/styles/components/buttons.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/styles/components/buttons.scss b/app/styles/components/buttons.scss
index bb3a7050..baf0ea05 100755
--- a/app/styles/components/buttons.scss
+++ b/app/styles/components/buttons.scss
@@ -87,6 +87,7 @@
         background: $red;
         color: $white;
     }
+<<<<<<< HEAD
     .icon {
         color: $white;
     }
@@ -99,6 +100,8 @@
         background: $red-light;
         color: $white;
     }
+=======
+>>>>>>> Desfault button refactor
 }
 
 .button-bulk {
@@ -113,6 +116,7 @@
     }
 }
 
+<<<<<<< HEAD
 
 .button-auth {
     @extend %button;
@@ -121,6 +125,12 @@
     img {
         @extend %large;
         color: $white;
+=======
+.button-auth {
+    @extend %button;
+    background: $grayer;
+    .icon {
+>>>>>>> Desfault button refactor
         margin-right: .5rem;
     }
     &:hover {