aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-08 04:10:37 -0700
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-10-08 04:10:37 -0700
commit2502e1359c1a81c1f9a1822459c0d904c6a7da43 (patch)
treed91fe9786cff14f0b458c7914d854e5902ea2fe4
parent5188585864949d939b083d87dcea1e310d588a30 (diff)
parent20f00edd1539b18d4d350da27f338f4743fb38b3 (diff)
downloadwallabag-2502e1359c1a81c1f9a1822459c0d904c6a7da43.tar.gz
wallabag-2502e1359c1a81c1f9a1822459c0d904c6a7da43.tar.zst
wallabag-2502e1359c1a81c1f9a1822459c0d904c6a7da43.zip
Merge pull request #273 from jcsaaddupuy/emded-dependencies
Emdeded Roboto webfont
-rw-r--r--themes/default/_head.twig1
-rw-r--r--themes/default/css/style.css11
-rw-r--r--themes/default/fonts/Roboto.woffbin0 -> 22172 bytes
3 files changed, 10 insertions, 2 deletions
diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 247b929e..d0cbd320 100644
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -7,5 +7,4 @@
7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme"> 7 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ theme }}/css/style-{{ theme }}.css" media="all" title="{{ theme }} theme">
8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all"> 8 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print"> 9 <link rel="stylesheet" href="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/css/print.css" media="print">
10 <link href='//fonts.googleapis.com/css?family=Roboto' rel='stylesheet' type='text/css'>
11 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script> 10 <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/jquery-2.0.3.min.js"></script>
diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 3ef9c823..670eb50f 100644
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -1,3 +1,12 @@
1@font-face {
2 font-family: 'Roboto';
3 font-style: normal;
4 font-weight: 400;
5 src: local('Roboto Regular'), local('Roboto-Regular'), url(../fonts/Roboto.woff) format('woff');
6}
7
8
9
1body { 10body {
2 margin: 10px; 11 margin: 10px;
3 font-family: 'Roboto',Verdana,Geneva,sans-serif; 12 font-family: 'Roboto',Verdana,Geneva,sans-serif;
@@ -318,4 +327,4 @@ a.link span,
318a.bad-display span, 327a.bad-display span,
319a.reading-time span { 328a.reading-time span {
320 background-repeat: no-repeat; 329 background-repeat: no-repeat;
321} \ No newline at end of file 330}
diff --git a/themes/default/fonts/Roboto.woff b/themes/default/fonts/Roboto.woff
new file mode 100644
index 00000000..1440b1be
--- /dev/null
+++ b/themes/default/fonts/Roboto.woff
Binary files differ