[MERGE] from trunk

bzr revid: xmo@openerp.com-20110606113621-r3q0otfjdu7l0ubp

1 files changed, 62 insertions, 10 deletions

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index ffe23ad16a3..b801fb69f09 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -61,19 +61,71 @@ body.openerp {
 /* Login */
 .openerp .login {
     display: none;
-    padding: 6px;
-    z-index: 1002;
-    width: 34%;
-    position: fixed;
-    top: 0;
-    left: 33%;
+}
+.openerp .login form {
+    float: left;
+    width: 420px;
+    margin-left: 40px;
+    margin-bottom: 60px;
+}
+.openerp .login fieldset {
+    padding-bottom: 5px;
+    min-width: 100px;
+    margin-top: 60px;
+    border-radius: 10px;
+    -moz-border-radius: 10px;
+    -webkit-border-radius: 10px;
+}
+.openerp .login fieldset legend {
+    padding: 4px;
+}
+.openerp .login .oe_box2 {
+    padding: 5px 5px 20px 5px;
+}
+.openerp .login .oe_box2 table {
+    width: 100%;
+    border:none;
+}
+.openerp .login .oe_box2 td {
+    padding: 3px;
+    text-align: right;
+}
+.openerp .login .oe_box2 td input {
+    width: 100%;
+}
+.openerp .login .oe_login_right_pane {
+    padding:70px 35px 5px 10px;
+    min-width: 200px;
+    margin-left: 500px;
+}
+.openerp .login .login_error_message {
+    display: none;
+    background-color: #9A0404;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
+    color: white;
+    font-family: Ubuntu, Helvetica, sans-serif;
+    font-size: 16px;
+    font-weight: bold;
+    padding: 5px;
+    margin-top: 5px;
+    text-align: center;
+}
+.openerp .login.login_invalid .login_error_message {
+    display: block;
+}
 
+.openerp.login-mode .login-container {
+    height: 100%;
 }
-.openerp .login_valid {
-    background-color: #8f8;
+.openerp.login-mode .login {
+    display: block;
 }
-.openerp .login_invalid {
-    background-color: #f88;
+.openerp.login-mode .menu,
+.openerp.login-mode .secondary_menu,
+.openerp.login-mode .oe-application {
+    display: none;
 }
 
 /* Main*/