diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 4fde9d4d075..fc911d88588 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -661,11 +661,11 @@ $colour4: #8a89ba &:hover text-decoration: none .active + width: 100% background: #999 @include box-shadow(0 1px 4px rgba(0,0,0,0.3) inset) - a - color: #fff - text-shadow: 0 1px 2px rgba(0,0,0,0.4) + color: #fff + text-shadow: 0 1px 2px rgba(0,0,0,0.4) // }}} // ViewManager.header {{{ .oe_view_manager_header @@ -730,61 +730,24 @@ $colour4: #8a89ba // }}} // ViewManager.switches {{{ .oe_view_manager_switch - float: right - margin: 2px 0 0 0 - - .oe_vm_switch_form, - .oe_vm_switch_page, - .oe_vm_switch_tree, - .oe_vm_switch_list, - .oe_vm_switch_graph, - .oe_vm_switch_gantt, - .oe_vm_switch_calendar, - .oe_vm_switch_kanban, - .oe_vm_switch_diagram - background: url("/web/static/src/img/views-icons-a.png") repeat-x scroll left top transparent - overflow: hidden - width: 22px - height: 21px - border: none - background-position: 0px 0px - span - display: none - - .oe_vm_switch_list, .oe_vm_switch_tree - background-position: 0px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: 0px -21px - - .oe_vm_switch_form, .oe_vm_switch_page - background-position: -22px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -22px -21px - - .oe_vm_switch_graph - background-position: -44px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -44px -21px - - .oe_vm_switch_gantt - background-position: -66px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -66px -21px - - .oe_vm_switch_calendar - background-position: -88px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -88px -21px - - .oe_vm_switch_kanban - background-position: -110px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: -110px -21px - - .oe_vm_switch_diagram - background-position: 0px 0px - &:active, &:hover, &:focus, &.oe_view_manager_switch_selected - background-position: 0px -21px + li + padding-left: 1px + text-align: center + width: 24px + height: 24px + line-height: 24px + .oe_vm_switch_list:after, .oe_vm_switch_tree:after + content: "ö" + .oe_vm_switch_graph:after + content: "ó" + .oe_vm_switch_gantt:after + content: "y" + .oe_vm_switch_calendar:after + content: "b" + .oe_vm_switch_kanban:after + content: "ó" + .oe_vm_switch_diagram:after + content: "}" // }}} // ViewManager.sidebar {{{ .oe_form_dropdown_section diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.eot b/addons/web/static/src/font/mnmliconsv21-webfont.eot new file mode 100755 index 00000000000..433ebb82e4b Binary files /dev/null and b/addons/web/static/src/font/mnmliconsv21-webfont.eot differ diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.svg b/addons/web/static/src/font/mnmliconsv21-webfont.svg new file mode 100755 index 00000000000..34b20ff992f --- /dev/null +++ b/addons/web/static/src/font/mnmliconsv21-webfont.svg @@ -0,0 +1,149 @@ + + + + +This is a custom SVG webfont generated by Font Squirrel. +Copyright : MIT License +Designer : Carlos Elas +Foundry : Carlos Elias +Foundry URL : httpcarloseliascl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.ttf b/addons/web/static/src/font/mnmliconsv21-webfont.ttf new file mode 100755 index 00000000000..c38e59cf138 Binary files /dev/null and b/addons/web/static/src/font/mnmliconsv21-webfont.ttf differ diff --git a/addons/web/static/src/font/mnmliconsv21-webfont.woff b/addons/web/static/src/font/mnmliconsv21-webfont.woff new file mode 100755 index 00000000000..3ddf14fb814 Binary files /dev/null and b/addons/web/static/src/font/mnmliconsv21-webfont.woff differ diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index bd90c75e748..2e04b189fc4 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -243,7 +243,7 @@ session.web.ViewManager = session.web.OldWidget.extend({ start: function() { this._super(); var self = this; - this.$element.find('.oe_view_manager_switch button').click(function() { + this.$element.find('.oe_view_manager_switch a').click(function() { self.on_mode_switch($(this).data('view-type')); }); var views_ids = {}; @@ -319,9 +319,10 @@ session.web.ViewManager = session.web.OldWidget.extend({ } this.$element - .find('.oe_view_manager_switch button').removeClass('oe_view_manager_switch_selected') - .filter('[data-view-type="' + view_type + '"]') - .addClass('oe_view_manager_switch_selected'); + .find('.oe_view_manager_switch a').parent().removeClass('active') + this.$element + .find('.oe_view_manager_switch a').filter('[data-view-type="' + view_type + '"]') + .parent().addClass('active'); $.when(view_promise).then(function () { _.each(_.keys(self.views), function(view_name) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index aef90bf39b4..818b6f736d8 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -416,13 +416,12 @@
-
+
+