cleaned up issues and errors

library/scss/_mixins.scss

@@ -20,25 +20,11 @@ remember less is more.
 CLEARFIXIN'
 *********************/
 
-<<<<<<< HEAD
-/* Contain floats: nicolasgallagher.com/micro-clearfix-hack/ */
-.clearfix {
-	&:before,
-	&:after {
-		content: "";
-    	display: table;
-	}
-	&:after {
-		clear: both;
-	}
-	zoom: 1;
-=======
 // Contain floats: nicolasgallagher.com/micro-clearfix-hack/
 .clearfix {
   zoom: 1;
 	&:before, &:after { content: ""; display: table; }
 	&:after { clear: both; }
->>>>>>> 1.3
 }
 
 /*********************
@@ -84,9 +70,6 @@ $bones-pink:        #f01d4f;
 $bones-blue:        #1990db;
 
 $link-color:        $bones-pink;
-<<<<<<< HEAD
-$link-hover:        lighten($bones-pink, 9%);
-=======
 $link-hover:        darken($link-color, 9%);
 
 /*
@@ -94,7 +77,7 @@ Here's a great tutorial on how to
 use color variables properly:
 http://sachagreif.com/sass-color-variables/
 */
->>>>>>> 1.3
+
 
 /*********************
 TYPOGRAPHY
@@ -139,54 +122,33 @@ span.amp {
 .text-right  { text-align: right; }
 
 
-<<<<<<< HEAD
-/* alerts & notices */
+// alerts and notices
 %alert {
-=======
-// alerts & notices 
-.alert {
->>>>>>> 1.3
 	margin: 10px;
 	padding: 5px 18px;
 	border: 1px solid;
 }
 
-<<<<<<< HEAD
 .alert-help {
 	@extend %alert;
-=======
-.help {
->>>>>>> 1.3
 	border-color: darken($alert-yellow, 5%);
 	background: $alert-yellow;
 }
 
-<<<<<<< HEAD
 .alert-info {
 	@extend %alert;
-=======
-.info {
->>>>>>> 1.3
 	border-color: darken($alert-blue, 5%);
 	background: $alert-blue;
 }
 
-<<<<<<< HEAD
 .alert-error {
 	@extend %alert;
-=======
-.error {
->>>>>>> 1.3
 	border-color: darken($alert-red, 5%);
 	background: $alert-red;
 }
 
-<<<<<<< HEAD
 .alert-success {
 	@extend %alert;
-=======
-.success {
->>>>>>> 1.3
 	border-color: darken($alert-green, 5%);
 	background: $alert-green;
 }
@@ -196,30 +158,11 @@ BORDER RADIUS
 *********************/
 
 /*
-<<<<<<< HEAD
 I totally rewrote this to be cleaner and easier to use.
 You'll need to be using Sass 3.2+ for these to work.
 Thanks to @anthonyshort for the inspiration on these.
 USAGE: @include border-radius(4px 4px 0 0);
 */
-=======
-NOTE: For older browser support (and some mobile),
-don't use the shorthand to define *different* corners.
-
-USAGE: @include rounded(4px);
-
-*/
-@mixin rounded($radius: 4px) {
-	-webkit-border-radius: $radius;
-	-moz-border-radius:    $radius;
-	border-radius:         $radius;
-}
-
-/*
-Instead of having a seperate mixin for the different
-borders, we're using the mixin from 320 & Up to make
-things easier to use.
->>>>>>> 1.3
 
 @mixin border-radius($radius...) {
 	// defining prefixes so we can use them in mixins below
@@ -228,27 +171,7 @@ things easier to use.
     #{$prefix}-border-radius: $radius;
   }
 
-<<<<<<< HEAD
   border-radius: $radius;
-=======
-*/
-@mixin border-radius($topright: 0, $bottomright: 0, $bottomleft: 0, $topleft: 0) {
-	-webkit-border-top-right-radius:    $topright;
-	-webkit-border-bottom-right-radius: $bottomright;
-	-webkit-border-bottom-left-radius:  $bottomleft;
-	-webkit-border-top-left-radius:     $topleft;
-	-moz-border-radius-topright:        $topright;
-	-moz-border-radius-bottomright:     $bottomright;
-	-moz-border-radius-bottomleft:      $bottomleft;
-	-moz-border-radius-topleft:         $topleft;
-	border-top-right-radius:            $topright;
-	border-bottom-right-radius:         $bottomright;
-	border-bottom-left-radius:          $bottomleft;
-	border-top-left-radius:             $topleft;
-	-webkit-background-clip:            padding-box;
-	-moz-background-clip:               padding;
-	background-clip:                    padding-box;
->>>>>>> 1.3
 }
 
 /*********************
@@ -345,11 +268,7 @@ BUTTONS
 	cursor: pointer;
 	margin-bottom: 20px;
 	line-height: 21px;
-<<<<<<< HEAD
 	@include border-radius(4px);
-=======
-	@include rounded(4px);
->>>>>>> 1.3
 	@include css-gradient($link-color, darken($link-color, 5%));