diff --git a/VERSION b/VERSION index 1bce9e32..4b46ea76 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.07.11.11.27.25 +Version 2.6.0-development+timestamp.2013.07.11.11.34.59 diff --git a/applications/admin/static/css/web2py_bootstrap.css b/applications/admin/static/css/web2py_bootstrap.css index 91dfbcde..258ae5b5 100644 --- a/applications/admin/static/css/web2py_bootstrap.css +++ b/applications/admin/static/css/web2py_bootstrap.css @@ -90,6 +90,7 @@ div.controls select +.error_wrapper {margin-left:5px;} .ie-lte7 div.error{color:#fff;} /* beautify brand */ +.navbar {margin-bottom:0} .navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;} .navbar-inverse .brand b>span{font-size:22px;color:white} @@ -222,6 +223,10 @@ td.w2p_fw ul{margin-left:0px;} /* auth_user_remember checkbox extrapadding in IE fix */ .ie-lte9 input#auth_user_remember.checkbox {padding-left:0;} +div.controls .error { + width: auto; +} + /*============================================================= MEDIA QUERIES ==============================================================*/ diff --git a/applications/examples/static/css/web2py_bootstrap.css b/applications/examples/static/css/web2py_bootstrap.css index 91dfbcde..258ae5b5 100644 --- a/applications/examples/static/css/web2py_bootstrap.css +++ b/applications/examples/static/css/web2py_bootstrap.css @@ -90,6 +90,7 @@ div.controls select +.error_wrapper {margin-left:5px;} .ie-lte7 div.error{color:#fff;} /* beautify brand */ +.navbar {margin-bottom:0} .navbar-inverse .brand{color:#c6cecc;} .navbar-inverse .brand b{display:inline-block;margin-top:-1px;} .navbar-inverse .brand b>span{font-size:22px;color:white} @@ -222,6 +223,10 @@ td.w2p_fw ul{margin-left:0px;} /* auth_user_remember checkbox extrapadding in IE fix */ .ie-lte9 input#auth_user_remember.checkbox {padding-left:0;} +div.controls .error { + width: auto; +} + /*============================================================= MEDIA QUERIES ==============================================================*/ diff --git a/applications/welcome/static/css/web2py_bootstrap.css b/applications/welcome/static/css/web2py_bootstrap.css index 18165343..258ae5b5 100644 --- a/applications/welcome/static/css/web2py_bootstrap.css +++ b/applications/welcome/static/css/web2py_bootstrap.css @@ -223,6 +223,10 @@ td.w2p_fw ul{margin-left:0px;} /* auth_user_remember checkbox extrapadding in IE fix */ .ie-lte9 input#auth_user_remember.checkbox {padding-left:0;} +div.controls .error { + width: auto; +} + /*============================================================= MEDIA QUERIES ==============================================================*/