From: canterberrie <christine@zurb.com>
Date: Fri, 5 May 2017 18:42:13 +0000 (-0700)
Subject: merge conflict
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fcanterberrie%2Fjoeworkman-feature%2Fhollow-buttons;p=thirdparty%2Ffoundation%2Ffoundation-emails.git

merge conflict
---

0be3417da35c6b2a591463cb3fc0ade5c0635ddd
diff --cc scss/components/_button.scss
index df2d3372,0d1fccbe..a643fecd
--- a/scss/components/_button.scss
+++ b/scss/components/_button.scss
@@@ -317,9 -317,10 +317,9 @@@ table.button.warning:hover 
    // Then the mixin calls itself with just the color to obtain the color styles
    @if $class {
      &.#{$class} {
-         @include hollowButton($color);
+         @include hollow-button($color);
      }
 -  }
 -  @else {
 +  } @else {
      table tr td a {
        border:1px solid $color;
        color: $color;
@@@ -356,9 -350,9 +356,18 @@@ table.button.hollow 
      table a {border-radius:$global-rounded;}
    }
  
++<<<<<<< HEAD
 +  @include hollowButton($primary-color);
 +  @include hollowButton($secondary-color,'secondary');
 +  @include hollowButton($alert-color,'alert');
 +  @include hollowButton($warning-color,'warning');
 +  @include hollowButton($success-color,'success');
 +}
++=======
+   @include hollow-button($primary-color);
+   @include hollow-button($secondary-color,'secondary');
+   @include hollow-button($alert-color,'alert');
+   @include hollow-button($warning-color,'warning');
+   @include hollow-button($success-color,'success');
 -}
++}
++>>>>>>> eb4c27848b700262ae2b222a2e588c0b0bcdd989