From a8943b416a892c4da76aa0887886622e525db8b8 Mon Sep 17 00:00:00 2001 From: "Mohammed Shekha (OpenERP)" Date: Thu, 13 Feb 2014 17:25:56 +0530 Subject: [PATCH] [FIX]Web, Statusbar: Fixed the issue of statubar in chrome is aligned, it is aligned in inline block. bzr revid: msh@openerp.com-20140213115556-irdodahpw0atgy5u --- addons/web/static/src/css/base.css | 11 ++++++----- addons/web/static/src/css/base.sass | 1 + addons/web/static/src/js/view_form.js | 3 --- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 894a410041d..c07c53889d4 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"); @@ -1029,7 +1029,7 @@ background-image: -moz-linear-gradient(top, #fc8787, maroon); background-image: -ms-linear-gradient(top, #fc8787, maroon); background-image: -o-linear-gradient(top, #fc8787, maroon); - background-image: linear-gradient(to bottom, #fc8787, #800000); + background-image: linear-gradient(to bottom, #fc8787, maroon); } .openerp .oe_topbar .oe_topbar_anonymous_login a { display: block; @@ -1275,7 +1275,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; @@ -1307,7 +1307,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); @@ -2163,6 +2163,7 @@ } .openerp .oe_form header { position: relative; + overflow: hidden; border-bottom: 1px solid #cacaca; padding-left: 2px; background-color: #ededed; @@ -2288,7 +2289,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; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e19becc8624..1c02018da9d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1711,6 +1711,7 @@ $sheet-padding: 16px // FormView.header {{{ .oe_form header position: relative + overflow: hidden border-bottom: 1px solid #cacaca padding-left: 2px @include vertical-gradient(#fcfcfc, #dedede) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index feee1d8da4d..c996a57ded7 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5389,9 +5389,6 @@ instance.web.form.FieldStatus = instance.web.form.AbstractField.extend({ if (this.options.clickable) { this.$el.on('click','li',this.on_click_stage); } - if (this.$el.parent().is('header')) { - this.$el.after('
'); - } this._super(); }, set_value: function(value_) {