From 4d569d3f7d4292c7d9245bb5da35397cf8b548e0 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sat, 13 Oct 2012 09:25:32 -0500
Subject: [PATCH] fixed issue 1081, conflict betweeen web2py css error and
 bootstrap error classes, thanks Paolo and lapcchan

---
 VERSION                                              |  2 +-
 applications/welcome/static/css/web2py_bootstrap.css | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 857a327b..a89ca156 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.1.0 (2012-10-12 22:16:19) dev
+Version 2.1.0 (2012-10-13 09:25:28) dev
diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css
index ad3e8385..9c6f9bf8 100644
--- a/applications/welcome/static/css/web2py_bootstrap.css
+++ b/applications/welcome/static/css/web2py_bootstrap.css
@@ -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