From 9ea00aa0eee8c28a3703d26002e1ea01d42461e4 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 13 Nov 2012 17:41:19 +0100 Subject: [PATCH] [IMP] Bring back nwi changes from previous branch bzr revid: fme@openerp.com-20121113164119-nipg8sqsyxmvae35 --- addons/web/static/src/css/base.css | 16 ++++++++++------ addons/web/static/src/css/base.sass | 15 +++++++++------ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d98e9a43621..4592599bfba 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -462,7 +462,7 @@ visibility: hidden; } .openerp .oe_button_box { - width: 270px; + width: 280px; text-align: right; } .openerp .oe_button_box button { @@ -824,7 +824,7 @@ background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=); text-align: center; font-size: 14px; - height: 100%; + height: 600px; } .openerp .oe_login ul, .openerp .oe_login li { margin: 0; @@ -939,8 +939,8 @@ .openerp .oe_login .oe_login_footer { position: absolute; bottom: -40px; - left: 0; - width: 100%; + left: -134px; + width: 600px; text-align: center; } .openerp .oe_login .oe_login_footer a { @@ -1158,6 +1158,7 @@ height: 40px; width: 157px; margin: 14px 0; + border: none; } .openerp .oe_footer { position: fixed; @@ -1339,12 +1340,14 @@ height: 100%; } .openerp .oe_application .oe_breadcrumb_item:not(:last-child) { - display: inline-block; max-width: 7em; white-space: nowrap; - overflow: hidden; text-overflow: ellipsis; } +.openerp .oe_application .oe_breadcrumb_title > * { + display: inline-block; + overflow: hidden; +} .openerp .oe_view_manager .oe_view_manager_body { height: inherit; } @@ -1352,6 +1355,7 @@ height: inherit; } .openerp .oe_view_manager table.oe_view_manager_header { + border-collapse: separate; width: 100%; table-layout: fixed; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4710396ee8d..19de16884fe 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -423,7 +423,7 @@ $sheet-padding: 16px clear: both visibility: hidden .oe_button_box - width: 270px + width: 280px text-align: right button margin: 4px @@ -691,7 +691,7 @@ $sheet-padding: 16px background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAYAAAAGCAYAAADgzO9IAAAAKUlEQVQIHWO8e/fufwYsgAUkJigoiCIF5DMyoYggcUiXgNnBiGQKmAkARpcEQeriln4AAAAASUVORK5CYII=) text-align: center font-size: 14px - height: 100% + height: 600px ul, li margin: 0 list-style-type: none @@ -766,8 +766,8 @@ $sheet-padding: 16px .oe_login_footer position: absolute bottom: -40px - left: 0 - width: 100% + left: -134px + width: 600px text-align: center a color: #eee @@ -934,6 +934,7 @@ $sheet-padding: 16px height: 40px width: 157px margin: 14px 0 + border: none .oe_footer position: fixed bottom: 0 @@ -1069,11 +1070,12 @@ $sheet-padding: 16px > div height: 100% .oe_breadcrumb_item:not(:last-child) - display: inline-block max-width: 7em white-space: nowrap - overflow: hidden text-overflow: ellipsis + .oe_breadcrumb_title > * + display: inline-block + overflow: hidden // }}} // ViewManager common {{{ .oe_view_manager @@ -1083,6 +1085,7 @@ $sheet-padding: 16px height: inherit table.oe_view_manager_header + border-collapse: separate width: 100% table-layout: fixed .oe_header_row