3 files changed, 5 insertions, 120 deletions

diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index c9774bcfa73..c038b396554 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -62,6 +62,9 @@
   -webkit-border-radius: 4px;
   border-radius: 4px;
 }
+.openerp2 .oe_topbar .oe_topbar_avatar {
+  vertical-align: top;
+}
 .openerp2 .oe_menu {
   float: left;
   padding: 0;
@@ -134,7 +137,6 @@
   right: -1px;
   border: 0;
   z-index: 900;
-  width: 160px;
   margin-left: 0;
   margin-right: 0;
   padding: 6px 0;
@@ -175,10 +177,3 @@
   -webkit-box-shadow: none;
   -box-shadow: none;
 }
-
-.openerp .oe-shortcuts {
-  position: static;
-}
-.openerp #oe_header {
-  clear: both;
-}
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index ab144a5ceec..c2a66db333e 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -97,6 +97,8 @@
             height: 24px
             margin: -2px 2px 0 0
             @include radius(4px)
+        .oe_topbar_avatar
+            vertical-align: top
     // }}}
 
     // Menu {{{
@@ -161,7 +163,6 @@
             right: -1px
             border: 0
             z-index: 900
-            width: 160px
             margin-left: 0
             margin-right: 0
             padding: 6px 0
@@ -191,10 +192,6 @@
 
 .openerp
     // Transitional overrides for old styles {{{
-    .oe-shortcuts
-        position: static
-    #oe_header
-        clear: both
     // }}}
 
 // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers <afile> > "%:p:r.css"
diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css
index 1fac47d128c..9b5bdb2e15b 100644
--- a/addons/web/static/src/css/base_old.css
+++ b/addons/web/static/src/css/base_old.css
@@ -27,9 +27,6 @@
     margin: 2px;
 }
 
-#oe_header h2 {
-    margin: 2px 0;
-}
 
 #oe_errors pre {
     margin: 0;
@@ -566,110 +563,6 @@ label.error {
     content: "\25b8";
 }
 
-/* Header */
-.openerp .header {
-    height: 65px;
-    background: url("/web/static/src/img/header-background.png") repeat-x scroll left top transparent;
-    color: #FFFFFF;
-    letter-spacing: 0.5px;
-    text-shadow: 0 1px 0 #333333;
-}
-.openerp .company_logo_link {
-    display: block;
-    float: left;
-    height: 63px;
-    width: 200px;
-    border: 1px solid white;
-    border-right-color: black;
-    border-bottom-color: black;
-    background: #FFFFFF;
-    background: -moz-linear-gradient(top, #FFFFFF 0%, #CECECE 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#FFFFFF), color-stop(100%,#CECECE));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#CECECE',GradientType=0 );
-}
-.openerp .company_logo {
-    margin-top: 7px;
-    margin-left: 10px;
-    display: block;
-    background: url(/web/static/src/img/logo.png);
-    width:180px;
-    height:46px;
-}
-.openerp .header_title {
-    float: left;
-    font-size: 100%;
-    margin: 0;
-    padding: 4px 10px;
-    text-shadow: 0 1px 0 #111111;
-    font-weight:normal;
-    line-height:14px;
-}
-.openerp .header_title small {
-    color: #ccc;
-    font-size: 90%;
-    font-weight: normal;
-}
-.openerp .header_corner {
-    float: right;
-}
-.openerp .header_corner .block {
-    float: left;
-    height: 34px;
-    line-height: 34px;
-    /*background: url(../images/top-sep-a.png) no-repeat;*/
-    border-left: 1px solid #6a6a6a;
-    background: #828282;
-    background: -moz-linear-gradient(top, #828282 0%, #4D4D4D 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#828282), color-stop(100%,#4D4D4D));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#828282', endColorstr='#4D4D4D',GradientType=0 );
-}
-.openerp .header_corner .block a {
-    display: block;
-    color: white;
-    text-decoration: none;
-    padding: 0 10px;
-}
-.openerp .header_corner .block a:hover {
-    background: #929292;
-    background: -moz-linear-gradient(top, #929292 0%, #4D4D4D 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#929292), color-stop(100%,#4D4D4D));
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#929292', endColorstr='#4D4D4D',GradientType=0 );
-}
-.openerp .header_corner ul.block {
-    list-style: none;
-    height: 34px;
-    margin: 0;
-    padding: 0 0 0 2px;
-    line-height: 33px;
-}
-.openerp .header_corner ul.block li {
-    float: left;
-}
-.openerp .header_corner ul.block li a {
-    padding: 0 5px;
-    position: relative;
-    line-height: 32px;
-}
-.openerp .header_corner ul.block li a img {
-    vertical-align: middle;
-}
-.openerp .header_corner ul.block li a small {
-    position: absolute;
-    right: 0;
-    top: 5px;
-    padding: 1px 4px 2px;
-    background: rgba(0, 0, 0, 0.75);
-    border-radius: 7px;
-    -moz-border-radius: 7px;
-    -webkit-border-radius: 7px;
-    line-height: 1em;
-    font-weight: bold;
-}
-
-.openerp .logout {
-    font-size:80%;
-}
-
 /* Footer */
 .openerp div.oe_footer {
     background: none repeat scroll 0 0 #CCCCCC;