Skip to content
Browse files

changed mixing for alerts

  • Loading branch information...
1 parent 545e8dc commit 0e7a3d86ec5163f421101d670e837a9794634ccd eddiemachado committed Jun 25, 2012
Showing with 24 additions and 24 deletions.
  1. +12 −12 library/less/mixins.less
  2. +12 −12 library/scss/mixins.scss
View
24 library/less/mixins.less
@@ -51,10 +51,10 @@ Need help w/ choosing your colors? Try this site out:
http://0to255.com/
*********************/
-@yellow: #ebe16f;
-@red: #fbe3e4;
-@green: #e6efc2;
-@blue: #d5edf8;
+@alert-yellow: #ebe16f;
+@alert-red: #fbe3e4;
+@alert-green: #e6efc2;
+@alert-blue: #d5edf8;
@black: #000;
@white: #fff;
@@ -113,23 +113,23 @@ span.amp {
}
.help {
- border-color: darken(@yellow, 5%);
- background: @yellow;
+ border-color: darken(@alert-yellow, 5%);
+ background: @alert-yellow;
}
.info {
- border-color: darken(@blue, 5%);
- background: @blue;
+ border-color: darken(@alert-blue, 5%);
+ background: @alert-blue;
}
.error {
- border-color: darken(@red, 5%);
- background: @red;
+ border-color: darken(@alert-red, 5%);
+ background: @alert-red;
}
.success {
- border-color: darken(@green, 5%);
- background: @green;
+ border-color: darken(@alert-green, 5%);
+ background: @alert-green;
}
/*********************
View
24 library/scss/mixins.scss
@@ -50,10 +50,10 @@ Need help w/ choosing your colors? Try this site out:
http://0to255.com/
*********************/
-$yellow: #ebe16f;
-$red: #fbe3e4;
-$green: #e6efc2;
-$blue: #d5edf8;
+$alert-yellow: #ebe16f;
+$alert-red: #fbe3e4;
+$alert-green: #e6efc2;
+$alert-blue: #d5edf8;
$black: #000;
$white: #fff;
@@ -112,23 +112,23 @@ span.amp {
}
.help {
- border-color: darken($yellow, 5%);
- background: $yellow;
+ border-color: darken($alert-yellow, 5%);
+ background: $alert-yellow;
}
.info {
- border-color: darken($blue, 5%);
- background: $blue;
+ border-color: darken($alert-blue, 5%);
+ background: $alert-blue;
}
.error {
- border-color: darken($red, 5%);
- background: $red;
+ border-color: darken($alert-red, 5%);
+ background: $alert-red;
}
.success {
- border-color: darken($green, 5%);
- background: $green;
+ border-color: darken($alert-green, 5%);
+ background: $alert-green;
}
/*********************

0 comments on commit 0e7a3d8

Please sign in to comment.
Something went wrong with that request. Please try again.