From 65ac532462eeac41222ac1e863752c205bdad90d Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:12:29 +0200
Subject: [PATCH 1/2] darker purple and config view alignment

bzr revid: mit@openerp.com-20120817151229-iuujaaw5aflujgzq
---
 addons/web/static/src/css/base.css  | 40 +++++++++++++++++------------
 addons/web/static/src/css/base.sass | 10 +++++---
 2 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 87a83b4c70e..81e179c8de9 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1,4 +1,4 @@
-@charset "utf-8";
+@charset "UTF-8";
 @font-face {
   font-family: "mnmliconsRegular";
   src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot");
@@ -234,7 +234,7 @@
   font-size: 13px;
 }
 .openerp .ui-widget-content a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .ui-menu .ui-menu-item {
   margin: 0 8px 0 0;
@@ -336,7 +336,7 @@
   border-radius: 0 0 2px 2px;
 }
 .openerp.ui-dialog .oe_about a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp.ui-dialog .oe_about a:hover {
   text-decoration: underline;
@@ -547,7 +547,7 @@
   -moz-box-shadow: none;
   -webkit-box-shadow: none;
   box-shadow: none;
-  color: #8a89ba;
+  color: #7c7bad;
   font-weight: bold;
 }
 .openerp .oe_button.oe_link span:hover {
@@ -578,7 +578,7 @@
   color: #4c4c4c;
 }
 .openerp .oe_tag_dark {
-  background: #8786b7;
+  background: #7c7bad;
   color: #eeeeee;
 }
 .openerp .oe_tags.oe_inline {
@@ -1180,7 +1180,7 @@
 .openerp .oe_secondary_menu_section {
   font-weight: bold;
   margin-left: 8px;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu {
   padding: 2px 0 8px 0;
@@ -1202,7 +1202,7 @@
   top: 1px;
   right: 1px;
   font-size: 10px;
-  background: #8a89ba;
+  background: #7c7bad;
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
@@ -1222,7 +1222,7 @@
   padding: 1px 4px;
 }
 .openerp .oe_secondary_submenu .oe_active {
-  background: #8a89ba;
+  background: #7c7bad;
   border-top: 1px solid lightGray;
   border-bottom: 1px solid lightGray;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1235,7 +1235,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_label {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
   text-shadow: 0 1px 1px white;
   -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
@@ -1243,7 +1243,7 @@
 }
 .openerp .oe_secondary_submenu .oe_active .oe_menu_counter {
   background: #eeeeee;
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_secondary_submenu .oe_menu_toggler:before {
   width: 0;
@@ -1273,7 +1273,7 @@
   width: 100%;
 }
 .openerp .oe_application a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_application a:hover {
   text-decoration: underline;
@@ -1314,7 +1314,7 @@
   float: left;
 }
 .openerp .oe_view_manager table.oe_view_manager_header h2 a {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp .oe_view_manager table.oe_view_manager_header .oe_button_group {
   display: inline-block;
@@ -1673,7 +1673,7 @@
 }
 .openerp .oe_searchview .oe_searchview_drawer h3 {
   margin: 8px 4px 4px 12px;
-  color: #8786b7;
+  color: #7c7bad;
   font-size: 13px;
 }
 .openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * {
@@ -1955,7 +1955,7 @@
   padding: 16px 0 48px;
 }
 .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator {
-  margin: 25px 0 10px 0;
+  margin: 12px 0 8px 0;
 }
 .openerp .oe_form div.oe_form_configuration p {
   color: #aaaaaa;
@@ -1964,6 +1964,12 @@
 .openerp .oe_form div.oe_form_configuration label {
   min-width: 150px;
 }
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell_label {
+  padding: 2px 0;
+}
+.openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div {
+  padding: 1px 0;
+}
 .openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable {
   display: inline-block;
   padding-right: 18px;
@@ -2074,7 +2080,7 @@
   background-image: linear-gradient(to bottom, #e8e8e8, #cacaca);
 }
 .openerp ul.oe_form_steps_clickable li .label {
-  color: #8a89ba;
+  color: #7c7bad;
 }
 .openerp ul.oe_form_steps_clickable li.oe_active:hover {
   background-color: #4c85c2;
@@ -2155,7 +2161,7 @@
 .openerp .oe_form td.oe_form_group_cell_label label {
   line-height: 18px;
   display: block;
-  min-width: 120px;
+  min-width: 160px;
 }
 .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell {
   padding-left: 6px;
@@ -2187,7 +2193,7 @@
   font-weight: bold;
   font-size: 20px;
   margin: 8px 0px 8px 0px;
-  color: #53637e;
+  color: #7c7bad;
 }
 .openerp .oe_horizontal_separator:empty {
   height: 5px;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 6472f7aaacd..3463a25ad79 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1522,12 +1522,16 @@ $sheet-max-width: 860px
             padding: 16px 0 48px
         div.oe_form_configuration
             div.oe_horizontal_separator 
-                margin: 25px 0 10px 0
+                margin: 12px 0 8px 0
             p
                 color: #aaa
                 max-width: 650px
             label
                 min-width: 150px
+            .oe_form_group_cell_label
+                padding: 2px 0
+            .oe_form_group_cell div div
+                padding: 1px 0
                 
 
     ul.oe_form_steps, ul.oe_form_steps_clickable
@@ -1650,7 +1654,7 @@ $sheet-max-width: 860px
             label
                 line-height: 18px
                 display: block
-                min-width: 120px
+                min-width: 160px
         td.oe_form_group_cell + .oe_form_group_cell
             padding-left: 6px
         .oe_form_group
@@ -1680,7 +1684,7 @@ $sheet-max-width: 860px
         font-weight: bold
         font-size: 20px
         margin: 8px 0px 8px 0px
-        color: #53637e
+        color: $section-title-color
     .oe_horizontal_separator:empty
         height: 5px
     .oe_vertical_separator

From fff594348ae8ada571b4e9e7e6a0e16b5c306037 Mon Sep 17 00:00:00 2001
From: Minh Tran <mit@openerp.com>
Date: Fri, 17 Aug 2012 17:55:51 +0200
Subject: [PATCH 2/2] fixed the 'more' dropdown menu

bzr revid: mit@openerp.com-20120817155551-4eq9lumqderd09rl
---
 addons/web/static/src/css/base.css  | 16 ++++---------
 addons/web/static/src/css/base.sass | 35 +++++++++++++----------------
 addons/web/static/src/js/chrome.js  |  1 +
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 81e179c8de9..c15a37b26f5 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1032,14 +1032,6 @@
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_topbar .oe_topbar_item .oe_active {
-  background: #303030;
-  font-weight: bold;
-  color: white;
-  -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-  box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
-}
 .openerp .oe_topbar .oe_topbar_avatar {
   width: 24px;
   height: 24px;
@@ -1150,10 +1142,10 @@
   padding: 0;
   margin: 0;
 }
-.openerp .oe_menu li {
+.openerp .oe_menu > li {
   float: left;
 }
-.openerp .oe_menu a {
+.openerp .oe_menu > li > a {
   display: block;
   padding: 5px 10px 7px;
   line-height: 20px;
@@ -1162,14 +1154,14 @@
   vertical-align: top;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
 }
-.openerp .oe_menu a:hover {
+.openerp .oe_menu > li > a:hover {
   background: #303030;
   color: white;
   -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
   box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset;
 }
-.openerp .oe_menu .oe_active {
+.openerp .oe_menu > li > .oe_active {
   background: #303030;
   font-weight: bold;
   color: white;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3463a25ad79..db56bdbacfa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -810,11 +810,6 @@ $sheet-max-width: 860px
                 background: #303030
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-            .oe_active
-                background: #303030
-                font-weight: bold
-                color: white
-                @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
 
         .oe_topbar_avatar
             width: 24px
@@ -902,25 +897,25 @@ $sheet-max-width: 860px
         float: left
         padding: 0
         margin: 0
-        li
+        > li
             float: left
-        a
-            display: block
-            padding: 5px 10px 7px
-            line-height: 20px
-            height: 20px
-            color: #eee
-            vertical-align: top
-            text-shadow: 0 1px 1px rgba(0,0,0,0.2)
-            &:hover
+            > a
+                display: block
+                padding: 5px 10px 7px
+                line-height: 20px
+                height: 20px
+                color: #eee
+                vertical-align: top
+                text-shadow: 0 1px 1px rgba(0,0,0,0.2)
+                &:hover
+                    background: #303030
+                    color: white
+                    @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
+            > .oe_active
                 background: #303030
+                font-weight: bold
                 color: white
                 @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
-        .oe_active
-            background: #303030
-            font-weight: bold
-            color: white
-            @include box-shadow(0 1px 2px rgba(255,255,255,0.3) inset)
     .oe_secondary_menu_section
         font-weight: bold
         margin-left: 8px
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index ff066c9f425..e28aa97bbf5 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -730,6 +730,7 @@ instance.web.Menu =  instance.web.Widget.extend({
             var $more = $(QWeb.render('Menu.more')),
                 $index = this.$element.find('li').eq(maximum_visible_links - 1);
             $index.after($more);
+            //$('.oe_topbar').append($more);
             $more.find('.oe_menu_more').append($index.next().nextAll());
         }
     },