Merge branch 'master' of github.com:webnotes/erpnext

This commit is contained in:
Anand Doshi 2012-05-28 19:06:34 +05:30
commit 27437742c4
3 changed files with 14 additions and 0 deletions

View File

@ -3335,6 +3335,13 @@ div.appframe-toolbar {
src: local('Cookie-Regular'), url('fonts/cookie.woff') format('woff');
}
@font-face {
font-family: 'Marck Script';
font-style: normal;
font-weight: 400;
src: local('Marck Script'), local('MarckScript-Regular'), url('fonts/marckscript.woff') format('woff');
}
/*
* lib/js/lib/Aristo/aristo.selected.css

View File

@ -2330,6 +2330,13 @@ div.dialog_row table td textarea {
src: local('Cookie-Regular'), url('fonts/cookie.woff') format('woff');
}
@font-face {
font-family: 'Marck Script';
font-style: normal;
font-weight: 400;
src: local('Marck Script'), local('MarckScript-Regular'), url('fonts/marckscript.woff') format('woff');
}
/*
* lib/css/ui/list.css

Binary file not shown.