[Merge] Merge with trunk.

bzr revid: mdi@tinyerp.com-20121128042303-eu3ttdp9nvt99o2k
2012-11-28 09:53:03 +05:30
parent 1db3fca04a f63bdc67e2
commit 91b19d1a7c
37 changed files with 1405 additions and 565 deletions
@@ -30,7 +30,7 @@
  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
  /* http://www.quirksmode.org/dom/inputfile.html
   * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image
-   */ */
+   */
 }
 .openerp.openerp_webclient_container {
  height: 100%;
@@ -807,8 +807,6 @@
  padding: 0 0 4px 0;
 }
 .openerp .oe_login button {
-  float: right;
-  display: inline-block;
  cursor: pointer;
  padding: 6px 16px;
  border: 1px solid #222222;