From 69363d82889fceac121a5ce62a72ee3a94102153 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Tue, 19 Jun 2012 15:53:57 +0200 Subject: [PATCH] fixed tabs flickering and margin bzr revid: mit@openerp.com-20120619135357-5wa1ywcvqh90086j --- addons/web/static/src/css/base.css | 37 ++++++++++---------- addons/web/static/src/css/base.sass | 3 +- addons/web_kanban/static/src/css/kanban.css | 10 +++--- addons/web_kanban/static/src/css/kanban.sass | 7 ++-- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 985eba051d1..23f91aec952 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1,4 +1,4 @@ -@charset "utf-8"; +@charset "UTF-8"; @font-face { font-family: "mnmliconsRegular"; src: url("/web/static/src/font/mnmliconsv21-webfont.eot") format("eot"); @@ -182,9 +182,6 @@ .openerp .ui-menu .ui-menu-item a.ui-state-active { background: #f0f0fa; } -.openerp .ui-tabs { - margin: 0 -16px; -} .openerp .oe_i { font-family: "mnmliconsRegular" !important; font-size: 21px; @@ -302,7 +299,7 @@ } .openerp .oe_notebook { margin: 8px 0; - padding: 0 8px; + padding: 0 16px; list-style: none; zoom: 1; } @@ -328,7 +325,6 @@ } .openerp .oe_notebook > li { position: relative; - margin-bottom: -1px; } .openerp .oe_notebook > li > a { padding: 0 12px; @@ -1667,6 +1663,16 @@ max-width: 960px; margin: 0 auto; } +.openerp .oe_form_title { + width: 55%; +} +.openerp .oe_form_title:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} .openerp ul.oe_form_steps { height: 30px; padding: 0; @@ -1746,6 +1752,9 @@ -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 .ui-tabs { + margin: 0 -16px; +} .openerp .oe_form td.oe_form_group_cell_label { border-right: 1px solid #dddddd; padding: 2px 0px 2px 0px; @@ -1758,6 +1767,9 @@ .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 8px; } +.openerp .oe_form .oe_form_group { + margin: 5px 0px 5px 0px; +} .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] { font-weight: bold; white-space: nowrap; @@ -1976,19 +1988,6 @@ position: relative; overflow: hidden; } -.openerp .oe_form .oe_form_title { - width: 55%; -} -.openerp .oe_form .oe_form_title:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.openerp .oe_form .oe_form_group { - margin: 5px 0px 5px 0px; -} .openerp .oe_hidden_input_file { overflow: hidden; position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index beebd5b2e5f..b63995b3e87 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -268,7 +268,7 @@ $colour4: #8a89ba // Notebook {{{ .oe_notebook margin: 8px 0 - padding: 0 8px + padding: 0 16px list-style: none zoom: 1 .oe_notebook:before, .oe_notebook:after @@ -288,7 +288,6 @@ $colour4: #8a89ba border-width: 0 0 1px .oe_notebook > li position: relative - margin-bottom: -1px .oe_notebook > li > a padding: 0 12px margin-right: 2px diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index a3a5481dcff..0100e45d6fc 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,4 +1,3 @@ -@charset "utf-8"; .openerp .oe_kanban_view { height: inherit; } @@ -16,6 +15,9 @@ .openerp .oe_kanban_view .oe_kanban_clear { clear: both; } +.openerp .oe_kanban_view .oe_kanban_content div:first-child { + margin-right: 12px; +} .openerp .oe_kanban_view .oe_kanban_groups { height: inherit; width: 100%; @@ -385,8 +387,8 @@ } .openerp .oe_kanban_view a.oe_kanban_menuaction { position: absolute; - top: 0px; - right: 3px; + top: 3px; + right: 6px; display: none; color: #4c4c4c; cursor: pointer; @@ -399,7 +401,7 @@ position: absolute; top: 30px; right: -140px; - padding: 8px; + padding: 4px; border: 1px solid #afafb6; min-width: 160px; overflow-x: hidden; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index b3fa9059768..d91dc357397 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -32,6 +32,9 @@ float: right .oe_kanban_clear clear: both + .oe_kanban_content + div:first-child + margin-right: 12px // }}} // KanbanGroups {{{ .oe_kanban_groups @@ -318,8 +321,8 @@ // KanbanDropDown {{{ a.oe_kanban_menuaction position: absolute - top: 0px - right: 3px + top: 3px + right: 6px display: none color: #4c4c4c cursor: pointer