From 682168e202451ccd47df5f5042449c90fb3af818 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 27 Aug 2012 16:03:10 +0200 Subject: [REVERT] Revert hasty commit r.2976 - wreaks havoc on many views by revealing
  • bullets everywhere bzr revid: odo@openerp.com-20120827140310-zzp1kmtulvenuamo --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 70 +++++-------------------------------- addons/web/static/src/css/base.sass | 30 ++++------------ 3 files changed, 15 insertions(+), 87 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index d6b4f4b2fc8..eca044497ef 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass --trace -t expanded base.sass base.css + sass -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index eb641d5887e..908d407380c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -141,6 +141,13 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } +.openerp ul, .openerp li, .openerp ol { + margin: 0; + padding: 0; +} +.openerp li { + list-style-type: none; +} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -155,13 +162,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override li, .openerp .oe_semantic_html_override ol { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override li li, .openerp .oe_semantic_html_override ol li { - list-style-type: none; -} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -626,18 +626,6 @@ padding: 0 16px; list-style: none; zoom: 1; - margin: 0; - padding: 0; -} -.openerp .oe_notebook li { - list-style-type: none; -} -.openerp .oe_notebook ul, .openerp .oe_notebook li, .openerp .oe_notebook ol { - margin: 0; - padding: 0; -} -.openerp .oe_notebook ul li, .openerp .oe_notebook li li, .openerp .oe_notebook ol li { - list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -942,13 +930,6 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } -.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane li, .openerp .oe_login .oe_login_pane ol { - margin: 0; - padding: 0; -} -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane li li, .openerp .oe_login .oe_login_pane ol li { - list-style-type: none; -} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -1028,13 +1009,6 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } -.openerp .oe_topbar ul, .openerp .oe_topbar li, .openerp .oe_topbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_topbar ul li, .openerp .oe_topbar li li, .openerp .oe_topbar ol li { - list-style-type: none; -} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1107,13 +1081,6 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } -.openerp .oe_leftbar ul, .openerp .oe_leftbar li, .openerp .oe_leftbar ol { - margin: 0; - padding: 0; -} -.openerp .oe_leftbar ul li, .openerp .oe_leftbar li li, .openerp .oe_leftbar ol li { - list-style-type: none; -} .openerp a.oe_logo { width: 220px; display: block; @@ -1316,13 +1283,6 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header li, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header li li, .openerp .oe_view_manager table.oe_view_manager_header ol li { - list-style-type: none; -} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1992,7 +1952,7 @@ .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } -.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { +.openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; } @@ -2441,20 +2401,6 @@ float: right; padding-left: 2px; } -.openerp .oe_form_field_status { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul, .openerp .oe_form_field_status li, .openerp .oe_form_field_status ol { - margin: 0; - padding: 0; -} -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status li li, .openerp .oe_form_field_status ol li { - list-style-type: none; -} -.openerp .oe_form_field_status li { - list-style-type: none; -} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index aa75956f0a1..52d54de3fbb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -111,16 +111,6 @@ $sheet-max-width: 860px content: $icon-name color: $color -@mixin ul-html-override() - margin: 0 - padding: 0 - li - list-style-type: none - -@mixin semantic-html-override() - ul, li, ol - @include ul-html-override() - // }}} // CSS animation bounces {{{ @-moz-keyframes bounce @@ -204,6 +194,11 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) + ul, li, ol + margin: 0 + padding: 0 + li + list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -213,8 +208,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override - @include semantic-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -516,8 +509,6 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 - @include ul-html-override - @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -737,7 +728,6 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) - @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -803,7 +793,6 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) - @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -854,7 +843,6 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px - @include semantic-html-override a.oe_logo width: 220px display: block @@ -1019,7 +1007,6 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1519,7 @@ $sheet-max-width: 860px div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 - p, ul, ol + p color: #aaa max-width: 650px label @@ -1867,11 +1854,6 @@ $sheet-max-width: 860px float: right padding-left: 2px // }}} - // FormView.fieldstatus {{{ - .oe_form_field_status - @include semantic-html-override - @include ul-html-override - // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From 67ea7a40a440deb6589952934cac986fe24b4091 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Aug 2012 16:29:35 +0200 Subject: [FIX] State widget elements overlapping with dropdowns and menus bzr revid: fme@openerp.com-20120828142935-pdq8zb74f665bznt --- addons/web/static/src/css/base.css | 2 -- addons/web/static/src/css/base.sass | 2 -- 2 files changed, 4 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 908d407380c..02a5c155476 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2001,7 +2001,6 @@ padding-left: 24px; margin: 0; position: relative; - z-index: 10; } .openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { width: 17px; @@ -2012,7 +2011,6 @@ } .openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { position: relative; - z-index: 11; width: 24px; height: 24px; display: inline-block; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 52d54de3fbb..d3a04be28b8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1554,7 +1554,6 @@ $sheet-max-width: 860px padding-left: 24px margin: 0 position: relative - z-index: 10 .arrow width: 17px display: inline-block @@ -1563,7 +1562,6 @@ $sheet-max-width: 860px margin-left: -5px span position: relative - z-index: 11 width: 24px height: 24px display: inline-block -- cgit v1.2.3 From ba7aee832d999b940c1139218d6966db660510fe Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 29 Aug 2012 17:37:56 +0200 Subject: [IMP] Support for classnames in m2o autocomplete Also improved readability of code bzr revid: fme@openerp.com-20120829153756-7b3lq5lan6b97chy --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 6 ++++++ 2 files changed, 13 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 02a5c155476..41a1bdf26fd 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2399,6 +2399,13 @@ float: right; padding-left: 2px; } +.openerp.ui-autocomplete li.oe_m2o_dropdown_option a { + font-style: italic; + padding-left: 2em; +} +.openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { + margin-top: 10px; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d3a04be28b8..173dd551056 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1851,6 +1851,12 @@ $sheet-max-width: 860px line-height: 14px float: right padding-left: 2px + &.ui-autocomplete + li.oe_m2o_dropdown_option a + font-style: italic + padding-left: 2em + li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option + margin-top: 10px // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager -- cgit v1.2.3 From d0261477f833a84201c526cf76ca432b864c4f50 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:08:19 +0200 Subject: [IMP] CSS improvement bzr revid: fp@tinyerp.com-20120829190819-gl2q4d0d0xsbh2l3 --- addons/web/static/src/css/base.css | 8 +++++++- addons/web/static/src/css/base.sass | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) (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 41a1bdf26fd..c28c12bf224 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,6 +69,7 @@ display: none !important; } } + .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -84,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ + */ */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -1949,6 +1950,11 @@ margin: 0 auto; padding: 16px 0 48px; } +.openerp .oe_form .oe_grey { + color: #aaaaaa; + max-width: 650px; + margin: 0 0 10px 0; +} .openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { margin: 12px 0 8px 0; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 173dd551056..92150ad687b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1516,6 +1516,10 @@ $sheet-max-width: 860px max-width: $sheet-max-width margin: 0 auto padding: 16px 0 48px + .oe_grey + color: #aaa + max-width: 650px + margin: 0 0 10px 0 div.oe_form_configuration div.oe_horizontal_separator margin: 12px 0 8px 0 -- cgit v1.2.3 From 6e943465be4c6df2a356b93e7be8a1da4eb8d74f Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 29 Aug 2012 21:12:43 +0200 Subject: imp_css bzr revid: fp@tinyerp.com-20120829191243-zmgsqb8twjcwzx02 --- addons/web/static/src/css/base.css | 5 +---- addons/web/static/src/css/base.sass | 4 +--- 2 files changed, 2 insertions(+), 7 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 c28c12bf224..06a37a54727 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1955,9 +1955,6 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration div.oe_horizontal_separator { - margin: 12px 0 8px 0; -} .openerp .oe_form div.oe_form_configuration p { color: #aaaaaa; max-width: 650px; @@ -2191,7 +2188,7 @@ .openerp .oe_horizontal_separator { font-weight: bold; font-size: 20px; - margin: 8px 0px 8px 0px; + margin: 15px 0px 10px 0px; color: #7c7bad; } .openerp .oe_horizontal_separator:empty { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 92150ad687b..c238ef6ee07 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1521,8 +1521,6 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - div.oe_horizontal_separator - margin: 12px 0 8px 0 p color: #aaa max-width: 650px @@ -1681,7 +1679,7 @@ $sheet-max-width: 860px .oe_horizontal_separator font-weight: bold font-size: 20px - margin: 8px 0px 8px 0px + margin: 15px 0px 10px 0px color: $section-title-color .oe_horizontal_separator:empty height: 5px -- cgit v1.2.3 From 972306d0157ca92b57462f3e3735767e5a3618fa Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 14:58:05 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902125805-jeivl4whuzzubv7l --- addons/web/static/src/css/base.css | 5 +++-- addons/web/static/src/css/base.sass | 3 ++- 2 files changed, 5 insertions(+), 3 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 06a37a54727..5ce814ef011 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -85,7 +85,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -503,6 +503,7 @@ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); border: none; + margin-bottom: 10px; } .openerp .oe_avatar + div { margin-left: 5px; @@ -2157,7 +2158,7 @@ .openerp .oe_form td.oe_form_group_cell_label label { line-height: 18px; display: block; - min-width: 160px; + min-width: 140px; } .openerp .oe_form td.oe_form_group_cell + .oe_form_group_cell { padding-left: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..f16e369f531 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -422,6 +422,7 @@ $sheet-max-width: 860px @include radius(3px) @include box-shadow(0 1px 3px rgba(0, 0, 0, 0.3)) border: none + margin-bottom: 10px .oe_avatar + div margin-left: 5px .oe_image_small > img @@ -1650,7 +1651,7 @@ $sheet-max-width: 860px label line-height: 18px display: block - min-width: 160px + min-width: 140px td.oe_form_group_cell + .oe_form_group_cell padding-left: 6px .oe_form_group -- cgit v1.2.3 From d7a2ea78dc50f17813e2d20712c146a427dece0b Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 2 Sep 2012 15:30:23 +0200 Subject: [IMP] CSS bzr revid: fp@openerp.com-20120902133023-dgdicbx0xnlht2l5 --- addons/web/static/src/css/base.css | 3 +++ addons/web/static/src/css/base.sass | 1 + 2 files changed, 4 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 5ce814ef011..dd168653f03 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -576,6 +576,9 @@ background: #7c7bad; color: #eeeeee; } +.openerp .oe_tags { + margin-bottom: 1px; +} .openerp .oe_tags.oe_inline { min-width: 250px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f16e369f531..537988e9c4a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -476,6 +476,7 @@ $sheet-max-width: 860px .text-core .text-wrap .text-dropdown .text-list .text-suggestion em font-style: italic text-decoration: none + margin-bottom: 1px // }}} // Tooltips {{{ &.oe_tooltip -- cgit v1.2.3 From b203377994ff51231a632f5b940c14482b9c3206 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:41:45 +0200 Subject: [IMP] in list views: hide drag-n-drop handle and trash can with css classes bzr revid: rco@openerp.com-20120904074145-5mefinpkz0pl0qyb --- addons/web/static/src/css/base.css | 9 +++++++-- addons/web/static/src/css/base.sass | 7 +++++++ 2 files changed, 14 insertions(+), 2 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 06a37a54727..d32b0a9f42a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -85,7 +84,7 @@ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5); /* http://www.quirksmode.org/dom/inputfile.html * http://stackoverflow.com/questions/2855589/replace-input-type-file-by-an-image - */ */ + */ } .openerp :-moz-placeholder { color: #afafb6 !important; @@ -2638,6 +2637,12 @@ content: "ö"; color: #404040; } +.openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { + display: none !important; +} +.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { + display: none !important; +} .openerp .tree_header { background-color: #f0f0f0; border-bottom: 1px solid #cacaca; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index c238ef6ee07..8ddf9b56b9f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2050,6 +2050,13 @@ $sheet-max-width: 860px .oe_list_handle @include text-to-icon("ö") + .oe_list_cannot_edit + .oe_list_header_handle, .oe_list_field_handle + display: none !important + .oe_list_cannot_delete + .oe_list_header_delete, .oe_list_record_delete + display: none !important + // }}} // Tree view {{{ .tree_header -- cgit v1.2.3 From 8b98de00e43b2ba0a3df676f0362a9d3d342092b Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Tue, 4 Sep 2012 09:49:21 +0200 Subject: [IMP] simplification in list views: merge two css classes bzr revid: rco@openerp.com-20120904074921-ff9pkr64g58ku9n3 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 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 d32b0a9f42a..bbee2adfbc4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2640,7 +2640,7 @@ .openerp .oe_list_cannot_edit .oe_list_header_handle, .openerp .oe_list_cannot_edit .oe_list_field_handle { display: none !important; } -.openerp .oe_list_cannot_delete .oe_list_header_delete, .openerp .oe_list_cannot_delete .oe_list_record_delete { +.openerp .oe_list_cannot_delete .oe_list_record_delete { display: none !important; } .openerp .tree_header { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8ddf9b56b9f..63c6f3398fa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -2054,7 +2054,7 @@ $sheet-max-width: 860px .oe_list_header_handle, .oe_list_field_handle display: none !important .oe_list_cannot_delete - .oe_list_header_delete, .oe_list_record_delete + .oe_list_record_delete display: none !important // }}} -- cgit v1.2.3 From 9612626dacbaf3a7956a68f8bd7696966430c0ec Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 4 Sep 2012 12:19:16 +0200 Subject: [ADD] Kanban dummy cell click triggers 'add column' button bounce effect bzr revid: fme@openerp.com-20120904101916-wzkxutkcthgyv2fe --- addons/web/static/src/css/base.css | 4 +++- addons/web/static/src/css/base.sass | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (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 dd168653f03..94cb4d3a007 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -238,6 +237,9 @@ .openerp .ui-widget-content a { color: #7c7bad; } +.openerp .oe_bounce_container { + display: inline-block; +} .openerp.ui-dialog { display: none; padding: 6px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..ad5794ab5cf 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -251,6 +251,8 @@ $sheet-max-width: 860px // Jquery ui Overrides {{{ .ui-widget-content a color: $link-color + .oe_bounce_container + display: inline-block // Modal box &.ui-dialog -- cgit v1.2.3 From fd40dcbeff2973c6501db4eb4e752597ef7fcbd2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 12:11:39 +0200 Subject: [FIX] add minimum height to listview rows matching that of edition row fields Also fix reset of border-radius: none is not a valid value for border-radius, change to 0. bzr revid: xmo@openerp.com-20120904101139-xyl0dskdk6dbdfe1 --- addons/web/static/src/css/base.css | 20 +++++++++++--------- addons/web/static/src/css/base.sass | 12 +++++++----- 2 files changed, 18 insertions(+), 14 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 94cb4d3a007..c20cdf92891 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -523,9 +523,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -538,9 +538,9 @@ padding: 0; margin: 0; background: none; - -moz-border-radius: none; - -webkit-border-radius: none; - border-radius: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; @@ -2479,10 +2479,11 @@ height: 27px; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field input, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; border: 1px solid #aaaaff; - border-radius: 0px; - margin: 0px; - -webkit-border-radius: 0px; + margin: 0; } .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field textarea { height: 60px; @@ -2582,6 +2583,7 @@ cursor: pointer; } .openerp .oe_list_content > tbody > tr { + height: 27px; border-top: 1px solid #dddddd; } .openerp .oe_list_content > tbody > tr > td.oe_list_field_cell { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ad5794ab5cf..5f72b7ae548 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -36,7 +36,7 @@ $sheet-max-width: 860px padding: 0 margin: 0 background: none - @include radius(none) + @include radius(0) @include box-shadow(none) @mixin vertical-gradient($startColor: #555, $endColor: #333) @@ -1911,6 +1911,8 @@ $sheet-max-width: 860px background-color: #d2d2ff td.oe_readonly background-color: #eee + + $row-height: 27px .oe_list_editable .oe_list_content td.oe_list_field_cell @@ -1925,12 +1927,11 @@ $sheet-max-width: 860px display: none .oe_form_field input - height: 27px + height: $row-height input, textarea + @include radius(0) border: 1px solid #aaf - border-radius: 0px - margin: 0px - -webkit-border-radius: 0px + margin: 0 textarea height: 60px &.oe_form_field_float,&.oe_form_view_integer @@ -2015,6 +2016,7 @@ $sheet-max-width: 860px > tbody cursor: pointer > tr + height: $row-height border-top: 1px solid #ddd > td.oe_list_field_cell padding: 3px 6px -- cgit v1.2.3 From a613b710e92c09ed0da76fef145ef91a7a041d3d Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Tue, 4 Sep 2012 14:41:17 +0200 Subject: [FIX] Fixed padding in popups. bzr revid: vta@openerp.com-20120904124117-3ilh4ryfu4r0wpqx --- addons/web/static/src/css/base.css | 95 +++++++++-------- addons/web/static/src/css/base.sass | 202 ++++++++++++++++++------------------ 2 files changed, 150 insertions(+), 147 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 dd168653f03..f28e3c6aa0d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -69,7 +69,6 @@ display: none !important; } } - .openerp.openerp_webclient_container { height: 100%; position: relative; @@ -1933,6 +1932,35 @@ margin: -16px -16px 0 -16px; padding: 8px; } +.openerp .oe_form_sheetbg { + padding: 8px 0; +} +.openerp .oe_form_sheet_width { + min-width: 650px; + max-width: 860px; + margin: 0 auto; +} +.openerp .oe_form_sheet { + background: white; + min-height: 330px; + padding: 16px; +} +.openerp .oe_application .oe_form_sheetbg { + background: url(/web/static/src/img/form_sheetbg.png); + border-bottom: 1px solid #dddddd; +} +.openerp .oe_application .oe_form_sheet { + border: 1px solid #afafb6; + -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); + -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_application .oe_form_sheet .oe_notebook_page { + padding: 0 16px; +} .openerp .oe_form header { position: relative; border-bottom: 1px solid #cacaca; @@ -1972,11 +2000,11 @@ .openerp .oe_form div.oe_form_configuration .oe_form_group_cell div div { padding: 1px 0; } -.openerp ul.oe_form_steps, .openerp ul.oe_form_steps_clickable { +.openerp .oe_form ul.oe_form_steps, .openerp .oe_form ul.oe_form_steps_clickable { display: inline-block; padding-right: 18px; } -.openerp ul.oe_form_steps li, .openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps li, .openerp .oe_form ul.oe_form_steps_clickable li { display: inline-block; margin-right: -20px; background-color: #fcfcfc; @@ -1987,20 +2015,20 @@ background-image: -o-linear-gradient(top, #fcfcfc, #dedede); background-image: linear-gradient(to bottom, #fcfcfc, #dedede); } -.openerp ul.oe_form_steps li:first-child .label, .openerp ul.oe_form_steps_clickable li:first-child .label { +.openerp .oe_form ul.oe_form_steps li:first-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:first-child .label { border-left: 1px solid #cacaca; padding-left: 14px; } -.openerp ul.oe_form_steps li:last-child, .openerp ul.oe_form_steps_clickable li:last-child { +.openerp .oe_form ul.oe_form_steps li:last-child, .openerp .oe_form ul.oe_form_steps_clickable li:last-child { border-right: 1px solid #cacaca; } -.openerp ul.oe_form_steps li:last-child .label, .openerp ul.oe_form_steps_clickable li:last-child .label { +.openerp .oe_form ul.oe_form_steps li:last-child .label, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .label { padding-right: 14px; } -.openerp ul.oe_form_steps li:last-child .arrow, .openerp ul.oe_form_steps_clickable li:last-child .arrow { +.openerp .oe_form ul.oe_form_steps li:last-child .arrow, .openerp .oe_form ul.oe_form_steps_clickable li:last-child .arrow { display: none; } -.openerp ul.oe_form_steps li .label, .openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps li .label, .openerp .oe_form ul.oe_form_steps_clickable li .label { color: #4c4c4c; text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede; padding: 7px; @@ -2009,14 +2037,14 @@ margin: 0; position: relative; } -.openerp ul.oe_form_steps li .arrow, .openerp ul.oe_form_steps_clickable li .arrow { +.openerp .oe_form ul.oe_form_steps li .arrow, .openerp .oe_form ul.oe_form_steps_clickable li .arrow { width: 17px; display: inline-block; vertical-align: top; overflow: hidden; margin-left: -5px; } -.openerp ul.oe_form_steps li .arrow span, .openerp ul.oe_form_steps_clickable li .arrow span { +.openerp .oe_form ul.oe_form_steps li .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li .arrow span { position: relative; width: 24px; height: 24px; @@ -2036,7 +2064,7 @@ -o-transform: rotate(45deg); -ms-transform: rotate(45deg); } -.openerp ul.oe_form_steps li.oe_active, .openerp ul.oe_form_steps_clickable li.oe_active { +.openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; background-image: -webkit-gradient(linear, left top, left bottom, from(#729fcf), to(#3465a4)); background-image: -webkit-linear-gradient(top, #729fcf, #3465a4); @@ -2045,20 +2073,20 @@ background-image: -o-linear-gradient(top, #729fcf, #3465a4); background-image: linear-gradient(to bottom, #729fcf, #3465a4); } -.openerp ul.oe_form_steps li.oe_active .arrow span, .openerp ul.oe_form_steps_clickable li.oe_active .arrow span { +.openerp .oe_form ul.oe_form_steps li.oe_active .arrow span, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .arrow span { background-color: #3465a4; background: -moz-linear-gradient(135deg, #3465a4, #729fcf); background: -o-linear-gradient(135deg, #729fcf, #3465a4); background: -webkit-gradient(linear, left top, right bottom, from(#729fcf), to(#3465a4)); } -.openerp ul.oe_form_steps li.oe_active .label, .openerp ul.oe_form_steps_clickable li.oe_active .label { +.openerp .oe_form ul.oe_form_steps li.oe_active .label, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active .label { color: white; text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li { +.openerp .oe_form ul.oe_form_steps_clickable li { cursor: pointer; } -.openerp ul.oe_form_steps_clickable li:hover { +.openerp .oe_form ul.oe_form_steps_clickable li:hover { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2067,10 +2095,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .label { text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede; } -.openerp ul.oe_form_steps_clickable li:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li:hover .arrow span { background-color: #e8e8e8; background-image: -webkit-gradient(linear, left top, left bottom, from(#e8e8e8), to(#cacaca)); background-image: -webkit-linear-gradient(top, #e8e8e8, #cacaca); @@ -2079,10 +2107,10 @@ background-image: -o-linear-gradient(top, #e8e8e8, #cacaca); background-image: linear-gradient(to bottom, #e8e8e8, #cacaca); } -.openerp ul.oe_form_steps_clickable li .label { +.openerp .oe_form ul.oe_form_steps_clickable li .label { color: #7c7bad; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover { background-color: #4c85c2; background-image: -webkit-gradient(linear, left top, left bottom, from(#4c85c2), to(#284d7d)); background-image: -webkit-linear-gradient(top, #4c85c2, #284d7d); @@ -2091,10 +2119,10 @@ background-image: -o-linear-gradient(top, #4c85c2, #284d7d); background-image: linear-gradient(to bottom, #4c85c2, #284d7d); } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .label { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .label { text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4; } -.openerp ul.oe_form_steps_clickable li.oe_active:hover .arrow span { +.openerp .oe_form ul.oe_form_steps_clickable li.oe_active:hover .arrow span { background-color: #284d7d; background: -moz-linear-gradient(135deg, #284d7d, #4c85c2); background: -o-linear-gradient(135deg, #4c85c2, #284d7d); @@ -2126,31 +2154,6 @@ .openerp .oe_form .oe_subtotal_footer label.oe_form_label_help { font-weight: normal; } -.openerp .oe_application .oe_form_sheetbg { - background: url(/web/static/src/img/form_sheetbg.png); - padding: 8px 0; - border-bottom: 1px solid #dddddd; -} -.openerp .oe_application .oe_form_sheet_width { - min-width: 650px; - max-width: 860px; - margin: 0 auto; -} -.openerp .oe_application .oe_form_sheet { - background: white; - min-height: 330px; - padding: 16px; - border: 1px solid #afafb6; - -moz-box-shadow: 0 0 10px rgba(0, 0, 0, 0.3); - -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_application .oe_form_sheet .oe_notebook_page { - padding: 0 16px; -} .openerp .oe_form .oe_form_button { margin: 2px; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 537988e9c4a..4f231331ff7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1498,11 +1498,34 @@ $sheet-max-width: 860px display: none !important .oe_form .oe_form_field_date width: auto + // Sheet and padding .oe_form_nosheet margin: 16px > header margin: -16px -16px 0 -16px padding: 8px + .oe_form_sheetbg + padding: 8px 0 + .oe_form_sheet_width + min-width: 650px + max-width: $sheet-max-width + margin: 0 auto + .oe_form_sheet + background: white + min-height: 330px + padding: 16px + // Sheet inline mode + .oe_application + .oe_form_sheetbg + background: url(/web/static/src/img/form_sheetbg.png) + border-bottom: 1px solid #ddd + .oe_form_sheet + border: 1px solid $tag-border + @include box-shadow(0 0 10px rgba(0,0,0,0.3)) + .ui-tabs + margin: 0 -16px + .oe_notebook_page + padding: 0 16px // }}} // FormView.custom tags and classes {{{ .oe_form @@ -1532,115 +1555,92 @@ $sheet-max-width: 860px padding: 2px 0 .oe_form_group_cell div div padding: 1px 0 - - - ul.oe_form_steps, ul.oe_form_steps_clickable - display: inline-block - padding-right: 18px - li + ul.oe_form_steps, ul.oe_form_steps_clickable display: inline-block - margin-right: -20px - @include vertical-gradient(#fcfcfc, #dedede) - &:first-child .label - border-left: 1px solid #cacaca - padding-left: 14px - &:last-child - border-right: 1px solid #cacaca - .label - padding-right: 14px - .arrow - display: none - .label - color: #4c4c4c - text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede - padding: 7px - display: inline-block - padding-left: 24px - margin: 0 - position: relative - .arrow - width: 17px + padding-right: 18px + li display: inline-block - vertical-align: top - overflow: hidden - margin-left: -5px - span + margin-right: -20px + @include vertical-gradient(#fcfcfc, #dedede) + &:first-child .label + border-left: 1px solid #cacaca + padding-left: 14px + &:last-child + border-right: 1px solid #cacaca + .label + padding-right: 14px + .arrow + display: none + .label + color: #4c4c4c + text-shadow: 0 1px 1px #fcfcfc, 0 -1px 1px #dedede + padding: 7px + display: inline-block + padding-left: 24px + margin: 0 position: relative - width: 24px - height: 24px + .arrow + width: 17px display: inline-block - margin-left: -12px - margin-top: 3px - box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) - @include skew-gradient(#fcfcfc, #dedede) - @include radius(3px) - @include transform(rotate(45deg)) - li.oe_active - @include vertical-gradient(#729fcf, #3465a4) - .arrow span - @include skew-gradient(#729fcf, #3465a4) - .label - color: white - text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 - - ul.oe_form_steps_clickable - li - cursor: pointer - &:hover - @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + vertical-align: top + overflow: hidden + margin-left: -5px + span + position: relative + width: 24px + height: 24px + display: inline-block + margin-left: -12px + margin-top: 3px + box-shadow: -1px 1px 2px rgba(255,255,255,0.2), inset -1px 1px 1px rgba(0,0,0,0.2) + @include skew-gradient(#fcfcfc, #dedede) + @include radius(3px) + @include transform(rotate(45deg)) + li.oe_active + @include vertical-gradient(#729fcf, #3465a4) .arrow span + @include skew-gradient(#729fcf, #3465a4) + .label + color: white + text-shadow: 0 1px 1px #729fcf, 0 -1px 1px #3465a4 + ul.oe_form_steps_clickable + li + cursor: pointer + &:hover @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) - .label - color: $link-color - li.oe_active - &:hover - @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #fcfcfc, 0 1px 1px #dedede + .arrow span + @include vertical-gradient(darken(#fcfcfc, 8%), darken(#dedede, 8%)) .label - text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 - .arrow span - @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + color: $link-color + li.oe_active + &:hover + @include vertical-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .label + text-shadow: 0 -1px 1px #729fcf, 0 1px 1px #3465a4 + .arrow span + @include skew-gradient(darken(#729fcf, 10%), darken(#3465a4, 10%)) + .oe_subtotal_footer + width: 1% !important + td.oe_form_group_cell + text-align: right + padding: 0 !important + td.oe_form_group_cell_label + border-right: none + .oe_subtotal_footer_separator + width: 108px + border-top: 1px solid #cacaca + font-weight: bold + font-size: 18px + label:after + content: ":" + label.oe_subtotal_footer_separator + font-weight: bold !important + padding: 2px 11px 2px 0px !important + label.oe_form_label_help + font-weight: normal - .oe_form .oe_subtotal_footer - width: 1% !important - td.oe_form_group_cell - text-align: right - padding: 0 !important - td.oe_form_group_cell_label - border-right: none - .oe_subtotal_footer_separator - width: 108px - border-top: 1px solid #cacaca - font-weight: bold - font-size: 18px - label:after - content: ":" - label.oe_subtotal_footer_separator - font-weight: bold !important - padding: 2px 11px 2px 0px !important - label.oe_form_label_help - font-weight: normal - // no sheet in popups - .oe_application - .oe_form_sheetbg - background: url(/web/static/src/img/form_sheetbg.png) - padding: 8px 0 - border-bottom: 1px solid #ddd - .oe_form_sheet_width - min-width: 650px - max-width: $sheet-max-width - margin: 0 auto - .oe_form_sheet - background: white - min-height: 330px - padding: 16px - border: 1px solid $tag-border - @include box-shadow(0 0 10px rgba(0,0,0,0.3)) - .ui-tabs - margin: 0 -16px - .oe_notebook_page - padding: 0 16px // }}} // FormView.group {{{ .oe_form -- cgit v1.2.3 From abdbc220d37ff68312db1b9c43c1ed801b1ad9ec Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 4 Sep 2012 14:49:21 +0200 Subject: [REM] incomplete and unused bounce CSS animation bzr revid: xmo@openerp.com-20120904124921-yur5k231wp8gn7vy --- addons/web/static/src/css/base.css | 49 +++---------------------------------- addons/web/static/src/css/base.sass | 46 ++++++++++++---------------------- 2 files changed, 18 insertions(+), 77 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 25df1334d21..de30642dfd6 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -20,50 +20,6 @@ font-style: normal; } -@-moz-keyframes bounce { - 0% { - -moz-transform: scale(0); - opacity: 0; - } - - 50% { - -moz-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -moz-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -moz-transform: scale(1); - opacity: 1; - } -} - -@-webkit-keyframes bounce { - 0% { - -webkit-transform: scale(0); - opacity: 0; - } - - 50% { - -webkit-transform: scale(1.3); - opacity: 0.4; - } - - 75% { - -webkit-transform: scale(0.9); - opacity: 0.7; - } - - 100% { - -webkit-transform: scale(1); - opacity: 1; - } -} - @media print { .oe_topbar, .oe_leftbar, .oe_loading { display: none !important; @@ -2062,10 +2018,11 @@ -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; - -moz-transform: rotate(45deg); -webkit-transform: rotate(45deg); - -o-transform: rotate(45deg); + -moz-transform: rotate(45deg); -ms-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); } .openerp .oe_form ul.oe_form_steps li.oe_active, .openerp .oe_form ul.oe_form_steps_clickable li.oe_active { background-color: #729fcf; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 3c61702a60c..82c8e1a57ab 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -95,10 +95,23 @@ $sheet-max-width: 860px background: -webkit-gradient(linear, left top, right bottom, from($startColor), to($endColor)) @mixin transform($transform) - -moz-transform: $transform -webkit-transform: $transform - -o-transform: $transform + -moz-transform: $transform -ms-transform: $transform + -o-transform: $transform + transform: $transform + +@mixin keyframes($name) + @-webkit-keyframes #{$name} + @content + @-moz-keyframes #{$name} + @content + @-ms-keyframes #{$name} + @content + @-o-keyframes #{$name} + @content + @keyframes #{$name} + @content // Transforms the (readable) text of an inline element into an mmlicons icon, // allows for actual readable text in-code (and in readers?) with iconic looks @@ -112,35 +125,6 @@ $sheet-max-width: 860px color: $color // }}} -// CSS animation bounces {{{ -@-moz-keyframes bounce - 0% - -moz-transform: scale(0) - opacity: 0 - 50% - -moz-transform: scale(1.3) - opacity: 0.4 - 75% - -moz-transform: scale(0.9) - opacity: 0.7 - 100% - -moz-transform: scale(1) - opacity: 1 - -@-webkit-keyframes bounce - 0% - -webkit-transform: scale(0) - opacity: 0 - 50% - -webkit-transform: scale(1.3) - opacity: 0.4 - 75% - -webkit-transform: scale(0.9) - opacity: 0.7 - 100% - -webkit-transform: scale(1) - opacity: 1 -// }}} @media print .oe_topbar, .oe_leftbar, .oe_loading -- cgit v1.2.3 From 006ed33ff344784dd84c3458b6cef41f6db4ea7a Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 4 Sep 2012 18:42:41 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120904164241-lrvvsj5i7axni5ng --- addons/web/static/src/css/Makefile | 2 +- addons/web/static/src/css/base.css | 97 ++++++++++++++++++++++++++++++++++--- addons/web/static/src/css/base.sass | 34 ++++++++++--- 3 files changed, 118 insertions(+), 15 deletions(-) (limited to 'addons/web/static/src/css') diff --git a/addons/web/static/src/css/Makefile b/addons/web/static/src/css/Makefile index eca044497ef..d6b4f4b2fc8 100644 --- a/addons/web/static/src/css/Makefile +++ b/addons/web/static/src/css/Makefile @@ -1,3 +1,3 @@ base.css: base.sass - sass -t expanded base.sass base.css + sass --trace -t expanded base.sass base.css diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index de30642dfd6..09432786ca0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -97,13 +97,6 @@ background-image: -o-linear-gradient(top, #eeeeee, #dedede); background-image: linear-gradient(to bottom, #eeeeee, #dedede); } -.openerp ul, .openerp li, .openerp ol { - margin: 0; - padding: 0; -} -.openerp li { - list-style-type: none; -} .openerp input, .openerp textarea, .openerp select { padding: 2px 4px; border: 1px solid #cccccc; @@ -118,6 +111,24 @@ .openerp h4 { margin: 4px 0; } +.openerp .oe_semantic_html_override_ul { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override_ul li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { + margin: 0; + padding: 0; +} +.openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { display: inline-block; border: 1px solid #ababab; @@ -589,6 +600,22 @@ padding: 0 16px; list-style: none; zoom: 1; + margin: 0; + padding: 0; +} +.openerp .oe_notebook li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_notebook ul, .openerp .oe_notebook ol { + margin: 0; + padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { + margin: 0; + padding: 0; + list-style-type: none; } .openerp .oe_notebook.ui-corner-all { -moz-border-radius: 0; @@ -893,6 +920,15 @@ -webkit-box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); box-shadow: 0 0 18px rgba(0, 0, 0, 0.9); } +.openerp .oe_login .oe_login_pane ul, .openerp .oe_login .oe_login_pane ol { + margin: 0; + padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_login .oe_login_pane h2 { margin-top: 0; font-size: 18px; @@ -972,6 +1008,15 @@ background-image: -o-linear-gradient(top, #646060, #262626); background-image: linear-gradient(to bottom, #646060, #262626); } +.openerp .oe_topbar ul, .openerp .oe_topbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_topbar .oe_topbar_item { display: block; padding: 5px 10px 7px; @@ -1044,6 +1089,15 @@ text-shadow: 0 1px 1px white; padding-bottom: 16px; } +.openerp .oe_leftbar ul, .openerp .oe_leftbar ol { + margin: 0; + padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp a.oe_logo { width: 220px; display: block; @@ -1246,6 +1300,15 @@ width: 100%; table-layout: fixed; } +.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { + margin: 0; + padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; text-shadow: 0 1px 1px white; @@ -1946,7 +2009,7 @@ max-width: 650px; margin: 0 0 10px 0; } -.openerp .oe_form div.oe_form_configuration p { +.openerp .oe_form div.oe_form_configuration p, .openerp .oe_form div.oe_form_configuration ul, .openerp .oe_form div.oe_form_configuration ol { color: #aaaaaa; max-width: 650px; } @@ -2376,6 +2439,24 @@ .openerp.ui-autocomplete li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option { margin-top: 10px; } +.openerp .oe_form_field_status { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol { + margin: 0; + padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { + margin: 0; + padding: 0; + list-style-type: none; +} +.openerp .oe_form_field_status li { + margin: 0; + padding: 0; + list-style-type: none; +} .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 82c8e1a57ab..40766085008 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -124,6 +124,18 @@ $sheet-max-width: 860px content: $icon-name color: $color +@mixin ul-html-override() + margin: 0 + padding: 0 + li + margin: 0 + padding: 0 + list-style-type: none + +@mixin semantic-html-override() + ul, ol + @include ul-html-override() + // }}} @media print @@ -178,11 +190,6 @@ $sheet-max-width: 860px @include vertical-gradient(#f0f0fa, #eeeef6) .zebra tbody tr:hover td @include vertical-gradient(#eee, #dedede) - ul, li, ol - margin: 0 - padding: 0 - li - list-style-type: none input, textarea, select padding: 2px 4px border: 1px solid #ccc @@ -192,6 +199,10 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override + @include semantic-html-override + .oe_semantic_html_override_ul + @include ul-html-override // }}} // Button style {{{ a.button:link, a.button:visited, button, input[type='submit'], .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button @@ -497,6 +508,8 @@ $sheet-max-width: 860px padding: 0 16px list-style: none zoom: 1 + @include ul-html-override + @include semantic-html-override .oe_notebook.ui-corner-all @include radius(0) .oe_notebook:before, .oe_notebook:after @@ -716,6 +729,7 @@ $sheet-max-width: 860px text-align: left @include radius(8px) @include box-shadow(0 0 18px rgba(0, 0, 0, 0.9)) + @include semantic-html-override h2 margin-top: 0 font-size: 18px @@ -781,6 +795,7 @@ $sheet-max-width: 860px height: 31px border-top: solid 1px #d3d3d3 @include vertical-gradient(#646060, #262626) + @include semantic-html-override .oe_topbar_item display: block padding: 5px 10px 7px @@ -831,6 +846,7 @@ $sheet-max-width: 860px border-right: 1px solid $tag-border text-shadow: 0 1px 1px white padding-bottom: 16px + @include semantic-html-override a.oe_logo width: 220px display: block @@ -995,6 +1011,7 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed + @include semantic-html-override .oe_header_row //min-height: 26px //line-height: 26px @@ -1532,7 +1549,7 @@ $sheet-max-width: 860px max-width: 650px margin: 0 0 10px 0 div.oe_form_configuration - p + p, ul, ol color: #aaa max-width: 650px label @@ -1848,6 +1865,11 @@ $sheet-max-width: 860px li:not(.oe_m2o_dropdown_option) + li.oe_m2o_dropdown_option margin-top: 10px // }}} + // FormView.fieldstatus {{{ + .oe_form_field_status + @include semantic-html-override + @include ul-html-override + // }}} // FormView.one2many {{{ .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page -- cgit v1.2.3 From a454d6fae3c2fee59ff61720c4ff6e13cbdc8868 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:03:53 +0200 Subject: wip bzr revid: nicolas.vanhoren@openerp.com-20120905080353-tquc3r3n27kt452v --- addons/web/static/src/css/base.css | 49 ++++++++++++++++++++++++++++++------- addons/web/static/src/css/base.sass | 7 ++++-- 2 files changed, 45 insertions(+), 11 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 09432786ca0..07467317c7c 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -115,18 +115,33 @@ margin: 0; padding: 0; } -.openerp .oe_semantic_html_override_ul li { +.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { margin: 0; padding: 0; +} +.openerp .oe_semantic_html_override_ul li { list-style-type: none; } .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; } +.openerp .oe_semantic_html_override ul ul, .openerp .oe_semantic_html_override ul ol, .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol ul, .openerp .oe_semantic_html_override ol ol, .openerp .oe_semantic_html_override ol li { + margin: 0; + padding: 0; +} .openerp .oe_semantic_html_override ul li, .openerp .oe_semantic_html_override ol li { + list-style-type: none; +} +.openerp ul.oe_semantic_html_override { + margin: 0; + padding: 0; +} +.openerp ul.oe_semantic_html_override ul, .openerp ul.oe_semantic_html_override ol, .openerp ul.oe_semantic_html_override li { margin: 0; padding: 0; +} +.openerp ul.oe_semantic_html_override li { list-style-type: none; } .openerp a.button:link, .openerp a.button:visited, .openerp button, .openerp input[type='submit'], .openerp .ui-dialog-buttonpane .ui-dialog-buttonset .ui-button { @@ -603,18 +618,22 @@ margin: 0; padding: 0; } -.openerp .oe_notebook li { +.openerp .oe_notebook ul, .openerp .oe_notebook ol, .openerp .oe_notebook li { margin: 0; padding: 0; +} +.openerp .oe_notebook li { list-style-type: none; } .openerp .oe_notebook ul, .openerp .oe_notebook ol { margin: 0; padding: 0; } -.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { +.openerp .oe_notebook ul ul, .openerp .oe_notebook ul ol, .openerp .oe_notebook ul li, .openerp .oe_notebook ol ul, .openerp .oe_notebook ol ol, .openerp .oe_notebook ol li { margin: 0; padding: 0; +} +.openerp .oe_notebook ul li, .openerp .oe_notebook ol li { list-style-type: none; } .openerp .oe_notebook.ui-corner-all { @@ -924,9 +943,11 @@ margin: 0; padding: 0; } -.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { +.openerp .oe_login .oe_login_pane ul ul, .openerp .oe_login .oe_login_pane ul ol, .openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol ul, .openerp .oe_login .oe_login_pane ol ol, .openerp .oe_login .oe_login_pane ol li { margin: 0; padding: 0; +} +.openerp .oe_login .oe_login_pane ul li, .openerp .oe_login .oe_login_pane ol li { list-style-type: none; } .openerp .oe_login .oe_login_pane h2 { @@ -1012,9 +1033,11 @@ margin: 0; padding: 0; } -.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { +.openerp .oe_topbar ul ul, .openerp .oe_topbar ul ol, .openerp .oe_topbar ul li, .openerp .oe_topbar ol ul, .openerp .oe_topbar ol ol, .openerp .oe_topbar ol li { margin: 0; padding: 0; +} +.openerp .oe_topbar ul li, .openerp .oe_topbar ol li { list-style-type: none; } .openerp .oe_topbar .oe_topbar_item { @@ -1093,9 +1116,11 @@ margin: 0; padding: 0; } -.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { +.openerp .oe_leftbar ul ul, .openerp .oe_leftbar ul ol, .openerp .oe_leftbar ul li, .openerp .oe_leftbar ol ul, .openerp .oe_leftbar ol ol, .openerp .oe_leftbar ol li { margin: 0; padding: 0; +} +.openerp .oe_leftbar ul li, .openerp .oe_leftbar ol li { list-style-type: none; } .openerp a.oe_logo { @@ -1304,9 +1329,11 @@ margin: 0; padding: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { margin: 0; padding: 0; +} +.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { list-style-type: none; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { @@ -2447,14 +2474,18 @@ margin: 0; padding: 0; } -.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { +.openerp .oe_form_field_status ul ul, .openerp .oe_form_field_status ul ol, .openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol ul, .openerp .oe_form_field_status ol ol, .openerp .oe_form_field_status ol li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status ul li, .openerp .oe_form_field_status ol li { list-style-type: none; } -.openerp .oe_form_field_status li { +.openerp .oe_form_field_status ul, .openerp .oe_form_field_status ol, .openerp .oe_form_field_status li { margin: 0; padding: 0; +} +.openerp .oe_form_field_status li { list-style-type: none; } .openerp .oe_form .oe_form_field_one2many > .oe_view_manager .oe_list_pager_single_page { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 40766085008..495f88ad282 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -127,9 +127,10 @@ $sheet-max-width: 860px @mixin ul-html-override() margin: 0 padding: 0 - li + ul, ol, li margin: 0 padding: 0 + li list-style-type: none @mixin semantic-html-override() @@ -199,9 +200,11 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 + .oe_semantic_html_override_ul + @include ul-html-override .oe_semantic_html_override @include semantic-html-override - .oe_semantic_html_override_ul + ul.oe_semantic_html_override @include ul-html-override // }}} // Button style {{{ -- cgit v1.2.3 From 509838a440219119b2ce8c7047d34b4c541d1429 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 10:10:19 +0200 Subject: Solved problem with left menu bzr revid: nicolas.vanhoren@openerp.com-20120905081019-o4x9d6v2meiwlfl7 --- addons/web/static/src/css/base.css | 8 ++++---- addons/web/static/src/css/base.sass | 4 ++-- 2 files changed, 6 insertions(+), 6 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 07467317c7c..a05b1bc25e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1215,16 +1215,16 @@ width: 100%; display: inline-block; } -.openerp .oe_secondary_submenu > li { +.openerp .oe_secondary_submenu li { position: relative; - padding: 1px 0 1px 20px; + padding: 1px 0 1px 20px !important; } -.openerp .oe_secondary_submenu > li a { +.openerp .oe_secondary_submenu li a { display: block; color: #4c4c4c; padding: 2px 4px 2px 0; } -.openerp .oe_secondary_submenu > li .oe_menu_label { +.openerp .oe_secondary_submenu li .oe_menu_label { position: absolute; top: 1px; right: 1px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 495f88ad282..438f59df11f 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -927,9 +927,9 @@ $sheet-max-width: 860px margin: 0 width: 100% display: inline-block - > li + li position: relative - padding: 1px 0 1px 20px + padding: 1px 0 1px 20px !important a display: block color: #4c4c4c -- cgit v1.2.3 From 88105a043b010870d759f0e16a459ccbeac8741e Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 5 Sep 2012 11:18:59 +0200 Subject: [FIX] small css problem with the "more" menu in form views bzr revid: nicolas.vanhoren@openerp.com-20120905091859-jkequxaxo2qd8cz8 --- addons/web/static/src/css/base.css | 28 ++++++++++------------------ addons/web/static/src/css/base.sass | 13 ++++++++++--- 2 files changed, 20 insertions(+), 21 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 a05b1bc25e5..601133b2e7f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -111,17 +111,6 @@ .openerp h4 { margin: 4px 0; } -.openerp .oe_semantic_html_override_ul { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul ul, .openerp .oe_semantic_html_override_ul ol, .openerp .oe_semantic_html_override_ul li { - margin: 0; - padding: 0; -} -.openerp .oe_semantic_html_override_ul li { - list-style-type: none; -} .openerp .oe_semantic_html_override ul, .openerp .oe_semantic_html_override ol { margin: 0; padding: 0; @@ -1325,16 +1314,15 @@ width: 100%; table-layout: fixed; } -.openerp .oe_view_manager table.oe_view_manager_header ul, .openerp .oe_view_manager table.oe_view_manager_header ol { - margin: 0; - padding: 0; -} -.openerp .oe_view_manager table.oe_view_manager_header ul ul, .openerp .oe_view_manager table.oe_view_manager_header ul ol, .openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol ul, .openerp .oe_view_manager table.oe_view_manager_header ol ol, .openerp .oe_view_manager table.oe_view_manager_header ol li { - margin: 0; +.openerp .oe_view_manager table.oe_view_manager_header ul { padding: 0; + margin-right: 0; + margin-top: 0; + margin-bottom: 0; } -.openerp .oe_view_manager table.oe_view_manager_header ul li, .openerp .oe_view_manager table.oe_view_manager_header ol li { +.openerp .oe_view_manager table.oe_view_manager_header ul li { list-style-type: none; + margin: 0; } .openerp .oe_view_manager table.oe_view_manager_header .oe_header_row { clear: both; @@ -1445,11 +1433,15 @@ color: white; text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4); } +.openerp .oe_view_manager .oe_view_manager_switch { + margin-left: 8px; +} .openerp .oe_view_manager .oe_view_manager_switch li { text-align: center; width: 24px; height: 24px; line-height: 16px; + padding: 0; } .openerp .oe_view_manager .oe_view_manager_switch li a { position: relative; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 438f59df11f..6ee03494e7d 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -200,8 +200,6 @@ $sheet-max-width: 860px vertical-align: middle h4 margin: 4px 0 - .oe_semantic_html_override_ul - @include ul-html-override .oe_semantic_html_override @include semantic-html-override ul.oe_semantic_html_override @@ -1014,7 +1012,14 @@ $sheet-max-width: 860px table.oe_view_manager_header width: 100% table-layout: fixed - @include semantic-html-override + ul + padding: 0 + margin-right: 0 + margin-top: 0 + margin-bottom: 0 + li + list-style-type: none + margin: 0 .oe_header_row //min-height: 26px //line-height: 26px @@ -1099,11 +1104,13 @@ $sheet-max-width: 860px // }}} // ViewManager.switches {{{ .oe_view_manager_switch + margin-left: 8px li text-align: center width: 24px height: 24px line-height: 16px + padding: 0 a position: relative .oe_vm_switch_list:after, .oe_vm_switch_tree:after -- cgit v1.2.3 From dc6b5e92bf742c775eb4228dbae221321f31bedd Mon Sep 17 00:00:00 2001 From: "vta vta@openerp.com" <> Date: Wed, 5 Sep 2012 13:24:46 +0200 Subject: [FIX] Fixed min-width input[type=text]. bzr revid: vta@openerp.com-20120905112446-yi6eyfde8pa31g0l --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 2 +- 2 files changed, 2 insertions(+), 2 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 cb7ecddfa82..226ccbd3513 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2312,7 +2312,7 @@ -ms-box-sizing: border-box; box-sizing: border-box; background: white; - min-width: 70px; + min-width: 60px; color: #1f1f1f; } .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] { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 6fb2c8d21c1..13f740f218c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1751,7 +1751,7 @@ $sheet-max-width: 860px input[type="text"], input[type="password"], input[type="file"], select, textarea @include box-sizing(border) background: white - min-width: 70px + min-width: 60px color: #1f1f1f input[readonly], select[readonly], textarea[readonly], input[disabled], select[disabled] background: #E5E5E5 !important -- cgit v1.2.3