From 5e44c6edd7f23c94da95b00a723004b5053a8cdb Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 31 Aug 2015 00:36:14 +0100
Subject: rake update

---
 assets/stylesheets/bootstrap/_forms.scss        | 6 +++---
 assets/stylesheets/bootstrap/mixins/_forms.scss | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'assets/stylesheets')

diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss
index f8ffed3..af25fcb 100644
--- a/assets/stylesheets/bootstrap/_forms.scss
+++ b/assets/stylesheets/bootstrap/_forms.scss
@@ -273,7 +273,7 @@ input[type="checkbox"] {
 
 // Form validation states
 .has-success {
-  @include form-control-validation(success, $brand-success);
+  @include form-control-validation($brand-success);
 
   .form-control-success {
     background-image: url($form-icon-success);
@@ -281,7 +281,7 @@ input[type="checkbox"] {
 }
 
 .has-warning {
-  @include form-control-validation(warning, $brand-warning);
+  @include form-control-validation($brand-warning);
 
   .form-control-warning {
     background-image: url($form-icon-warning);
@@ -289,7 +289,7 @@ input[type="checkbox"] {
 }
 
 .has-error {
-  @include form-control-validation(error, $brand-danger);
+  @include form-control-validation($brand-danger);
 
   .form-control-error {
     background-image: url($form-icon-error);
diff --git a/assets/stylesheets/bootstrap/mixins/_forms.scss b/assets/stylesheets/bootstrap/mixins/_forms.scss
index 764c5e0..c9f3ef1 100644
--- a/assets/stylesheets/bootstrap/mixins/_forms.scss
+++ b/assets/stylesheets/bootstrap/mixins/_forms.scss
@@ -3,7 +3,7 @@
 // Used in _forms.scss to generate the form validation CSS for warnings, errors,
 // and successes.
 
-@mixin form-control-validation($state, $color) {
+@mixin form-control-validation($color) {
   // Color the label and help text
   .help-block,
   .control-label,
-- 
cgit v1.2.3