]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #473 from nsteinmetz/dev
authorNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 20 Feb 2014 07:27:54 +0000 (08:27 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Thu, 20 Feb 2014 07:27:54 +0000 (08:27 +0100)
Baggy Theme - PtSans font is now local

themes/baggy/_head.twig
themes/baggy/css/font.css
themes/baggy/font/ptsans.woff [new file with mode: 0644]

index 0079b228d8489d7281637765af6f04815597492e..206d5aae6d72c61b7dc8551a3abb6a0fdc97f0a2 100644 (file)
@@ -2,7 +2,6 @@
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
\ No newline at end of file
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ec6621585df6c4b07803ee4a6c18a274d581d0d7 100755 (executable)
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'PT Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
+}
diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff
new file mode 100644 (file)
index 0000000..cf7c62e
Binary files /dev/null and b/themes/baggy/font/ptsans.woff differ