1
0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-27 11:22:17 -05:00

Merge pull request #273 from jcsaaddupuy/emded-dependencies

Emdeded Roboto webfont
This commit is contained in:
Nicolas Lœuillet 2013-10-08 04:10:37 -07:00
commit 2502e1359c
3 changed files with 10 additions and 2 deletions

View File

@ -7,5 +7,4 @@
<link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
<link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
<link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
<link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
<script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>

View File

@ -1,3 +1,12 @@
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
}
body { body {
margin: 10px; margin: 10px;
font-family: 'Roboto',Verdana,Geneva,sans-serif; font-family: 'Roboto',Verdana,Geneva,sans-serif;
@ -318,4 +327,4 @@ a.link span,
a.bad-display span, a.bad-display span,
a.reading-time span { a.reading-time span {
background-repeat: no-repeat; background-repeat: no-repeat;
} }

Binary file not shown.