diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 623542a91fc..912a216e038 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -9,6 +9,17 @@
font-style: normal;
}
+@font-face {
+ font-family: "EntypoRegular";
+ src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
+ src: url("/web/static/src/font/entypo-webfont.eot?#iefix") format("embedded-opentype");
+ src: url("/web/static/src/font/entypo-webfont.woff") format("woff");
+ src: url("/web/static/src/font/entypo-webfont.ttf") format("truetype");
+ src: url("/web/static/src/font/entypo-webfont.svg") format("svg") active;
+ font-weight: normal;
+ font-style: normal;
+}
+
.openerp.openerp-web-client-container {
height: 100%;
position: relative;
@@ -93,6 +104,11 @@
font-size: 21px;
font-weight: 300 !important;
}
+.openerp .oe_e {
+ font-family: "entypoRegular" !important;
+ font-size: 34px;
+ font-weight: 300 !important;
+}
.openerp .oe_left {
float: left;
margin-right: 8px;
@@ -1035,29 +1051,34 @@
text-shadow: 0 1px 2px rgba(0, 0, 0, 0.4);
}
.openerp .oe_view_manager_switch li {
- padding-left: 1px;
text-align: center;
width: 24px;
height: 24px;
- line-height: 24px;
+ line-height: 16px;
}
.openerp .oe_view_manager_switch .oe_vm_switch_list:after, .openerp .oe_view_manager_switch .oe_vm_switch_tree:after {
- content: "ö";
+ padding: 2px;
+ content: "i";
}
.openerp .oe_view_manager_switch .oe_vm_switch_graph:after {
- content: "ó";
+ font-family: "mnmliconsRegular" !important;
+ font-size: 21px;
+ font-weight: 300 !important;
+ content: "}";
+ position: relative;
+ top: -2px;
}
.openerp .oe_view_manager_switch .oe_vm_switch_gantt:after {
- content: "y";
+ content: "c";
}
.openerp .oe_view_manager_switch .oe_vm_switch_calendar:after {
- content: "b";
+ content: "P";
}
.openerp .oe_view_manager_switch .oe_vm_switch_kanban:after {
- content: "ó";
+ content: "k";
}
.openerp .oe_view_manager_switch .oe_vm_switch_diagram:after {
- content: "}";
+ content: "f";
}
.openerp .oe_form_dropdown_section {
position: relative;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 3f36930c22d..c736505c481 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -16,6 +16,16 @@ $colour4: #8a89ba
font-weight: normal
font-style: normal
+@font-face
+ font-family: 'EntypoRegular'
+ src: url('/web/static/src/font/entypo-webfont.eot') format('eot')
+ src: url('/web/static/src/font/entypo-webfont.eot?#iefix') format('embedded-opentype')
+ src: url('/web/static/src/font/entypo-webfont.woff') format('woff')
+ src: url('/web/static/src/font/entypo-webfont.ttf') format('truetype')
+ src: url('/web/static/src/font/entypo-webfont.svg') format('svg') active
+ font-weight: normal
+ font-style: normal
+
@mixin vertical-gradient($startColor: #555, $endColor: #333)
background-color: $startColor
background-image: -webkit-gradient(linear, left top, left bottom, from($startColor), to($endColor)) /* Saf4+, Chrome */
@@ -123,6 +133,10 @@ $colour4: #8a89ba
font-family: "mnmliconsRegular" !important
font-size: 21px
font-weight: 300 !important
+ .oe_e
+ font-family: "entypoRegular" !important
+ font-size: 34px
+ font-weight: 300 !important
.oe_left
float: left
margin-right: 8px
@@ -810,23 +824,40 @@ $colour4: #8a89ba
// ViewManager.switches {{{
.oe_view_manager_switch
li
- padding-left: 1px
text-align: center
width: 24px
height: 24px
- line-height: 24px
+ line-height: 16px
.oe_vm_switch_list:after, .oe_vm_switch_tree:after
- content: "ö"
+ padding: 2px
+ content: "i"
.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
+ font-family: "mnmliconsRegular" !important
+ font-size: 21px
+ font-weight: 300 !important
content: "}"
+ position: relative
+ top: -2px
+ .oe_vm_switch_gantt:after
+ content: "c"
+ .oe_vm_switch_calendar:after
+ content: "P"
+ .oe_vm_switch_kanban:after
+ content: "k"
+ .oe_vm_switch_diagram:after
+ content: "f"
+ //.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/entypo-webfont.eot b/addons/web/static/src/font/entypo-webfont.eot
new file mode 100755
index 00000000000..2c09f336d57
Binary files /dev/null and b/addons/web/static/src/font/entypo-webfont.eot differ
diff --git a/addons/web/static/src/font/entypo-webfont.svg b/addons/web/static/src/font/entypo-webfont.svg
new file mode 100755
index 00000000000..c24d92adb5f
--- /dev/null
+++ b/addons/web/static/src/font/entypo-webfont.svg
@@ -0,0 +1,198 @@
+
+
+
\ No newline at end of file
diff --git a/addons/web/static/src/font/entypo-webfont.ttf b/addons/web/static/src/font/entypo-webfont.ttf
new file mode 100755
index 00000000000..89b7a194cc7
Binary files /dev/null and b/addons/web/static/src/font/entypo-webfont.ttf differ
diff --git a/addons/web/static/src/font/entypo-webfont.woff b/addons/web/static/src/font/entypo-webfont.woff
new file mode 100755
index 00000000000..3879f5b811e
Binary files /dev/null and b/addons/web/static/src/font/entypo-webfont.woff differ
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 2219479b17b..3af02f392ec 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -423,26 +423,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-