From d4ec427f0168d57777b61fec4c941ea874ffcc02 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 22 Mar 2012 21:46:34 +0100 Subject: [PATCH] [FIX] Fixed css bzr revid: fme@openerp.com-20120322204634-8o3o81oton9a4fqj --- addons/web/static/src/css/base.css | 672 +++++++++++++------------ addons/web/static/src/css/base.sass | 17 - addons/web/static/src/css/base_old.css | 166 +++--- addons/web/static/src/xml/base.xml | 9 +- 4 files changed, 448 insertions(+), 416 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b17ed4e4a61..68810389abd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -5,324 +5,362 @@ color: #4c4c4c; font-size: 13px; background: white; - position: relative; } - .openerp2 a { - text-decoration: none; } - .openerp2 .oe_webclient .oe_application { - position: absolute; - top: 33px; - bottom: 0; - left: 222px; - right: 0; } - .openerp2 .oe_webclient .oe_application a { - color: #8a89ba; } - .openerp2 .oe_webclient .oe_application a:hover { - text-decoration: underline; } - .openerp2 .oe_content_full_screen .oe_application { - top: 0; - left: 0; } - .openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar { - display: none; } - .openerp2 .oe_topbar { - width: 100%; - height: 31px; - border-top: solid 1px #d3d3d3; - border-bottom: solid 1px black; - background-color: #646060; - background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); - background-image: -webkit-linear-gradient(top, #646060, #262626); - background-image: -moz-linear-gradient(top, #646060, #262626); - background-image: -ms-linear-gradient(top, #646060, #262626); - background-image: -o-linear-gradient(top, #646060, #262626); - background-image: linear-gradient(to bottom, #646060, #262626); } - .openerp2 .oe_topbar .oe_systray { - float: right; } - .openerp2 .oe_topbar .oe_systray > div { - float: left; - padding: 0 4px 0 4px; } - .openerp2 .oe_topbar .oe_topbar_item li { - float: left; } - .openerp2 .oe_topbar .oe_topbar_item li a { - display: block; - padding: 5px 10px 7px; - line-height: 20px; - height: 20px; - color: #eeeeee; - vertical-align: top; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } - .openerp2 .oe_topbar .oe_topbar_item li a:hover { - background: #303030; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } - .openerp2 .oe_topbar .oe_topbar_item .oe_active { - background: #303030; - font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } - .openerp2 .oe_topbar .oe_topbar_avatar { - width: 24px; - height: 24px; - margin: -2px 2px 0 0; - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; } - .openerp2 .oe_topbar .oe_topbar_avatar { - vertical-align: top; } - .openerp2 .oe_leftbarbg { - position: fixed; - width: 220px; - top: 0; - left: 0; - height: 100%; - background: #f0eeee; - border-right: 1px solid #afafb6; - z-index: -1; } - .openerp2 .oe_leftbar { - float: left; - width: 221px; - text-shadow: 0 1px 1px white; } - .openerp2 a.oe_logo { - display: block; - text-align: center; - height: 70px; - line-height: 70px; } - .openerp2 a.oe_logo img { - height: 40px; - width: 157px; - margin: 14px 0; } - .openerp2 .oe_footer { - position: fixed; - bottom: 0; - padding: 4px 0; - background: #f0eeee; - width: 220px; - text-align: center; } - .openerp2 .oe_footer a { - font-weight: 800; - font-family: serif; - font-size: 16px; - color: black; } - .openerp2 .oe_footer a span { - color: #c81010; - font-style: italic; } - .openerp2 .oe_menu { - float: left; - padding: 0; - margin: 0; } - .openerp2 .oe_menu li { - list-style-type: none; - float: left; } - .openerp2 .oe_menu a { - display: block; - padding: 5px 10px 7px; - line-height: 20px; - height: 20px; - color: #eeeeee; - vertical-align: top; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } - .openerp2 .oe_menu a:hover { - background: #303030; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } - .openerp2 .oe_menu .oe_active { - background: #303030; - font-weight: bold; - color: white; - -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; - -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; } - .openerp2 .oe_secondary_menu_section { - font-weight: bold; - margin-left: 8px; - color: #8a89ba; } - .openerp2 .oe_secondary_submenu { - padding: 2px 0 8px 0; - margin: 0; - width: 100%; - display: inline-block; } - .openerp2 .oe_secondary_submenu li { - position: relative; - padding: 1px 0 1px 16px; - list-style-type: none; } - .openerp2 .oe_secondary_submenu li a { - display: block; - color: #4c4c4c; - padding: 2px 4px 2px 0; } - .openerp2 .oe_secondary_submenu li .oe_menu_label { - position: absolute; - top: 1px; - right: 1px; - font-size: 10px; - background: #8a89ba; - color: white; - padding: 2px 4px; - margin: 1px 6px 0 0; - border: 1px solid lightGray; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-border-radius: 4px; - -webkit-border-radius: 4px; - border-radius: 4px; - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } - .openerp2 .oe_secondary_submenu .oe_active { - background: #8a89ba; - border-top: 1px solid lightGray; - border-bottom: 1px solid lightGray; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); } - .openerp2 .oe_secondary_submenu .oe_active a { - color: white; } - .openerp2 .oe_secondary_submenu .oe_active .oe_menu_label { - background: #eeeeee; - color: #8a89ba; - text-shadow: 0 1px 1px white; - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); - -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); } - .openerp2 .oe_secondary_submenu .oe_menu_toggler:before { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - margin-left: -8px; - margin-top: 4px; - margin-right: 4px; - border-top: 4px solid transparent; - border-bottom: 4px solid transparent; - border-left: 4px solid #4c4c4c; - filter: alpha(opacity=50); - opacity: 0.5; } - .openerp2 .oe_secondary_submenu .oe_menu_opened:before { - margin-top: 6px; - margin-left: -12px; - margin-right: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #4c4c4c; } - .openerp2 .oe_user_menu { - float: right; - padding: 0; - margin: 0; } - .openerp2 .oe_user_menu li { - list-style-type: none; - float: left; } - .openerp2 .oe_user_menu .oe_dropdown { - position: relative; } - .openerp2 .oe_user_menu .oe_dropdown_toggle:after { - width: 0; - height: 0; - display: inline-block; - content: "&darr"; - text-indent: -99999px; - vertical-align: top; - margin-top: 8px; - margin-left: 4px; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid white; - filter: alpha(opacity=50); - opacity: 0.5; } - .openerp2 .oe_user_menu .oe_dropdown_options { - float: left; - background: #333333; - background: rgba(37, 37, 37, 0.9); - display: none; - position: absolute; - top: 32px; - right: -1px; - border: 0; - z-index: 900; - margin-left: 0; - margin-right: 0; - padding: 6px 0; - zoom: 1; - border-color: #999999; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 0 1px 1px; - -moz-border-radius: 0 0 6px 6px; - -webkit-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; } - .openerp2 .oe_user_menu .oe_dropdown_options li { - float: none; - display: block; - background-color: none; } - .openerp2 .oe_user_menu .oe_dropdown_options li a { - display: block; - padding: 4px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #eeeeee; } - .openerp2 .oe_user_menu .oe_dropdown_options li a:hover { - background-color: #292929; - background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); - background-image: -webkit-linear-gradient(top, #292929, #191919); - background-image: -moz-linear-gradient(top, #292929, #191919); - background-image: -ms-linear-gradient(top, #292929, #191919); - background-image: -o-linear-gradient(top, #292929, #191919); - background-image: linear-gradient(to bottom, #292929, #191919); - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; } - .openerp2 .oe_horizontal_separator { - font-weight: bold; - border-bottom: 1px solid #666666; - margin: 3px 4px 3px 1px; - height: 17px; - font-size: 95%; } - .openerp2 .oe_horizontal_separator:empty { - height: 5px; } - .openerp2 .oe_vertical_separator { - border-left: 1px solid #666666; - padding: 0 4px 0 4px; } - .openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] { - white-space: nowrap; } - .openerp2 .oe_form_group_cell .oe_form_button { - width: 100%; - white-space: nowrap; } - .openerp2 .oe_form_group_cell { - position: relative; } - .openerp2 .oe_form_group_cell .oe_field_char, .openerp2 .oe_form_group_cell .oe_form_field_selection select { - width: 99%; } - .openerp2 .oe_form_group_cell .oe_form_field_selection select { - min-width: 90px; } - .openerp2 .oe_layout_debugging .oe_form_group { - border: 1px solid red; } - .openerp2 .oe_layout_debugging .oe_form_group_cell { - border: 1px solid blue; - padding-bottom: 1em; } - .openerp2 .oe_layout_debugging .oe_layout_debug_cell { - position: absolute; - color: white; - bottom: 0; - left: 0; - background: green; } - .openerp2 .oe_layout_debugging .oe_layout_debug_cell { - display: block; } - .openerp2 .oe_layout_debug_cell { - display: none; } + position: relative; +} +.openerp2 a { + text-decoration: none; +} +.openerp2 .oe_webclient .oe_application { + position: absolute; + top: 33px; + bottom: 0; + left: 222px; + right: 0; +} +.openerp2 .oe_webclient .oe_application a { + color: #8a89ba; +} +.openerp2 .oe_webclient .oe_application a:hover { + text-decoration: underline; +} +.openerp2 .oe_content_full_screen .oe_application { + top: 0; + left: 0; +} +.openerp2 .oe_content_full_screen .topbar, .openerp2 .oe_content_full_screen .leftbar { + display: none; +} +.openerp2 .oe_topbar { + width: 100%; + height: 31px; + border-top: solid 1px #d3d3d3; + border-bottom: solid 1px black; + background-color: #646060; + background-image: -webkit-gradient(linear, left top, left bottom, from(#646060), to(#262626)); + background-image: -webkit-linear-gradient(top, #646060, #262626); + background-image: -moz-linear-gradient(top, #646060, #262626); + background-image: -ms-linear-gradient(top, #646060, #262626); + background-image: -o-linear-gradient(top, #646060, #262626); + background-image: linear-gradient(to bottom, #646060, #262626); +} +.openerp2 .oe_topbar .oe_systray { + float: right; +} +.openerp2 .oe_topbar .oe_systray > div { + float: left; + padding: 0 4px 0 4px; +} +.openerp2 .oe_topbar .oe_topbar_item li { + float: left; +} +.openerp2 .oe_topbar .oe_topbar_item li a { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + color: #eeeeee; + vertical-align: top; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp2 .oe_topbar .oe_topbar_item li a:hover { + background: #303030; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp2 .oe_topbar .oe_topbar_item .oe_active { + background: #303030; + font-weight: bold; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp2 .oe_topbar .oe_topbar_avatar { + width: 24px; + height: 24px; + margin: -2px 2px 0 0; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; +} +.openerp2 .oe_topbar .oe_topbar_avatar { + vertical-align: top; +} +.openerp2 .oe_leftbarbg { + position: fixed; + width: 220px; + top: 0; + left: 0; + height: 100%; + background: #f0eeee; + border-right: 1px solid #afafb6; + z-index: -1; +} +.openerp2 .oe_leftbar { + float: left; + width: 221px; + text-shadow: 0 1px 1px white; +} +.openerp2 a.oe_logo { + display: block; + text-align: center; + height: 70px; + line-height: 70px; +} +.openerp2 a.oe_logo img { + height: 40px; + width: 157px; + margin: 14px 0; +} +.openerp2 .oe_footer { + position: fixed; + bottom: 0; + padding: 4px 0; + background: #f0eeee; + width: 220px; + text-align: center; +} +.openerp2 .oe_footer a { + font-weight: 800; + font-family: serif; + font-size: 16px; + color: black; +} +.openerp2 .oe_footer a span { + color: #c81010; + font-style: italic; +} +.openerp2 .oe_menu { + float: left; + padding: 0; + margin: 0; +} +.openerp2 .oe_menu li { + list-style-type: none; + float: left; +} +.openerp2 .oe_menu a { + display: block; + padding: 5px 10px 7px; + line-height: 20px; + height: 20px; + color: #eeeeee; + vertical-align: top; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp2 .oe_menu a:hover { + background: #303030; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp2 .oe_menu .oe_active { + background: #303030; + font-weight: bold; + color: white; + -moz-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; + -box-shadow: 0 1px 2px rgba(255, 255, 255, 0.3) inset; +} +.openerp2 .oe_secondary_menu_section { + font-weight: bold; + margin-left: 8px; + color: #8a89ba; +} +.openerp2 .oe_secondary_submenu { + padding: 2px 0 8px 0; + margin: 0; + width: 100%; + display: inline-block; +} +.openerp2 .oe_secondary_submenu li { + position: relative; + padding: 1px 0 1px 16px; + list-style-type: none; +} +.openerp2 .oe_secondary_submenu li a { + display: block; + color: #4c4c4c; + padding: 2px 4px 2px 0; +} +.openerp2 .oe_secondary_submenu li .oe_menu_label { + position: absolute; + top: 1px; + right: 1px; + font-size: 10px; + background: #8a89ba; + color: white; + padding: 2px 4px; + margin: 1px 6px 0 0; + border: 1px solid lightGray; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp2 .oe_secondary_submenu .oe_active { + background: #8a89ba; + border-top: 1px solid lightGray; + border-bottom: 1px solid lightGray; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); + -box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp2 .oe_secondary_submenu .oe_active a { + color: white; +} +.openerp2 .oe_secondary_submenu .oe_active .oe_menu_label { + background: #eeeeee; + color: #8a89ba; + text-shadow: 0 1px 1px white; + -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); + -box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2); +} +.openerp2 .oe_secondary_submenu .oe_menu_toggler:before { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-left: -8px; + margin-top: 4px; + margin-right: 4px; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + border-left: 4px solid #4c4c4c; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp2 .oe_secondary_submenu .oe_menu_opened:before { + margin-top: 6px; + margin-left: -12px; + margin-right: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid #4c4c4c; +} +.openerp2 .oe_user_menu { + float: right; + padding: 0; + margin: 0; +} +.openerp2 .oe_user_menu li { + list-style-type: none; + float: left; +} +.openerp2 .oe_user_menu .oe_dropdown { + position: relative; +} +.openerp2 .oe_user_menu .oe_dropdown_toggle:after { + width: 0; + height: 0; + display: inline-block; + content: "&darr"; + text-indent: -99999px; + vertical-align: top; + margin-top: 8px; + margin-left: 4px; + border-left: 4px solid transparent; + border-right: 4px solid transparent; + border-top: 4px solid white; + filter: alpha(opacity=50); + opacity: 0.5; +} +.openerp2 .oe_user_menu .oe_dropdown_options { + float: left; + background: #333333; + background: rgba(37, 37, 37, 0.9); + display: none; + position: absolute; + top: 32px; + right: -1px; + border: 0; + z-index: 900; + margin-left: 0; + margin-right: 0; + padding: 6px 0; + zoom: 1; + border-color: #999999; + border-color: rgba(0, 0, 0, 0.2); + border-style: solid; + border-width: 0 1px 1px; + -moz-border-radius: 0 0 6px 6px; + -webkit-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; +} +.openerp2 .oe_user_menu .oe_dropdown_options li { + float: none; + display: block; + background-color: none; +} +.openerp2 .oe_user_menu .oe_dropdown_options li a { + display: block; + padding: 4px 15px; + clear: both; + font-weight: normal; + line-height: 18px; + color: #eeeeee; +} +.openerp2 .oe_user_menu .oe_dropdown_options li a:hover { + background-color: #292929; + background-image: -webkit-gradient(linear, left top, left bottom, from(#292929), to(#191919)); + background-image: -webkit-linear-gradient(top, #292929, #191919); + background-image: -moz-linear-gradient(top, #292929, #191919); + background-image: -ms-linear-gradient(top, #292929, #191919); + background-image: -o-linear-gradient(top, #292929, #191919); + background-image: linear-gradient(to bottom, #292929, #191919); + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; +} +.openerp2 .oe_form_label_help[for], .openerp2 .oe_form_label[for] { + white-space: nowrap; +} +.openerp2 .oe_form_group_cell .oe_form_button { + width: 100%; + white-space: nowrap; +} +.openerp2 .oe_layout_debugging .oe_form_group { + border: 1px solid red; +} +.openerp2 .oe_layout_debugging .oe_form_group_cell { + border: 1px solid blue; + padding-bottom: 1em; +} +.openerp2 .oe_layout_debugging .oe_layout_debug_cell { + position: absolute; + color: white; + bottom: 0; + left: 0; + background: green; +} +.openerp2 .oe_layout_debugging .oe_layout_debug_cell { + display: block; +} +.openerp2 .oe_layout_debug_cell { + display: none; +} -.openerp .oe_form_field_many2one td:first { - position: relative; } +.openerp .oe_form_field_many2one td:first-child { + position: relative; +} .openerp .oe_form_field_many2one span.oe-m2o-drop-down-button { position: absolute; top: 3px; - right: 2px; } + right: 2px; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 5a14bc87dbb..22c987ca0f2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -323,29 +323,12 @@ $colour4: #8a89ba // }}} // FormView Widgets {{{ - .oe_horizontal_separator - font-weight: bold - border-bottom: 1px solid #666 - margin: 3px 4px 3px 1px - height: 17px - font-size: 95% - .oe_horizontal_separator:empty - height: 5px - .oe_vertical_separator - border-left: 1px solid #666 - padding: 0 4px 0 4px .oe_form_label_help[for], .oe_form_label[for] white-space: nowrap .oe_form_group_cell .oe_form_button width: 100% white-space: nowrap - .oe_form_group_cell - position: relative - .oe_field_char, .oe_form_field_selection select - width: 99% - .oe_form_field_selection select - min-width: 90px .oe_layout_debugging .oe_form_group border: 1px solid red diff --git a/addons/web/static/src/css/base_old.css b/addons/web/static/src/css/base_old.css index fe3a6074492..3bf6998dfa6 100644 --- a/addons/web/static/src/css/base_old.css +++ b/addons/web/static/src/css/base_old.css @@ -17,7 +17,7 @@ padding: 0 8px 8px 8px; } -.openerp .oe_form_frame_cell .view-manager-main-content { +.openerp .oe_form_group_cell .view-manager-main-content { padding: 0; } @@ -534,12 +534,12 @@ label.error { padding-bottom:3px; } -.openerp .searchview_group_content .oe_label, .openerp .searchview_group_content .oe_label_help { +.openerp .searchview_group_content .oe_form_label, .openerp .searchview_group_content .oe_form_label_help { font-weight: bold; color: #4c4c4c; } -.openerp .oe-searchview-render-line .oe_label, .openerp .oe-searchview-render-line .oe_label_help { +.openerp .oe-searchview-render-line .oe_form_label, .openerp .oe-searchview-render-line .oe_form_label_help { font-weight: bold; font-size: 80%; white-space: nowrap; @@ -852,10 +852,26 @@ label.error { background: #f9f9f9; } /* Unedit Form */ -.openerp .field_char, -.openerp .field_date, -.openerp .field_float, -.openerp .field_selection, +.openerp .oe_form_group_cell > .oe_form_field_many2one, +.openerp .oe_form_group_cell > .oe_form_field_many2one input, +.openerp .oe_form_group_cell > .oe_form_field_char input, +.openerp .oe_form_group_cell > .oe_form_field_email, +.openerp .oe_form_group_cell > .oe_form_field_email input, +.openerp .oe_form_group_cell > .oe_form_field_url, +.openerp .oe_form_group_cell > .oe_form_field_url input, +.openerp .oe_form_group_cell > .oe_form_field_date input, +.openerp .oe_form_group_cell > .oe_form_field_float input, +.openerp .oe_form_group_cell > .oe_form_field_selection select { + width: 100%; +} + +.openerp .oe_form_field_char input, +.openerp .oe_form_field_email input, +.openerp .oe_form_field_url input, +.openerp .oe_form_field_date input, +.openerp .oe_form_field_float input, +.openerp .oe_form_field_many2one input, +.openerp .oe_form_field_selection select, .openerp a.oe_form_uri { vertical-align: middle; padding-top: 3px; @@ -884,25 +900,21 @@ label.error { -box-shadow: none; font-weight: bold; } -.openerp .oe_form_frame_cell input[type="checkbox"] { +.openerp .oe_form_group_cell input[type="checkbox"] { margin-top: 3px; vertical-align: middle; } -.openerp .oe_form_frame_cell .input[type="text"] { +.openerp .oe_form_group_cell .input[type="text"] { padding-bottom: 1px; } -.openerp table.oe_frame td { +.openerp table.oe_form_group td { color: #4c4c4c; } -.openerp td.oe_form_frame_cell { +.openerp td.oe_form_group_cell { padding: 2px; - position: relative; } -.openerp .oe_frame.oe_forms { - clear: both; -} -.openerp table.oe_frame { +.openerp table.oe_form_group { color: #4c4c4c; } .openerp fieldset.oe_group_box { @@ -916,9 +928,8 @@ label.error { .openerp fieldset.oe_group_box legend { font-weight: bold; } -.openerp td.oe_form_frame_cell { +.openerp td.oe_form_group_cell { padding: 2px; - position: relative; } .openerp td.oe_form_field_translatable, .openerp td.oe_form_field_many2one, @@ -929,7 +940,7 @@ label.error { .openerp td.oe_form_field_boolean { padding-top: 4px; } -.openerp td.oe_form_frame_cell.oe_form_group { +.openerp td.oe_form_group_cell.oe_form_group { padding: 0; } .openerp .required.error { @@ -950,27 +961,27 @@ label.error { } -.openerp label.oe_label_help, .openerp label.oe_label, +.openerp label.oe_form_label_help, .openerp label.oe_form_label, .openerp .oe_form_paragraph, .openerp .oe_form_field_statusbar, -.openerp .oe_forms input[type="text"], -.openerp .oe_forms input[type="password"], -.openerp .oe_forms input[type="file"], -.openerp .oe_forms select, -.openerp .oe_forms .oe_button, -.openerp .oe_forms textarea { +.openerp .oe_form input[type="text"], +.openerp .oe_form input[type="password"], +.openerp .oe_form input[type="file"], +.openerp .oe_form select, +.openerp .oe_form .oe_button, +.openerp .oe_form textarea { font-size: 85%; } -.openerp label.oe_label_help, .openerp label.oe_label { +.openerp label.oe_form_label_help, .openerp label.oe_form_label { display: block; color: #4c4c4c; font-weight: normal; } -.openerp label.oe_label_help { +.openerp label.oe_form_label_help { cursor: help; } -.openerp .oe_form_frame_cell .oe_label, .openerp .oe_form_frame_cell .oe_label_help { +.openerp .oe_form_group_cell .oe_form_label, .openerp .oe_form_group_cell .oe_form_label_help { font-weight: normal; } .openerp #tiptip_content { @@ -993,15 +1004,15 @@ label.error { font-weight: bold; } -.openerp .oe_forms label.oe_label, .openerp .oe_forms label.oe_label_help { +.openerp .oe_form label.oe_form_label, .openerp .oe_form label.oe_form_label_help { margin: 3px 0 0 3px; white-space: nowrap; } -.openerp .oe_forms .searchview_group_content label.oe_label, .openerp .searchview_group_content .oe_forms label.oe_label_help { /* making a distinction between labels in search view and other labels */ +.openerp .oe_form .searchview_group_content label.oe_form_label, .openerp .searchview_group_content .oe_form label.oe_form_label_help { /* making a distinction between labels in search view and other labels */ margin: 3px 0 0 3px; } -.openerp label.oe_label_help span { +.openerp label.oe_form_label_help span { font-size: 80%; color: darkgreen; vertical-align:top; @@ -1018,12 +1029,12 @@ label.error { .openerp .oe_align_center { text-align: center; } -.openerp .oe_forms .oe_form_paragraph { +.openerp .oe_form .oe_form_paragraph { margin: 3px 0 0 0; white-space: normal; } -.openerp .oe_forms .oe_form_paragraph.oe_multilines { +.openerp .oe_form .oe_form_paragraph.oe_multilines { white-space: pre; } @@ -1033,13 +1044,13 @@ label.error { margin: 0 0.5em 0 0; } -.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon, -.openerp .oe_forms .oe-listview th.oe-sortable .ui-icon { +.openerp .oe_form .oe-listview th.oe-sortable .ui-icon, +.openerp .oe_form .oe-listview th.oe-sortable .ui-icon { height: 100%; margin-top: -9px; } -.openerp table.oe_frame .oe-listview-content td { +.openerp table.oe_form_group .oe-listview-content td { color: inherit; } @@ -1047,19 +1058,19 @@ label.error { .openerp .oe_form_readonly { } -.openerp .oe_form_readonly .oe_form_frame_cell .field_text, +.openerp .oe_form_readonly .oe_form_group_cell .field_text, .openerp .oe_form_readonly .field_char, .openerp .oe_form_readonly .field_int, .openerp .oe_form_readonly .field_float, .openerp .oe_form_readonly .field_email, .openerp .oe_form_readonly .field_date, .openerp .oe_form_readonly .field_selection, -.openerp .oe_forms_readonly .oe_form_field_many2one { +.openerp .oe_form_readonly .oe_form_field_many2one { padding: 3px 2px 2px 2px; background-color: white; height: 17px; } -.openerp .oe_form_readonly .oe_form_frame_cell .field_text { +.openerp .oe_form_readonly .oe_form_group_cell .field_text { height: auto; } .openerp .oe_form_readonly .field_datetime { @@ -1084,15 +1095,15 @@ label.error { .openerp .oe_form_readonly .oe_form_field_text_html div.field_text_html { white-space: pre-wrap; } -.openerp .oe_form_readonly .oe_form_frame_cell .field_text { +.openerp .oe_form_readonly .oe_form_group_cell .field_text { min-height:100px; } /* Inputs */ -.openerp .oe_forms input[type="text"], -.openerp .oe_forms input[type="password"], -.openerp .oe_forms input[type="file"], -.openerp .oe_forms select, -.openerp .oe_forms textarea { +.openerp .oe_form input[type="text"], +.openerp .oe_form input[type="password"], +.openerp .oe_form input[type="file"], +.openerp .oe_form select, +.openerp .oe_form textarea { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -ms-box-sizing: border-box; @@ -1108,11 +1119,11 @@ label.error { color: #1f1f1f; } -.openerp .oe_forms input.field_many2one, -.openerp .oe_forms input.field_binary, -.openerp .oe_forms input.field_binary, -.openerp .oe_forms input.field_email, -.openerp .oe_forms input.field_url { +.openerp .oe_form .oe_form_field_many2one input, +.openerp .oe_form .oe_form_field_binary input, +.openerp .oe_form .oe_form_field_binary input, +.openerp .oe_form .oe_form_field_email input, +.openerp .oe_form .oe_form_field_url input { border-right: none; -webkit-border-top-right-radius: 0px; -webkit-border-bottom-right-radius: 0px; @@ -1141,33 +1152,33 @@ label.error { margin-top:2px; } -.openerp .oe_forms select{ +.openerp .oe_form select{ padding-top: 2px; } -.openerp .oe_forms input[readonly], -.openerp .oe_forms select[readonly], -.openerp .oe_forms textarea[readonly], -.openerp .oe_forms input[disabled], -.openerp .oe_forms select[disabled], -.openerp .oe_forms textarea[disabled]{ +.openerp .oe_form input[readonly], +.openerp .oe_form select[readonly], +.openerp .oe_form textarea[readonly], +.openerp .oe_form input[disabled], +.openerp .oe_form select[disabled], +.openerp .oe_form textarea[disabled]{ background: #E5E5E5 !important; color: #666; } -.openerp .oe_forms textarea { +.openerp .oe_form textarea { resize:vertical; } -.openerp .oe_forms input[type="text"], -.openerp .oe_forms input[type="password"], -.openerp .oe_forms input[type="file"], -.openerp .oe_forms select, -.openerp .oe_forms .oe_button { +.openerp .oe_form input[type="text"], +.openerp .oe_form input[type="password"], +.openerp .oe_form input[type="file"], +.openerp .oe_form select, +.openerp .oe_form .oe_button { height: 22px; } -.openerp .oe_forms input.field_datetime { +.openerp .oe_form input.oe_form_field_datetime { min-width: 11em; } -.openerp .oe_forms .oe_form_button .oe_button { +.openerp .oe_form .oe_form_button .oe_button { color: #4c4c4c; white-space: nowrap; min-width: 100%; @@ -1175,20 +1186,20 @@ label.error { } @-moz-document url-prefix() { /* Strange firefox behaviour on width: 100% + white-space: nowrap */ - .openerp .oe_forms .oe_form_button .oe_button { + .openerp .oe_form .oe_form_button .oe_button { width: auto; } } /* IE Hack - for IE < 9 * Avoids buttons overflow * */ -.openerp .oe_forms .oe_form_button .oe_button { +.openerp .oe_form .oe_form_button .oe_button { min-width: auto\9; } -.openerp .oe_forms .button { +.openerp .oe_form .button { height: 22px; } -.openerp .oe_forms .oe_button span { +.openerp .oe_form .oe_button span { position: relative; vertical-align: top; } @@ -1203,7 +1214,7 @@ label.error { .openerp .oe_datepicker_root { display: inline-block; } -.openerp .oe_form_frame_cell .oe_datepicker_root { +.openerp .oe_form_group_cell .oe_datepicker_root { width: 100%; } .openerp .oe_input_icon_disabled { @@ -1241,21 +1252,20 @@ label.error { } /* Widgets */ -.openerp .separator { - border: 0 solid #666; -} -.openerp .separator.horizontal { +.openerp .oe_horizontal_separator { font-weight: bold; + border: 0 solid #666; border-bottom-width: 1px; margin: 3px 4px 3px 1px; height: 17px; font-size: 95%; } -.openerp .separator.horizontal:empty { +.openerp .oe_horizontal_separator:empty { height: 5px; } -.openerp .oe_form_frame_cell.oe_form_separator_vertical { +.openerp .oe_vertical_separator { border-left: 1px solid #666; + padding: 0 4px 0 4px; } .openerp td.required input, .openerp td.required select { background-color: #D2D2FF !important; @@ -1318,7 +1328,7 @@ label.error { background: url("/web/static/src/img/sep-a.gif") 0 100% repeat-x; margin:6px 0 6px 2px; } -.openerp .oe_form_frame_cell .oe-view-manager-header { /* Trick: remove the background when element is in a formular */ +.openerp .oe_form_group_cell .oe-view-manager-header { /* Trick: remove the background when element is in a formular */ background: none; } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4ac29e0d116..a6704ad659b 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -958,7 +958,7 @@
@@ -972,7 +972,7 @@
- +