pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web, pos: Lato font assets

Browse Source 
A fonts.less file which contains the definition of Lato was created
in saas-11 and placed in the backend assets. It should have replaced
the lato/stylesheet.css in the common assets.

Also adapt point_of_sale assets to use the same file.
This commit is contained in:
qsm-odoo
2016-05-19 14:36:28 +02:00
parent f2230136bd
commit e503fc80df
3 changed files with 3 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/views/point_of_sale.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<template id="assets" name="point_of_sale assets">
<link rel="stylesheet" href="/web/static/src/fonts/lato/stylesheet.css" />
<link rel="stylesheet" type="text/less" href="/web/static/src/less/fonts.less" />
<link rel="stylesheet" href="/web/static/lib/fontawesome/css/font-awesome.css" />
<link rel="stylesheet" href="/point_of_sale/static/src/css/pos.css" id="pos-stylesheet"/>
<link rel="stylesheet" href="/point_of_sale/static/src/css/keyboard.css" />
addons/web/static/src/fonts/lato/stylesheet.css
-124
View File
@@ -1,124 +0,0 @@
/* Generated by Font Squirrel (http://www.fontsquirrel.com) on May 17, 2013 09:03:53 AM America/New_York */
@font-face {
font-family: 'Lato';
font-weight: 100;
font-style: normal;
src: url('Lato-Hai-webfont.eot');
src: url('Lato-Hai-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-Hai-webfont.woff') format('woff'),
url('Lato-Hai-webfont.ttf') format('truetype'),
url('Lato-Hai-webfont.svg#LatoHairline') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 100;
font-style: italic;
src: url('Lato-HaiIta-webfont.eot');
src: url('Lato-HaiIta-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-HaiIta-webfont.woff') format('woff'),
url('Lato-HaiIta-webfont.ttf') format('truetype'),
url('Lato-HaiIta-webfont.svg#LatoHairlineItalic') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 300;
font-style: normal;
src: url('Lato-Lig-webfont.eot');
src: url('Lato-Lig-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-Lig-webfont.woff') format('woff'),
url('Lato-Lig-webfont.ttf') format('truetype'),
url('Lato-Lig-webfont.svg#LatoLight') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 300;
font-style: italic;
src: url('Lato-LigIta-webfont.eot');
src: url('Lato-LigIta-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-LigIta-webfont.woff') format('woff'),
url('Lato-LigIta-webfont.ttf') format('truetype'),
url('Lato-LigIta-webfont.svg#LatoLightItalic') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 400;
font-style: normal;
src: url('Lato-Reg-webfont.eot');
src: url('Lato-Reg-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-Reg-webfont.woff') format('woff'),
url('Lato-Reg-webfont.ttf') format('truetype'),
url('Lato-Reg-webfont.svg#LatoRegular') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 400;
font-style: italic;
src: url('Lato-RegIta-webfont.eot');
src: url('Lato-RegIta-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-RegIta-webfont.woff') format('woff'),
url('Lato-RegIta-webfont.ttf') format('truetype'),
url('Lato-RegIta-webfont.svg#LatoItalic') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 700;
font-style: normal;
src: url('Lato-Bol-webfont.eot');
src: url('Lato-Bol-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-Bol-webfont.woff') format('woff'),
url('Lato-Bol-webfont.ttf') format('truetype'),
url('Lato-Bol-webfont.svg#LatoBold') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 700;
font-style: italic;
src: url('Lato-BolIta-webfont.eot');
src: url('Lato-BolIta-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-BolIta-webfont.woff') format('woff'),
url('Lato-BolIta-webfont.ttf') format('truetype'),
url('Lato-BolIta-webfont.svg#LatoBoldItalic') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 900;
font-style: normal;
src: url('Lato-Bla-webfont.eot');
src: url('Lato-Bla-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-Bla-webfont.woff') format('woff'),
url('Lato-Bla-webfont.ttf') format('truetype'),
url('Lato-Bla-webfont.svg#LatoBlack') format('svg');
}
@font-face {
font-family: 'Lato';
font-weight: 900;
font-style: italic;
src: url('Lato-BlaIta-webfont.eot');
src: url('Lato-BlaIta-webfont.eot?#iefix') format('embedded-opentype'),
url('Lato-BlaIta-webfont.woff') format('woff'),
url('Lato-BlaIta-webfont.ttf') format('truetype'),
url('Lato-BlaIta-webfont.svg#LatoBlackItalic') format('svg');
}
addons/web/views/webclient_templates.xml
+2 -3
View File
@@ -15,13 +15,13 @@
<link rel="stylesheet" type="text/css" href="/web/static/lib/jquery.ui/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/src/fonts/lato/stylesheet.css" />
<link rel="stylesheet" type="text/less" href="/web/static/src/less/fonts.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/navbar.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/mimetypes.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/animation.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/select2/select2.css"/>
<link rel="stylesheet" type="text/css" href="/web/static/lib/select2-bootstrap-css/select2-bootstrap.css"/>
@@ -87,7 +87,6 @@
<link rel="stylesheet" type="text/less" href="/web/static/src/less/webclient_layout.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/webclient.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/fonts.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/datepicker.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/progress_bar.less"/>
<link rel="stylesheet" type="text/less" href="/web/static/src/less/dropdown.less"/>