From 38552a9c49eec29136c620ae99ebbc363fd45031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Fri, 3 Aug 2012 10:01:30 +0200 Subject: [IMP] base.css: added image_small and image_medium css. bzr revid: tde@openerp.com-20120803080130-qhs1wokpmjx3ejqa --- addons/web/static/src/css/base.css | 8 ++++++++ addons/web/static/src/css/base.sass | 8 ++++++++ 2 files changed, 16 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 ac04fb4d1e1..02c9db98eb5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2243,6 +2243,14 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } +.openerp .oe_form .oe_form_field_image_small img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_form .oe_form_field_image_medium img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 2698787c5a3..58d24152b0e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1737,6 +1737,14 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block + .oe_form_field_image_small + img + max-width: 50px + max-height: 50px + .oe_form_field_image_medium + img + max-width: 180px + max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one -- cgit v1.2.3 From acc5adf758c561efa20f89395d392646040f57b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Mon, 6 Aug 2012 17:54:18 +0200 Subject: [IMP] Renamed css oe_form_field_image_small and _medium to oe_image_small and _medium. bzr revid: tde@openerp.com-20120806155418-33zkumr6t4ez8k6e --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 14 ++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) (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 22e3fa28357..77393168d7e 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -509,6 +509,14 @@ .openerp .oe_avatar + div { margin-left: 5px; } +.openerp .oe_image_small > img { + max-width: 50px; + max-height: 50px; +} +.openerp .oe_image_medium > img { + max-width: 180px; + max-height: 180px; +} .openerp .oe_button.oe_link { border: none; padding: 0; @@ -2275,14 +2283,6 @@ .openerp .oe_form .oe_form_field_image:hover .oe_form_field_image_controls { display: block; } -.openerp .oe_form .oe_form_field_image_small img { - max-width: 50px; - max-height: 50px; -} -.openerp .oe_form .oe_form_field_image_medium img { - max-width: 180px; - max-height: 180px; -} .openerp .oe_form_field_many2one td:first-child { position: relative; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 482dd490988..a2dde29f094 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -408,6 +408,12 @@ $sheet-max-width: 860px border: none .oe_avatar + div margin-left: 5px + .oe_image_small > img + max-width: 50px + max-height: 50px + .oe_image_medium > img + max-width: 180px + max-height: 180px .oe_button.oe_link @include reset() img @@ -1764,14 +1770,6 @@ $sheet-max-width: 860px @include box-sizing(border) &:hover .oe_form_field_image_controls display: block - .oe_form_field_image_small - img - max-width: 50px - max-height: 50px - .oe_form_field_image_medium - img - max-width: 180px - max-height: 180px // }}} // FormView.many2one {{{ .oe_form_field_many2one -- cgit v1.2.3