[MERGE]

bzr revid: nicolas.vanhoren@openerp.com-20110404160926-f1uwddcknsezvamr
bzr revid: nicolas.vanhoren@openerp.com-20110405101739-iubtgou4lrnftmi2

1 files changed, 21 insertions, 17 deletions

diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css
index 151ec6e214e..82ff0339226 100644
--- a/addons/base/static/src/css/base.css
+++ b/addons/base/static/src/css/base.css
@@ -12,7 +12,7 @@ body {
     margin: 2px;
 }
 
-.#oe_header h2 {
+#oe_header h2 {
     margin: 2px 0;
 }
 
@@ -68,16 +68,6 @@ body.openerp {
     width: 100%;
     height: 100%;
 }
-/* Main Application */
-.openerp .application {
-    padding: 6px;
-}
-
-.openerp h3.title {
-    margin: 2px 0;
-    color: #252424;
-    text-shadow: white 0 1px 0;
-}
 
 /* Menu */
 .openerp .sf-menu {
@@ -305,8 +295,23 @@ body.openerp {
     text-align: center;
 }
 
-/* SearchView */
+/* Main Application */
+.openerp .application {
+    padding: 6px;
+}
 
+.openerp h2.oe_view_title {
+    margin: 2px 0;
+    color: #252424;
+    text-shadow: white 0 1px 0;
+}
+
+/* View Manager */
+.openerp .oe_vm_switch {
+    float: right;
+}
+
+/* SearchView */
 .openerp .filter_label, .openerp .filter_icon {
     border: 1px solid #666;
     border-left-width: 0;
@@ -395,15 +400,14 @@ body.openerp {
     padding-left: 10px;
 }
 
-/* View Manager */
-.openerp .views-switchers {
-    text-align: right;
-}
 
 /* Form */
 .openerp .required.error {
     border: 1px solid #900;
 }
+.openerp .oe_form_pager {
+    text-align: right;
+}
 
 /* Inputs */
 .openerp input[type="text"], .openerp input[type="password"], .openerp select, .openerp textarea {
@@ -418,7 +422,7 @@ body.openerp {
     border-radius: 3px;
     background: white;
 }
-.openerp input.field_date {
+.openerp input.field_date, .openerp input.field_datetime {
     background: url('../img/ui/field_calendar.png') no-repeat right center;
     background-origin: content-box;
     -moz-background-origin: content;