From c0936ac657d3e8d41c3b9e7be917a3ef3075cb8f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Sep 2011 22:22:09 +0200 Subject: [IMP] Get rid of jQuery accordion. Improved menu (WIP). Now all levels are working bzr revid: fme@openerp.com-20110915202209-5rp3ltzz86msaajz --- addons/web/static/src/css/base.css | 76 +++++++++----------------------------- 1 file changed, 18 insertions(+), 58 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 4645c55f692..9200cfc3383 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -221,17 +221,11 @@ label.error { height: 100%; background: #f0eeee; } - -/* Menu */ -.openerp .sf-menu { - margin-bottom: 0; -} -/* -.sf-menu a { - padding: 5px 5px; +.openerp .oe-application-container { + height: 100%; } -*/ +/* Menu */ .openerp .menu { height: 34px; background: #cc4e45; /* Old browsers */ @@ -291,12 +285,8 @@ label.error { background: linear-gradient(top, #c6c6c6 0%,#5c5c5c 7%,#969595 86%); /* W3C */ /* for ie */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#5c5c5c', endColorstr='#969595',GradientType=0 ); /* IE6-9 */ - color: #fff; } -.openerp .oe-application-container { - height: 100%; -} /* Secondary Menu */ .openerp .secondary_menu { width: 200px; @@ -307,14 +297,16 @@ label.error { vertical-align: top; height: 100%; } -.openerp .secondary_menu .menu_content { - padding: 0; - border: none; - background: none; - overflow: hidden; +.openerp .secondary_menu a { + display: block; + padding: 0 5px 2px 5px; + line-height: 20px; + text-decoration: none; + white-space: nowrap; + color: white; + text-shadow: 0 1px 0 #333; } -.openerp .secondary_menu h3 { - padding: 0 0 2px; +.openerp .secondary_menu a.oe_secondary_menu_item { background: #949292; /* Old browsers */ background: -moz-linear-gradient(top, #949292 0%, #6d6b6b 87%, #282828 99%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#949292), color-stop(87%,#6d6b6b), color-stop(99%,#282828)); /* Chrome,Safari4+ */ @@ -325,34 +317,13 @@ label.error { background: linear-gradient(top, #949292 0%,#6d6b6b 87%,#282828 99%); /* W3C */ /* for ie9 */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#949292', endColorstr='#5B5A5A',GradientType=0 ); /* IE6-9 */ - border: none; - /* overriding jquery ui */ - -moz-border-radius: 0; -webkit-border-radius: 0; border-radius: 0; -} -.openerp .secondary_menu h4 { - padding: 0 0 2px 10px; - border: none; - background: none; -} -.openerp .secondary_menu h3 span, .openerp .secondary_menu h4 span { - left: 0 !important; -} -.openerp .secondary_menu a { - display: block; - height: 20px; - padding: 0 5px; - line-height: 20px; white-space: nowrap; color: white; - text-decoration: none; text-shadow: 0 1px 0 #333; } -.openerp .secondary_menu a.leaf:hover, -.openerp .secondary_menu a.leaf:active, -.openerp .secondary_menu a.leaf.active, -.openerp .secondary_menu h4:hover, -.openerp .secondary_menu h4:active, -.openerp .secondary_menu h4.active { +.openerp a.oe_secondary_submenu_item:hover, +.openerp a.oe_secondary_submenu_item.leaf.active { + display: block; background: #ffffff; /* Old browsers */ background: -moz-linear-gradient(top, #ffffff 0%, #d8d8d8 11%, #afafaf 86%, #333333 91%, #5a5858 96%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(11%,#d8d8d8), color-stop(86%,#afafaf), color-stop(91%,#333333), color-stop(96%,#5a5858)); /* Chrome,Safari4+ */ @@ -361,22 +332,11 @@ label.error { background: -ms-linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* IE10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#FFFFFF', endColorstr='#5A5858',GradientType=0 ); /* IE6-9 */ background: linear-gradient(top, #ffffff 0%,#d8d8d8 11%,#afafaf 86%,#333333 91%,#5a5858 96%); /* W3C */ - /* overriding jquery ui */ - -moz-border-radius-topright: 0; -webkit-border-top-right-radius: 0; border-top-right-radius: 0; - color: #3f3d3d; - text-shadow: #fff 0 1px 0; - border: none !important; -} - -.openerp .secondary_menu h4:hover a, -.openerp .secondary_menu h4:active a, -.openerp .secondary_menu h4.active a { + padding: 0 5px 2px 5px; + line-height: 20px; color: #3f3d3d; + text-decoration: none; text-shadow: #fff 0 1px 0; - border: none !important; -} -.openerp div.submenu_accordion div.menu_content a span { - padding-left: 20px; } /* Header */ -- cgit v1.2.3 From 6a281e2d3f3ddd7ce34a1aa2b2c2da8963650d8a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 15 Sep 2011 23:08:18 +0200 Subject: [IMP] Use unicode font for arrows bzr revid: fme@openerp.com-20110915210818-15hrzmv24xdimisu --- addons/web/static/src/css/base.css | 6 ++++++ 1 file changed, 6 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 9200cfc3383..2f87b0f9fa9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -338,6 +338,12 @@ label.error { text-decoration: none; text-shadow: #fff 0 1px 0; } +.openerp a.oe_secondary_submenu_item.submenu.opened span:before { + content: "\25be"; +} +.openerp a.oe_secondary_submenu_item.submenu span:before { + content: "\25b8"; +} /* Header */ .openerp .header { -- cgit v1.2.3 From 3efa2e0a1acb052e3e7fc2ad9e4334ec05e7fa5a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Sep 2011 16:46:31 +0200 Subject: [ADD] Menu folding (WIP) bzr revid: fme@openerp.com-20110919144631-b534cjz9iw598f3j --- addons/web/static/src/css/base.css | 22 ++++++++++++++++++++++ 1 file changed, 22 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 2f87b0f9fa9..8ef299f9e1d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -288,6 +288,28 @@ label.error { color: #fff; } /* Secondary Menu */ +.openerp .oe_toggle_secondary_menu { + position: absolute; + cursor: pointer; + border-left: 1px solid #282828; + border-bottom: 1px solid #282828; + width: 21px; + height: 21px; + left: 177px; + z-index: 10; + background: transparent; + color: white; + text-shadow: 0 1px 0 #333; + text-align: center; + font-size: 18px; + line-height: 14px; +} +.openerp .oe_toggle_secondary_menu.folded span.oe_menu_fold { + display: none; +} +.openerp .oe_toggle_secondary_menu.unfolded span.oe_menu_unfold { + display: none; +} .openerp .secondary_menu { width: 200px; min-width: 200px; -- cgit v1.2.3 From 744be5db04bfccdf8d6745a4a3a253b2b95034de Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Sep 2011 17:59:43 +0200 Subject: [ADD] Float menu (WIP) bzr revid: fme@openerp.com-20110919155943-fdx57kbr0q9a2ywe --- addons/web/static/src/css/base.css | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 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 8ef299f9e1d..47bdacb02cb 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -288,11 +288,10 @@ label.error { color: #fff; } /* Secondary Menu */ -.openerp .oe_toggle_secondary_menu { +.openerp .secondary_menu .oe_toggle_secondary_menu { position: absolute; cursor: pointer; border-left: 1px solid #282828; - border-bottom: 1px solid #282828; width: 21px; height: 21px; left: 177px; @@ -304,10 +303,17 @@ label.error { font-size: 18px; line-height: 14px; } -.openerp .oe_toggle_secondary_menu.folded span.oe_menu_fold { +.openerp .secondary_menu.oe_folded .oe_toggle_secondary_menu { + position: initial; + border-left: none; + border-bottom: 1px solid #282828; + width: 21px; + height: 21px; +} +.openerp .secondary_menu.oe_folded .oe_toggle_secondary_menu span.oe_menu_fold { display: none; } -.openerp .oe_toggle_secondary_menu.unfolded span.oe_menu_unfold { +.openerp .secondary_menu.oe_unfolded .oe_toggle_secondary_menu span.oe_menu_unfold { display: none; } .openerp .secondary_menu { @@ -319,6 +325,17 @@ label.error { vertical-align: top; height: 100%; } +.openerp .secondary_menu.oe_folded { + width: 20px; + min-width: 20px; +} +.openerp .secondary_menu.oe_folded .oe_secondary_menu.active { + position: absolute; + background: #5A5858; + z-index: 100; + border: 2px solid white; + border-radius: 5px; +} .openerp .secondary_menu a { display: block; padding: 0 5px 2px 5px; -- cgit v1.2.3 From ba669358472761af4679ea74ca2dd7e8f4dfe057 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Sep 2011 18:07:42 +0200 Subject: [IMP] Improved float menu bzr revid: fme@openerp.com-20110919160742-rxm7fyajlehk3i1z --- addons/web/static/src/css/base.css | 4 +++- 1 file changed, 3 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 47bdacb02cb..19a148630e0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -333,8 +333,10 @@ label.error { position: absolute; background: #5A5858; z-index: 100; - border: 2px solid white; + border: 2px solid #9B281D; border-radius: 5px; + box-shadow: 5px 5px 5px #666; + min-width: 200px; } .openerp .secondary_menu a { display: block; -- cgit v1.2.3 From 987e009c695cd8b57de7b48bb419427568c85efc Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Sep 2011 21:23:07 +0200 Subject: [IMP] Improved menu, renamed some variables bzr revid: fme@openerp.com-20110919192307-3r01jt630xw0bl34 --- addons/web/static/src/css/base.css | 10 ++++++---- 1 file changed, 6 insertions(+), 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 19a148630e0..4b17d05fe5d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -331,11 +331,10 @@ label.error { } .openerp .secondary_menu.oe_folded .oe_secondary_menu.active { position: absolute; - background: #5A5858; z-index: 100; - border: 2px solid #9B281D; - border-radius: 5px; - box-shadow: 5px 5px 5px #666; + border: 10px solid #585858; + border: 10px solid rgba(88, 88, 88, .5); + border-radius: 10px; min-width: 200px; } .openerp .secondary_menu a { @@ -347,6 +346,9 @@ label.error { color: white; text-shadow: 0 1px 0 #333; } +.openerp .oe_secondary_submenu { + background: #5A5858; +} .openerp .secondary_menu a.oe_secondary_menu_item { background: #949292; /* Old browsers */ background: -moz-linear-gradient(top, #949292 0%, #6d6b6b 87%, #282828 99%); /* FF3.6+ */ -- cgit v1.2.3 From 4b5f6715821c99fe01264787e2dee18ab29e1c9e Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Mon, 19 Sep 2011 23:49:04 +0200 Subject: [IMP] Improved menu bzr revid: fme@openerp.com-20110919214904-5vxnkt80rx48shjo --- addons/web/static/src/css/base.css | 6 ++++-- 1 file changed, 4 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 4b17d05fe5d..7b58f29a1ff 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -294,7 +294,6 @@ label.error { border-left: 1px solid #282828; width: 21px; height: 21px; - left: 177px; z-index: 10; background: transparent; color: white; @@ -302,9 +301,10 @@ label.error { text-align: center; font-size: 18px; line-height: 14px; + right: 0; } .openerp .secondary_menu.oe_folded .oe_toggle_secondary_menu { - position: initial; + position: static; border-left: none; border-bottom: 1px solid #282828; width: 21px; @@ -324,10 +324,12 @@ label.error { background: #5A5858; vertical-align: top; height: 100%; + position: relative; } .openerp .secondary_menu.oe_folded { width: 20px; min-width: 20px; + position: static; } .openerp .secondary_menu.oe_folded .oe_secondary_menu.active { position: absolute; -- cgit v1.2.3 From 9a8013e1cf5369de2c450f87b85545f1634ba4b0 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Sep 2011 10:10:08 +0200 Subject: [ADD] Add Menu#reload() method bzr revid: fme@openerp.com-20110920081008-9ka8p9pr1z6b0w0l --- addons/web/static/src/css/base.css | 3 ++- 1 file changed, 2 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 7b58f29a1ff..390052ede9d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -247,7 +247,7 @@ label.error { height: 20px; margin: 3px 2px; padding: 0 8px; - + background: #bd5e54; /* Old browsers */ background: -moz-linear-gradient(top, #bd5e54 0%, #90322a 60%); /* FF3.6+ */ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bd5e54), color-stop(60%,#90322a)); /* Chrome,Safari4+ */ @@ -309,6 +309,7 @@ label.error { border-bottom: 1px solid #282828; width: 21px; height: 21px; + background: #818181; } .openerp .secondary_menu.oe_folded .oe_toggle_secondary_menu span.oe_menu_fold { display: none; -- cgit v1.2.3 From 8bb26a33c53adf8f0a9066a2db0b57115d7f2373 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 20 Sep 2011 15:42:44 +0200 Subject: [IMP] Thin border for float menu bzr revid: fme@openerp.com-20110920134244-l15jq9y0c3h767a6 --- addons/web/static/src/css/base.css | 6 +++--- 1 file changed, 3 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 390052ede9d..d7624493fdc 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -335,9 +335,9 @@ label.error { .openerp .secondary_menu.oe_folded .oe_secondary_menu.active { position: absolute; z-index: 100; - border: 10px solid #585858; - border: 10px solid rgba(88, 88, 88, .5); - border-radius: 10px; + border: 4px solid #585858; + border: 4px solid rgba(88, 88, 88, .5); + border-radius: 4px; min-width: 200px; } .openerp .secondary_menu a { -- cgit v1.2.3