Merge branch 'rickysang-master'

ColorlibHQ · Sep 12, 2016 · 060f790 · 060f790
2 parents e207c9c + 1598876
commit 060f790
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/build/less/forms.less b/build/less/forms.less
@@ -29,7 +29,8 @@
     label {
       color: @green;
     }
-    .form-control {
+    .form-control,
+    .input-group-addon {
       border-color: @green;
       box-shadow: none;
     }
@@ -42,7 +43,8 @@
     label {
       color: @yellow;
     }
-    .form-control {
+    .form-control,
+    .input-group-addon {
       border-color: @yellow;
       box-shadow: none;
     }
@@ -55,7 +57,8 @@
     label {
       color: @red;
     }
-    .form-control {
+    .form-control,
+    .input-group-addon {
       border-color: @red;
       box-shadow: none;
     }

diff --git a/dist/css/AdminLTE.css b/dist/css/AdminLTE.css
@@ -1270,7 +1270,8 @@ a:focus {
 .form-group.has-success label {
   color: #00a65a;
 }
-.form-group.has-success .form-control {
+.form-group.has-success .form-control,
+.form-group.has-success .input-group-addon {
   border-color: #00a65a;
   box-shadow: none;
 }
@@ -1280,7 +1281,8 @@ a:focus {
 .form-group.has-warning label {
   color: #f39c12;
 }
-.form-group.has-warning .form-control {
+.form-group.has-warning .form-control,
+.form-group.has-warning .input-group-addon {
   border-color: #f39c12;
   box-shadow: none;
 }
@@ -1290,7 +1292,8 @@ a:focus {
 .form-group.has-error label {
   color: #dd4b39;
 }
-.form-group.has-error .form-control {
+.form-group.has-error .form-control,
+.form-group.has-error .input-group-addon {
   border-color: #dd4b39;
   box-shadow: none;
 }

diff --git a/dist/css/AdminLTE.min.css b/dist/css/AdminLTE.min.css