From ab36bdc3373e15cbe9c4ccbd6b0a7aa65f19b334 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Wed, 13 Jun 2012 18:54:14 +0200 Subject: [PATCH] Improvements to left menu and form view bzr revid: mit@openerp.com-20120613165414-cqc3d703opbytldv --- addons/web/static/src/css/base.css | 46 +++++++++++++++++++++-------- addons/web/static/src/css/base.sass | 38 ++++++++++++++++-------- addons/web/static/src/xml/base.xml | 2 +- 3 files changed, 61 insertions(+), 25 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6311879a8ed..3b0d21ae934 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -545,7 +545,6 @@ border-right: 1px solid #afafb6; text-shadow: 0 1px 1px white; padding-bottom: 16px; - line-height: 18px; } .openerp a.oe_logo { width: 220px; @@ -801,9 +800,9 @@ float: right; background: #8a89ba; color: #eeeeee; - font-size: 12px; + font-size: 10px; border: 1px solid lightgray; - padding: 0px 4px 0px 4px; + padding: 2px 4px; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); margin: 0px; -moz-border-radius: 4px; @@ -1618,7 +1617,6 @@ margin: 0 auto; } .openerp .oe_application .oe_form_sheet { - padding: 18px; background: white; min-height: 330px; border: 1px solid #afafb6; @@ -1626,6 +1624,10 @@ -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); } +.openerp .oe_application .oe_form_sheet > .oe_form_group { + margin: 8px 16px; + width: 97%; +} .openerp .oe_form_invisible { display: none !important; } @@ -1845,7 +1847,15 @@ overflow: hidden; } .openerp .oe_form .oe_form_title { - width: 55%; + margin: 16px; + float: left; +} +.openerp .oe_form .oe_form_title h1 { + font-size: 22px; +} +.openerp .oe_form .oe_form_title h2 { + font-size: 14px; + font-weight: normal; } .openerp .oe_form .oe_form_title:after { content: "."; @@ -1855,11 +1865,12 @@ visibility: hidden; } .openerp .oe_form .oe_form_button_box { - width: 200px; - text-align: center; + width: 400px; + margin: 16px; } -.openerp .oe_form .oe_form_group { - margin: 5px 0px 5px 0px; +.openerp .oe_form .oe_form_button_box button { + margin-left: 4px; + float: right; } .openerp .oe_form .oe_form_group_cell .oe_kanban_view { position: static; @@ -1903,9 +1914,6 @@ width: auto; vertical-align: top; } -.openerp .oe_form .oe_form_field_image > img { - min-width: 100px; -} .openerp .oe_form .oe_form_field_image .oe_form_field_image_controls { position: absolute; top: 1px; @@ -2040,6 +2048,20 @@ height: auto; line-height: 16px; } +.openerp .oe_form .oe_form_avatar { + float: left; + margin: 16px 0 16px 16px; +} +.openerp .oe_form .oe_form_avatar img { + height: 50px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); + border: none; +} .openerp .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager { display: none !important; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index df3c82f499a..1ddb86ec3de 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -460,7 +460,6 @@ $colour4: #8a89ba border-right: 1px solid #afafb6 text-shadow: 0 1px 1px white padding-bottom: 16px - line-height: 18px a.oe_logo width: 220px display: block @@ -652,9 +651,9 @@ $colour4: #8a89ba float: right background: #8a89ba color: #eee - font-size: 12px + font-size: 10px border: 1px solid lightgray - padding: 0px 4px 0px 4px + padding: 2px 4px text-shadow: 0 1px 1px rgba(0,0,0,0.2) margin: 0px @include radius(4px) @@ -1274,11 +1273,14 @@ $colour4: #8a89ba max-width: 960px margin: 0 auto .oe_form_sheet - padding: 18px background: white min-height: 330px border: 1px solid #afafb6 @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + > .oe_form_group + margin: 8px 16px + width: 97% + // }}} // FormView.layout {{{ .oe_form_invisible @@ -1467,7 +1469,13 @@ $colour4: #8a89ba overflow: hidden .oe_form_title - width: 55% + margin: 16px + float: left + h1 + font-size: 22px + h2 + font-size: 14px + font-weight: normal .oe_form_title:after content: "." display: block @@ -1475,11 +1483,11 @@ $colour4: #8a89ba clear: both visibility: hidden .oe_form_button_box - width: 200px - text-align: center - - .oe_form_group - margin: 5px 0px 5px 0px + width: 400px + margin: 16px + button + margin-left: 4px + float: right .oe_form_group_cell .oe_kanban_view // Hack due to absolute positioning of kanban view messing with o2m @@ -1529,8 +1537,6 @@ $colour4: #8a89ba margin: 0 padding: 0 .oe_form_field_image - > img - min-width: 100px padding: 0 position: relative display: inline-block @@ -1647,6 +1653,14 @@ $colour4: #8a89ba li height: auto line-height: 16px + .oe_form_avatar + float: left + margin: 16px 0 16px 16px + img + height: 50px + @include radius(3px) + @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.2)) + border: none .oe-select-create-popup-view-form > .oe_formview > .oe_form_pager display: none !important diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5e3df49b89b..ad024567a59 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -791,7 +791,7 @@ - +