[MERGE] trunk

bzr revid: fme@openerp.com-20121219090128-m5z0l5rlee8mu6hj

2 files changed, 63 insertions, 3 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 2665ee263a9..7e8242a8d5c 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -819,6 +819,16 @@
   margin-top: 1px;
   background-color: #f6cf3b;
 }
+.openerp .oe_dialog_warning {
+  width: 100%;
+}
+.openerp .oe_dialog_warning p {
+  text-align: center;
+}
+.openerp .oe_dialog_icon {
+  padding: 5px;
+  width: 32px;
+}
 .openerp .oe_login {
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=);
   text-align: center;
@@ -1182,6 +1192,7 @@
   padding-bottom: 16px;
 }
 .openerp a.oe_logo {
+  position: relative;
   width: 220px;
   display: block;
   text-align: center;
@@ -1190,6 +1201,24 @@
   margin: 14px 0;
   border: 0;
 }
+.openerp a.oe_logo .oe_logo_edit {
+  margin: 14px 0;
+  position: absolute;
+  top: 1px;
+  padding: 4px;
+  width: 100%;
+  display: none;
+  text-align: center;
+  color: #eeeeee;
+  background: rgba(37, 37, 37, 0.9);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  -ms-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.openerp a.oe_logo:hover .oe_logo_edit_admin {
+  display: block;
+}
 .openerp .oe_footer {
   position: fixed;
   bottom: 0;
@@ -1236,7 +1265,7 @@
   color: white;
   padding: 2px 4px;
   margin: 1px 6px 0 0;
-  border: 1px solid lightGray;
+  border: 1px solid lightgrey;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -1261,7 +1290,7 @@
   transform: scale(1.1);
 }
 .openerp .oe_secondary_submenu .oe_active {
-  border-top: 1px solid lightGray;
+  border-top: 1px solid lightgrey;
   border-bottom: 1px solid #dedede;
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.2), inset 0 -1px 3px rgba(40, 40, 40, 0.2);
@@ -2210,7 +2239,7 @@
 }
 .openerp .oe_form .oe_form_label_help[for] span, .openerp .oe_form .oe_form_label[for] span {
   font-size: 80%;
-  color: darkGreen;
+  color: darkgreen;
   vertical-align: top;
   position: relative;
   top: -4px;
@@ -3201,3 +3230,7 @@ div.ui-widget-overlay {
     overflow: hidden !important;
   }
 }
+.blockUI.blockOverlay {
+  background-color: black;
+  opacity: 0.6;
+}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index a8445f0ff06..0369f5fd4b5 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -696,6 +696,15 @@ $sheet-padding: 16px
             margin-top: 1px
             background-color: #f6cf3b
     // }}}
+    // CrashManager {{{
+    .oe_dialog_warning
+        width: 100%
+        p
+            text-align: center
+    .oe_dialog_icon
+        padding: 5px
+        width: 32px
+    // }}}
     // Login {{{
     .oe_login
         background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=)
@@ -958,12 +967,26 @@ $sheet-padding: 16px
         text-shadow: 0 1px 1px white
         padding-bottom: 16px
     a.oe_logo
+        position: relative
         width: 220px
         display: block
         text-align: center
         img
             margin: 14px 0
             border: 0
+        .oe_logo_edit
+            margin: 14px 0
+            position: absolute
+            top: 1px
+            padding: 4px
+            width: 100%
+            display: none
+            text-align: center
+            color: #eee
+            background: rgba(37,37,37,0.9)
+            @include box-sizing(border)
+        &:hover .oe_logo_edit_admin
+            display: block
     .oe_footer
         position: fixed
         bottom: 0
@@ -2536,5 +2559,9 @@ div.ui-widget-overlay
             overflow: hidden !important
 // }}}
 
+.blockUI.blockOverlay
+    background-color: black
+    opacity: 0.6000000238418579
+
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
 // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: