fixed issue 1081, conflict betweeen web2py css error and bootstrap error classes, thanks Paolo and lapcchan

2012-10-13 09:25:32 -05:00
parent 10aa5d4c8c
commit 4d569d3f7d
2 changed files with 10 additions and 2 deletions
@@ -1 +1 @@
-Version 2.1.0 (2012-10-12 22:16:19) dev
+Version 2.1.0 (2012-10-13 09:25:28) dev
@@ -47,7 +47,7 @@ ul#navbar>.auth_navbar{
 }
 /* form errors message box customization */
 div.error_wrapper{margin-bottom:9px;}
-div.error{
+div.error_wrapper .error{
  border-radius: 4px;
  -o-border-radius: 4px;
  -moz-border-radius: 4px;
@@ -162,6 +162,14 @@ input[type="text"].input-xlarge,input[type="password"].input-xlarge{width:270px;
 #recaptcha{min-height:30px;display:inline-block;margin-bottom:0;line-height:30px;vertical-align:middle;}
 td>#recaptcha{margin-bottom:6px;}
 div>#recaptcha{margin-bottom:9px;}
+div.control-group.error{
+width:auto;
+background:transparent;
+border:0;
+color:inherit;
+padding:0;
+background-repeat:repeat;
+}

 /*=============================================================
                       OTHER RULES