From bcb7103e516dcbd6ec45863f9aad68d7691bf2ca Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 29 Jul 2013 19:04:05 +0200 Subject: [PATCH] [FIX] module views: fix css for html description bzr revid: chs@openerp.com-20130729170405-twhk9uo29t90ktmv --- openerp/addons/base/module/module_view.xml | 2 +- .../base/static/src/css/description.css | 40 +++++++++---------- .../base/static/src/css/description.sass | 24 +++++------ 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/openerp/addons/base/module/module_view.xml b/openerp/addons/base/module/module_view.xml index 462d03a1c01..8dac5b2dc27 100644 --- a/openerp/addons/base/module/module_view.xml +++ b/openerp/addons/base/module/module_view.xml @@ -128,8 +128,8 @@ - + diff --git a/openerp/addons/base/static/src/css/description.css b/openerp/addons/base/static/src/css/description.css index 79d2e9e5f5e..33e631bb46e 100644 --- a/openerp/addons/base/static/src/css/description.css +++ b/openerp/addons/base/static/src/css/description.css @@ -1,47 +1,50 @@ @charset "utf-8"; /* - * This CSS contains the website layout framework - * which is common to both the website and the - * OpenERP application. + * This CSS is for the html description of modules + * TODO clean */ /* --------------------------------- * * STYLING CONTEXT * * --------------------------------- */ /* --- Styling for the V8/Lato/White/Purple design --- */ -body.oe_styling_v8 { - background: #e9e9e9; - padding: 0; - margin: 0; +.openerp .oe_form_sheet_width { + max-width: 960px; } -.oe_styling_v8 { +.openerp .oe_form .oe_styling_v8 { + width: 100%; + padding: 0; + margin: 0; font-family: "Open Sans", "Helvetica", Sans; font-weight: 300; color: #646464; background: white; font-size: 16px; } -.oe_styling_v8 .oe_website_contents { +.openerp .oe_form .oe_styling_v8 .oe_websiteonly { + display: none; +} +.openerp .oe_form .oe_styling_v8 .oe_website_contents { background: whitesmoke; padding-bottom: 1px; } -.oe_styling_v8 b { +.openerp .oe_form .oe_styling_v8 b { font-weight: 600; } -.oe_styling_v8 a { +.openerp .oe_form .oe_styling_v8 a { color: #6d57e0; text-decoration: none; } -.oe_styling_v8 a:visited { +.openerp .oe_form .oe_styling_v8 a:visited { color: #5b284f; } -.oe_styling_v8 a:hover { +.openerp .oe_form .oe_styling_v8 a:hover { color: #0096eb; } -.oe_styling_v8 .oe_title_font { +.openerp .oe_form .oe_styling_v8 .oe_title_font { font-family: "Lato", "Open Sans", "Helvetica", Sans; } -.oe_styling_v8 .oe_page { +.openerp .oe_form .oe_styling_v8 .oe_page { background: white; overflow: hidden; -webkit-border-radius: 1px; @@ -53,10 +56,10 @@ body.oe_styling_v8 { -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.35); } -.oe_styling_v8 .oe_emph { +.openerp .oe_form .oe_styling_v8 .oe_emph { font-weight: 400; } -.oe_styling_v8 .oe_dark { +.openerp .oe_form .oe_styling_v8 .oe_dark { overflow: hidden; background: #fcfcfc; -webkit-box-shadow: 0px 5px 9px -7px rgba(0, 0, 255, 0.5) inset, 0px -3px 9px -7px rgba(0, 0, 255, 0.5) inset; @@ -518,9 +521,6 @@ body.oe_styling_v8 { .oe_styling_v8 h5.oe_slogan { font-weight: 300; } -.oe_styling_v8 h2.oe_slogan + h3.oe_slogan { - margin-top: -28px; -} /* ------ QUOTES ----- */ .oe_quote { diff --git a/openerp/addons/base/static/src/css/description.sass b/openerp/addons/base/static/src/css/description.sass index 11b1410d9bd..3bb218a84aa 100644 --- a/openerp/addons/base/static/src/css/description.sass +++ b/openerp/addons/base/static/src/css/description.sass @@ -3,9 +3,8 @@ @import "compass/css3/user-interface" /** - * This CSS contains the website layout framework - * which is common to both the website and the - * OpenERP application. + * This CSS is for the html description of modules + * TODO clean */ /* --------------------------------- * @@ -14,7 +13,6 @@ /* --- Styling for the V8/Lato/White/Purple design --- */ -$v8_footer_color: #e9e9e9 $v8_title_font_color: rgb(51,51,51) $v8_text_font_color: rgb(100,100,100) $v8_font_paragraph_color: rgb(51,51,51) @@ -25,18 +23,23 @@ $v8_title_font_family: 'Lato','Open Sans','Helvetica',Sans $v8_anchor_color: #6D57E0 $v8_anchor_visited_color: rgb(91, 40, 79) -body.oe_styling_v8 - background: $v8_footer_color + +.openerp .oe_form_sheet_width + max-width: 960px + +.openerp .oe_form .oe_styling_v8 + width: 100% padding: 0 margin: 0 - -.oe_styling_v8 font-family: $v8_text_font_family font-weight: 300 color: $v8_text_font_color background: $v8_bg_color font-size: 16px + .oe_websiteonly + display: none + .oe_website_contents background: $v8_body_color padding-bottom: 1px @@ -80,8 +83,6 @@ body.oe_styling_v8 max-width: 992px -.oe_container - .oe_row width: 928px margin-top: 16px @@ -394,9 +395,6 @@ $oe_span2_width: 154px font-weight: 300 //TODO - h2.oe_slogan+h3.oe_slogan - margin-top: -28px - /* ------ QUOTES ----- */ .oe_quote