From 02898a6c0f599f7998efc1dd71743880d86e5da7 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 20 Jun 2012 15:59:31 +0200 Subject: [PATCH] [WIP] Kanban dropdown bzr revid: fme@openerp.com-20120620135931-32of1kgyjb1otj12 --- addons/web/static/src/css/base.css | 8 ++-- addons/web/static/src/css/base.sass | 5 +-- addons/web_kanban/static/src/css/kanban.css | 44 +++----------------- addons/web_kanban/static/src/css/kanban.sass | 37 ++++------------ 4 files changed, 19 insertions(+), 75 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6bc652ecab7..91c8b311d4f 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -383,13 +383,13 @@ -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3); } -.openerp .oe_cropdown_menu li { +.openerp .oe_cropdown_menu > li { list-style-type: none; float: none; display: block; position: relative; } -.openerp .oe_cropdown_menu li:hover { +.openerp .oe_cropdown_menu > li:hover { background-color: #f0f0fa; background-image: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); background-image: -webkit-linear-gradient(top, #f0f0fa, #eeeef6); @@ -401,14 +401,14 @@ -webkit-box-shadow: none; box-shadow: none; } -.openerp .oe_cropdown_menu li a { +.openerp .oe_cropdown_menu > li > a { white-space: nowrap; display: block; padding: 3px 6px; color: #4c4c4c; text-decoration: none; } -.openerp .oe_cropdown_menu li a:hover { +.openerp .oe_cropdown_menu > li > a:hover { text-decoration: none; } .openerp .oe_cropdown_arrow:after { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index dee67590e07..03eae6097a4 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -331,7 +331,7 @@ $colour4: #8a89ba text-align: left @include radius(3px) @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - li + > li &:hover @include vertical-gradient(#f0f0fa, #eeeef6) @include box-shadow(none) @@ -339,7 +339,7 @@ $colour4: #8a89ba float: none display: block position: relative - a + > a white-space: nowrap display: block padding: 3px 6px @@ -649,7 +649,6 @@ $colour4: #8a89ba padding: 0 4px 0 4px .oe_systray float: right - // }}} // Menu {{{ .oe_menu diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index a3a5481dcff..3d73e528c84 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -322,7 +322,7 @@ -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_kanban_menuaction { +.openerp .oe_kanban_view .oe_kanban_card:hover .oe_cropdown_kanban { display: block; } .openerp .oe_kanban_view .oe_kanban_card h3 { @@ -383,56 +383,24 @@ text-overflow: ellipsis; white-space: nowrap; } -.openerp .oe_kanban_view a.oe_kanban_menuaction { +.openerp .oe_kanban_view .oe_cropdown_kanban { position: absolute; - top: 0px; + top: -8px; right: 3px; display: none; color: #4c4c4c; cursor: pointer; } -.openerp .oe_kanban_view a.oe_kanban_menuaction:hover { +.openerp .oe_kanban_view .oe_cropdown_kanban:hover { text-decoration: none; } -.openerp .oe_kanban_view .oe_kanban_menu { - display: none; - position: absolute; - top: 30px; +.openerp .oe_kanban_view .oe_cropdown_kanban .oe_cropdown_menu { right: -140px; - padding: 8px; - border: 1px solid #afafb6; min-width: 160px; - overflow-x: hidden; - z-index: 900; - background: white; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - -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); -} -.openerp .oe_kanban_view .oe_kanban_menu p { - margin-left: 12px; -} -.openerp .oe_kanban_view .oe_kanban_menu > li > a { - display: block; - padding: 3px 6px; - line-height: 14px; - color: #4c4c4c; - text-decoration: none; -} -.openerp .oe_kanban_view .oe_kanban_menu > li > a:hover { - background: #f0f0fa; - background: -moz-linear-gradient(#f0f0fa, #eeeef6); - background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)); - background: -webkit-linear-gradient(#f0f0fa, #eeeef6); - -moz-box-shadow: none; - -webkit-box-shadow: none; - -box-shadow: none; } .openerp .oe_kanban_view .oe_kanban_colorpicker { padding: 3px 6px; + white-space: nowrap; } .openerp .oe_kanban_view .oe_kanban_colorpicker li { float: left; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index b3fa9059768..842e011e1cd 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -277,7 +277,7 @@ margin-bottom: 0 &:hover @include box-shadow(0 0 3px rgba(0,0,0,0.6)) - .oe_kanban_menuaction + .oe_cropdown_kanban display: block h3 margin: 0 16px 0 0 @@ -316,46 +316,23 @@ white-space: nowrap // }}} // KanbanDropDown {{{ - a.oe_kanban_menuaction + .oe_cropdown_kanban position: absolute - top: 0px + top: -8px right: 3px display: none color: #4c4c4c cursor: pointer &:hover text-decoration: none - .oe_kanban_menu - display: none - position: absolute - top: 30px - right: -140px - padding: 4px - border: 1px solid #afafb6 - min-width: 160px - overflow-x: hidden - z-index: 900 - background: white - @include radius(3px) - @include box-shadow(0 1px 4px rgba(0,0,0,0.3)) - p - margin-left: 12px - > li > a - display: block - padding: 3px 6px - line-height: 14px - color: #4c4c4c - text-decoration: none - > li > a:hover - background: #f0f0fa - background: -moz-linear-gradient(#f0f0fa, #eeeef6) - background: -webkit-gradient(linear, left top, left bottom, from(#f0f0fa), to(#eeeef6)) - background: -webkit-linear-gradient(#f0f0fa, #eeeef6) - @include box-shadow(none) + .oe_cropdown_menu + right: -140px + min-width: 160px // }}} // KanbanColorPicker {{{ .oe_kanban_colorpicker padding: 3px 6px + white-space: nowrap .oe_kanban_colorpicker li float: left a