From eaa3da915b5c3b22ddaaa2f4e29b1854e748e2f1 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Thu, 8 Nov 2012 15:50:01 +0100 Subject: [FIX] improve warning dialog css bzr revid: chs@openerp.com-20121108145001-pswe7r5ss4nzgu00 --- addons/web/static/src/css/base.css | 10 ++++++++++ addons/web/static/src/css/base.sass | 9 +++++++++ 2 files changed, 19 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 94d02758ad0..b34e699b541 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -802,6 +802,16 @@ .openerp .oe_notification { z-index: 1050; } +.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; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f911929e159..368df7f047c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -680,6 +680,15 @@ $sheet-padding: 16px .oe_notification z-index: 1050 // }}} + // 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=) -- cgit v1.2.3 From fcf4d4040fbcae0fd5ddf3fccd0951c58fb8df66 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 18 Dec 2012 12:17:34 +0100 Subject: [ADD] Allow admin to edit the company logo bzr revid: fme@openerp.com-20121218111734-wu02xaifqyqz1g20 --- addons/web/static/src/css/base.css | 19 +++++++++++++++++++ addons/web/static/src/css/base.sass | 14 ++++++++++++++ 2 files changed, 33 insertions(+) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index c76403a1443..39bb5d8c5d9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1182,6 +1182,7 @@ padding-bottom: 16px; } .openerp a.oe_logo { + position: relative; width: 220px; display: block; text-align: center; @@ -1190,6 +1191,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; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index bf0ff4cece4..eab40a5b5bd 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -958,12 +958,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 -- cgit v1.2.3 From ac0045d3c36cc91306ff85e500e3abc61a9cf14e Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 19 Dec 2012 11:40:25 +0100 Subject: [DOC] Document full.css bzr revid: fme@openerp.com-20121219104025-bg4o1v6y90csxjjd --- addons/web/static/src/css/full.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/full.css b/addons/web/static/src/css/full.css index 7f3a2f60ea4..2692792d46d 100644 --- a/addons/web/static/src/css/full.css +++ b/addons/web/static/src/css/full.css @@ -1,6 +1,12 @@ +/* This css contains the styling specific to the 'normal mode'. (as opposite to the embedded mode) */ +/* In embedded mode [1], this stylesheet won't be loaded. */ + +/* [1] The web client features an embedded mode in which the webclient */ +/* or a part of it can be started in any element of any webpage host. */ + body { padding: 0; margin: 0; overflow-y: scroll; height: 100%; -} \ No newline at end of file +} -- cgit v1.2.3