[merge] mit

bzr revid: fp@tinyerp.com-20120710101318-72l203bwgba4hkaq

2 files changed, 24 insertions, 8 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 0c4362f4436..1a7e30b5a84 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -386,8 +386,11 @@
   visibility: hidden;
 }
 .openerp .oe_button_box {
-  width: 200px;
-  text-align: center;
+  width: 38%;
+  text-align: right;
+}
+.openerp .oe_button_box button {
+  margin: 4px;
 }
 .openerp .oe_avatar {
   margin: 0 16px 0 0;
@@ -536,7 +539,7 @@
   cursor: pointer;
 }
 .openerp .oe_dropdown_toggle {
-  color: #888888;
+  color: #404040;
   font-weight: normal;
 }
 .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened {
@@ -545,7 +548,8 @@
 .openerp .oe_dropdown_menu {
   display: none;
   position: absolute;
-  top: 32px;
+  top: 26px;
+  left: 0;
   z-index: 1;
   border: 1px solid #afafb6;
   background: white;
@@ -2357,3 +2361,9 @@
 .kitten-mode-activated > * {
   opacity: 0.7;
 }
+
+div.ui-widget-overlay {
+  background: black;
+  filter: alpha(opacity=30);
+  opacity: 0.3;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index fa71942c9da..559125aa3c3 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -330,8 +330,10 @@ $sheet-max-width: 860px
         clear: both
         visibility: hidden
     .oe_button_box
-        width: 200px
-        text-align: center
+        width: 38%
+        text-align: right
+        button
+            margin: 4px
     .oe_avatar
         margin: 0 16px 0 0
         img
@@ -432,14 +434,15 @@ $sheet-max-width: 860px
         position: relative
         cursor: pointer
     .oe_dropdown_toggle
-        color: #888
+        color: #404040
         font-weight: normal
     .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened
         display: block
     .oe_dropdown_menu
         display: none
         position: absolute
-        top: 32px
+        top: 26px
+        left: 0
         z-index: 1
         border: 1px solid #afafb6
         background: white
@@ -1859,5 +1862,8 @@ $sheet-max-width: 860px
         opacity: 0.70
 // }}}
 
+div.ui-widget-overlay
+    background: black
+    @include opacity(0.3)
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: