diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 986539e5555..db152e391ad 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -950,10 +950,8 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } -.openerp .oe_application { - width: 100%; -} .openerp .oe_application a { + width: 100%; color: #8a89ba; } .openerp .oe_application a:hover { @@ -1158,7 +1156,7 @@ .openerp .oe_searchview input, .openerp .oe_searchview textarea { padding: 3px; height: 14px; - font-size: 11px; + font-size: 12px; line-height: 18px; } .openerp .oe_searchview.oe_focused { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 389490bcd0a..85d22c20809 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -363,7 +363,6 @@ $colour4: #8a89ba border-right: 4px solid transparent border-top: 4px solid#404040 @include opacity(0.5) - .oe_sidebar white-space: nowrap .oe_dropdown_menu @@ -755,8 +754,8 @@ $colour4: #8a89ba // }}} // ActionManager {{{ .oe_application - width: 100% a + width: 100% color: $colour4 &:hover text-decoration: underline @@ -917,7 +916,7 @@ $colour4: #8a89ba input, textarea padding: 3px height: 14px - font-size: 11px + font-size: 12px line-height: 18px &.oe_focused border-color: $facets-border-selected diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 41fcbe5f00d..3bc5b57eee4 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -15,24 +15,40 @@ .openerp .oe_kanban_view .oe_kanban_clear { clear: both; } +.openerp .oe_kanban_view .oe_kanban_content .oe_star_on, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off { + color: #cccccc; + text-shadow: 0 0 2px black; + vertical-align: top; + position: relative; + top: -5px; +} +.openerp .oe_kanban_view .oe_kanban_content .oe_star_on:hover, .openerp .oe_kanban_view .oe_kanban_content .oe_star_off:hover { + text-decoration: none; +} +.openerp .oe_kanban_view .oe_kanban_content .oe_star_on { + color: gold; +} .openerp .oe_kanban_view .oe_kanban_content div:first-child { margin-right: 12px; } +.openerp .oe_kanban_view .oe_kanban_button_new { + color: white; + background: #dc5f59; +} .openerp .oe_kanban_view .oe_kanban_groups { height: inherit; width: 100%; } .openerp .oe_kanban_view .oe_kanban_group_title { - margin: 1px 1px 4px; - padding-left: 2px; - font-size: 100%; + margin-bottom: 4px; + font-size: 16px; font-weight: bold; color: #333333; text-shadow: 0 1px 0 white; } .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header { vertical-align: top; - padding: 6px 7px 6px 6px; + padding: 6px 7px 0 6px; } .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { background: #f0eeee; @@ -92,20 +108,19 @@ height: 16px; background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat; } -.openerp .oe_kanban_view .oe_kanban_group_folded .oe_kanban_fold_icon { - background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat; -} -.openerp .oe_kanban_view .oe_kanban_add { +.openerp .oe_kanban_view .oe_kanban_add, .openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_toggle { + float: right; + margin-left: 4px; cursor: pointer; - position: absolute; - top: 6px; - right: 6px; - width: 16px; - height: 16px; - background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat; + position: relative; + top: -8px; } .openerp .oe_kanban_view .oe_kanban_quick_create { overflow: hidden; + margin-bottom: 4px; +} +.openerp .oe_kanban_view .oe_kanban_quick_create_buttons { + margin: 4px 0; } .openerp .oe_kanban_view .oe_kanban_no_group .oe_kanban_quick_create { width: 200px; @@ -113,12 +128,10 @@ } .openerp .oe_kanban_view .oe_kanban_quick_create input { display: block; + font-size: 13px; box-sizing: border-box; width: 100%; } -.openerp .oe_kanban_view .oe_kanban_quick_create button { - float: right; -} .openerp .oe_kanban_view .oe_kanban_vignette { padding: 8px; min-height: 100px; @@ -335,6 +348,9 @@ .openerp .oe_kanban_view .oe_kanban_card h3:hover { text-decoration: none; } +.openerp .oe_kanban_view .oe_kanban_card .oe_dropdown_kanban { + margin-top: 4px; +} .openerp .oe_kanban_view .oe_kanban_star { float: left; position: inline-block; @@ -377,9 +393,8 @@ background-image: radial-gradient(#ee7777 0%, #cc3333 40%, #bb0808 100%); } .openerp .oe_kanban_view .oe_kanban_text_red { - background: #a61300; - color: white; - padding: 2px 4px; + color: #a61300; + font-weight: bold; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 7d08265cfa7..3eef049959f 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -33,24 +33,36 @@ .oe_kanban_clear clear: both .oe_kanban_content + .oe_star_on, .oe_star_off + color: #ccc + text-shadow: 0 0 2px black + vertical-align: top + position: relative + top: -5px + &:hover + text-decoration: none + .oe_star_on + color: gold div:first-child margin-right: 12px + .oe_kanban_button_new + color: white + background: #DC5F59 // }}} // KanbanGroups {{{ .oe_kanban_groups height: inherit width: 100% .oe_kanban_group_title - margin: 1px 1px 4px - padding-left: 2px - font-size: 100% + margin-bottom: 4px + font-size: 16px font-weight: bold color: #333333 text-shadow: 0 1px 0 white .oe_kanban_column, .oe_kanban_group_header vertical-align: top - padding: 6px 7px 6px 6px + padding: 6px 7px 0 6px .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header background: #f0eeee @@ -103,30 +115,32 @@ height: 16px background: url(/web_kanban/static/src/img/minus-icon.png) no-repeat .oe_kanban_group_folded .oe_kanban_fold_icon - background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat // }}} // KanbanQuickCreate {{{ - .oe_kanban_add + .oe_kanban_add, .oe_kanban_header .oe_dropdown_toggle + float: right + margin-left: 4px cursor: pointer - position: absolute - top: 6px - right: 6px - width: 16px - height: 16px - background: url(/web_kanban/static/src/img/plus-icon.png) no-repeat + position: relative + top: -8px + //right: 6px + //width: 16px + //height: 16px + .oe_kanban_quick_create - // apply block formatting context overflow: hidden + margin-bottom: 4px + .oe_kanban_quick_create_buttons + margin: 4px 0 .oe_kanban_no_group .oe_kanban_quick_create width: 200px padding: 10px .oe_kanban_quick_create input display: block // margins within width + font-size: 13px box-sizing: border-box width: 100% - .oe_kanban_quick_create button - float: right // }}} // KanbanRecords {{{ .oe_kanban_vignette @@ -288,6 +302,8 @@ text-decoration: none h3:hover text-decoration: none + .oe_dropdown_kanban + margin-top: 4px .oe_kanban_star float: left position: inline-block @@ -311,9 +327,8 @@ background: red @include radial-gradient((#ee7777 0%, #cc3333 40%, #bb0808 100%)) .oe_kanban_text_red - background: #A61300 - color: white - padding: 2px 4px + color: #A61300 + font-weight: bold @include radius(4px) .oe_kanban_ellipsis overflow: hidden diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 6811953465d..e9479b27429 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -258,7 +258,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ scroll: false }); } else { - this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle'); + this.$element.find('.oe_kanban_draghandle').removeClass('oe_kanban_draghandle').removeClass('oe_kanban_card'); } }, on_record_moved : function(record, old_group, old_index, new_group, new_index) { @@ -592,7 +592,7 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ // If no draghandle is found, make the whole card as draghandle if (!this.$element.find('.oe_kanban_draghandle').length) { - this.$element.children(':first').addClass('oe_kanban_draghandle'); + this.$element.children(':first').addClass('oe_kanban_draghandle').addClass('oe_kanban_card'); } this.$element.find('.oe_kanban_action').click(function() { diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index b50c2910e3c..4ae39003a50 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -13,7 +13,7 @@
- @@ -23,9 +23,16 @@
-
+
+ í + +
-
+
]