merge from mit-trunk

bzr revid: mit@openerp.com-20120824115821-5fp4ks5ch6czs5vf

2 files changed, 13 insertions, 20 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index e9d1fb1c268..eb641d5887e 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -454,13 +454,6 @@
   -webkit-box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
   box-shadow: 0 0 1px rgba(0, 0, 0, 0.2);
 }
-.openerp ul.oe_flatlist, .openerp ol.oe_flatlist {
-  margin: 0;
-  padding: 0;
-}
-.openerp ul.oe_flatlist li, .openerp ol.oe_flatlist li {
-  list-style-type: none;
-}
 .openerp .oe_form_dirty .oe_highlight_on_dirty {
   color: white;
   background: #dc5f59;
@@ -1246,6 +1239,13 @@
   margin: 0px;
   padding: 1px 4px;
 }
+.openerp .oe_secondary_submenu .oe_menu_counter:hover {
+  cursor: pointer;
+  border: 1px solid #c81010;
+  -moz-box-shadow: 0 0 2px #c81010;
+  -webkit-box-shadow: 0 0 2px #c81010;
+  box-shadow: 0 0 2px #c81010;
+}
 .openerp .oe_secondary_submenu .oe_active {
   background: #7c7bad;
   border-top: 1px solid lightGray;
@@ -2817,6 +2817,7 @@ div.ui-widget-overlay {
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
   margin-top: 4px;
+  border: 1px solid #afafb6;
 }
 .ui-menu .ui-menu-item {
   width: 100%;
@@ -2842,7 +2843,3 @@ div.ui-widget-overlay {
   -webkit-border-radius: 3px;
   border-radius: 3px;
 }
-
-.ui-widget-content {
-  border: 1px solid #afafb6;
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 60b59a61a46..aa75956f0a1 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -398,12 +398,6 @@ $sheet-max-width: 860px
         //@include vertical-gradient(lighten(#dc5f59, 3%), lighten(#b33630, 3%))
         @include box-shadow(0 0 1px rgba(0, 0, 0, 0.2))
 
-    ul.oe_flatlist, ol.oe_flatlist
-        margin: 0
-        padding: 0
-        li
-            list-style-type: none
-
     .oe_form_dirty
         .oe_highlight_on_dirty
             color: white
@@ -963,6 +957,10 @@ $sheet-max-width: 860px
             text-shadow: 0 1px 1px rgba(0,0,0,0.2)
             margin: 0px
             padding: 1px 4px
+            &:hover
+                cursor: pointer
+                border: 1px solid #C81010
+                @include box-shadow(0 0 2px #C81010)
         .oe_active
             background: $link-color
             border-top: 1px solid lightGray
@@ -2179,6 +2177,7 @@ div.ui-widget-overlay
     padding: 2px 0
     @include box-shadow(0 1px 4px rgba(0,0,0,0.3))
     margin-top: 4px
+    border: 1px solid $tag-border
     .ui-menu-item
         width: 100%
         padding: 0
@@ -2196,8 +2195,5 @@ div.ui-widget-overlay
 .ui-corner-all
     @include radius(3px)
 
-.ui-widget-content
-    border: 1px solid $tag-border
-
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: