From 8c4af1a1d4845d94af00bb35a0320971762a271a Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 11 Jul 2012 16:44:40 +0200 Subject: [PATCH] [IMP] Improved kanban dropdown bzr revid: fme@openerp.com-20120711144440-oksivy1kmcmjm2zw --- addons/web/static/src/js/chrome.js | 5 +++-- addons/web_kanban/static/src/css/kanban.css | 11 ++++++++--- addons/web_kanban/static/src/css/kanban.sass | 9 ++++++--- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b87ebe56856..970d509d481 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -894,11 +894,12 @@ instance.web.WebClient = instance.web.Widget.extend({ }); this.$element.on('click', '.oe_dropdown_toggle', function(ev) { ev.preventDefault(); - var $menu = $(this).find('.oe_dropdown_menu'); + var $toggle = $(this); + var $menu = $toggle.find('.oe_dropdown_menu'); var state = $menu.is('.oe_opened'); setTimeout(function() { // Do not alter propagation - $menu.toggleClass('oe_opened', !state); + $toggle.add($menu).toggleClass('oe_opened', !state); if (!state) { // Move $menu if outside window's edge var doc_width = $(document).width(); diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index a48163f3016..4f3204e15f7 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -345,8 +345,8 @@ -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); -box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); } -.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban { - display: block; +.openerp .oe_kanban_view .oe_kanban_card:hover .oe_dropdown_kanban > span { + visibility: visible; } .openerp .oe_kanban_view .oe_kanban_card h3 { margin: 0 16px 0 0; @@ -445,9 +445,11 @@ position: absolute; top: -8px; right: 3px; - display: none; cursor: pointer; } +.openerp .oe_kanban_view .oe_dropdown_kanban > span { + visibility: hidden; +} .openerp .oe_kanban_view .oe_dropdown_kanban:hover { text-decoration: none; } @@ -456,6 +458,9 @@ top: 28px; min-width: 160px; } +.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span { + visibility: visible; +} .openerp .oe_kanban_view .oe_kanban_colorpicker { padding: 3px 6px; white-space: nowrap; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index dc6bc31344d..39898f19094 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -296,8 +296,8 @@ margin-bottom: 0 &:hover @include box-shadow(0 0 3px rgba(0,0,0,0.6)) - .oe_dropdown_kanban - display: block + .oe_dropdown_kanban > span + visibility: visible h3 margin: 0 16px 0 0 color: #4c4c4c @@ -363,14 +363,17 @@ position: absolute top: -8px right: 3px - display: none cursor: pointer + > span + visibility: hidden &:hover text-decoration: none .oe_dropdown_menu left: 0 top: 28px min-width: 160px + .oe_dropdown_kanban.oe_opened > span + visibility: visible // }}} // KanbanColorPicker {{{ .oe_kanban_colorpicker