diff --git a/addons/board/static/src/css/dashboard.css b/addons/board/static/src/css/dashboard.css index 02304107fc2..2b708ff5bf7 100644 --- a/addons/board/static/src/css/dashboard.css +++ b/addons/board/static/src/css/dashboard.css @@ -117,14 +117,15 @@ .openerp .oe_dashboard .oe_action .oe_content { padding: 0 12px 12px 12px; } -.openerp .oe_dashboard .oe_action .oe_content .oe-view-manager-views { - position: relative; -} .openerp .oe_dashboard .oe_action .oe_content .oe-view-manager { display: block; } .openerp .oe_dashboard .oe_action .oe_content .oe-view-manager-content { display: block; + position: static; +} +.openerp .oe_dashboard .oe_action .oe_content .oe-view-manager-view-kanban { + position: static; } .openerp .oe_dashboard .oe_action .oe_content .oe_list_content > thead { border-bottom: 1px; diff --git a/addons/board/static/src/css/dashboard.sass b/addons/board/static/src/css/dashboard.sass index f412b1d3aa1..1b3e023dcf1 100644 --- a/addons/board/static/src/css/dashboard.sass +++ b/addons/board/static/src/css/dashboard.sass @@ -100,12 +100,13 @@ height: 16px !important .oe_content padding: 0 12px 12px 12px - .oe-view-manager-views - position: relative .oe-view-manager display: block .oe-view-manager-content display: block + position: static + .oe-view-manager-view-kanban + position: static .oe_list_content > thead border-bottom: 1px diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7e3e78d27fb..6478289f2b3 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -839,10 +839,10 @@ .openerp .oe_leftbar .oe_footer { background: #f0eeee; text-align: center; + flex-shrink: 0; } .openerp .oe_leftbar .oe_footer a { font-weight: bold; - color: black; } .openerp .oe_leftbar .oe_footer a span { color: #a24689; @@ -970,6 +970,7 @@ } .openerp .oe_application { height: 100%; + width: 100%; flex-grow: 1; } .openerp .oe-view-manager { @@ -980,6 +981,8 @@ } .openerp .oe-view-manager .oe-view-manager-content { overflow: auto; + flex-grow: 1; + position: relative; } .openerp .oe-view-manager .oe-view-manager-debug { margin-right: 5px; @@ -999,6 +1002,12 @@ .openerp .oe-view-manager-header .dropdown-menu li a { padding: 3px 25px; } +.openerp .oe-view-manager-header .dropdown-menu .oe_searchview_custom_public a:after { + font-family: FontAwesome; + content: ""; + color: #666; + margin-left: 3px; +} .openerp .oe-view-manager-header .selected { display: block; } @@ -1368,7 +1377,7 @@ margin-left: -21px; cursor: pointer; } -.openerp .oe-search-options span.fa-trash-o { +.openerp .oe-search-options span.remove-filter { position: absolute; top: 6px; right: 10px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 1047548984b..531ef54512c 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -737,9 +737,9 @@ $sheet-padding: 16px .oe_footer background: #f0eeee text-align: center + flex-shrink: 0 a font-weight: bold - color: black span color: #a24689 // }}} @@ -845,6 +845,7 @@ $sheet-padding: 16px text-decoration: underline .oe_application height: 100% + width: 100% flex-grow: 1 // }}} // ViewManager common {{{ @@ -855,6 +856,8 @@ $sheet-padding: 16px flex-direction: column .oe-view-manager-content overflow: auto + flex-grow: 1 + position: relative .oe-view-manager-debug margin-right: 5px .oe-view-manager-header @@ -870,6 +873,12 @@ $sheet-padding: 16px position: relative a padding: 3px 25px + .oe_searchview_custom_public + a:after + font-family: FontAwesome + content: "\f0c0" + color: #666 + margin-left: 3px .selected display: block a @@ -1161,7 +1170,7 @@ $sheet-padding: 16px .fa-calendar margin-left: -21px cursor: pointer - span.fa-trash-o + span.remove-filter position: absolute top: 6px right: 10px diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 416e64697e2..8c495fe7480 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1742,7 +1742,7 @@ instance.web.search.FavoriteMenu = instance.web.Widget.extend({ this.$filters[key].addClass(filter.user_id ? 'oe_searchview_custom_private' : 'oe_searchview_custom_public') $('') - .addClass('fa fa-trash-o') + .addClass('fa fa-trash-o remove-filter') .click(function (event) { event.stopImmediatePropagation(); self.remove_filter(filter, $filter, key); diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index e20f6440376..09da8ce2990 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -1,6 +1,14 @@ +.oe-view-manager-view-kanban { + position: absolute; + top: 0; + bottom: 0; + left: 0; + right: 0; +} + .openerp .oe_kanban_view { background: white; - height: inherit; + height: 100%; } .openerp .oe_kanban_view .oe_kanban_column_higlight { background: #eeddf6 !important; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 9c95d452bf5..ca5a1382156 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -46,11 +46,17 @@ transition: $transition // }}} +.oe-view-manager-view-kanban + position: absolute + top: 0 + bottom: 0 + left: 0 + right: 0 .openerp .oe_kanban_view // KanbanView {{{ //background: url(data:image/pngbase64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAAECAYAAACp8Z5+AAAAKElEQVQIHWP8DwTv379nAAFBQUEGhnfv3oHEwADEZgJLIRGMIClkLQCr3x2Htp/lLwAAAABJRU5ErkJggg==) background: white - height: inherit + height: 100% .oe_kanban_column_higlight background: #eeddf6 !important .oe_view_nocontent