Merge branch 'dev' into emded-dependencies

diff --git a/themes/default/_head.twig b/themes/default/_head.twig
index 247b929eb390f3be02cc3b926f723482e79bd609..d0cbd320be6688ef509893eace178bbc15486ab5 100644 (file)
--- a/themes/default/_head.twig
+++ b/themes/default/_head.twig
@@ -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/{{ constant('DEFAULT_THEME') }}/css/messages.css" media="all">
         <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>

diff --git a/themes/default/css/style.css b/themes/default/css/style.css
index 3ef9c8236d43d2110c2d6f3f7371a23e38ad44d8..670eb50f4966581e6d0ffca4110343a11ce639e5 100644 (file)
--- a/themes/default/css/style.css
+++ b/themes/default/css/style.css
@@ -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 {
     margin: 10px;
     font-family: 'Roboto',Verdana,Geneva,sans-serif;
@@ -318,4 +327,4 @@ a.link span,
 a.bad-display span,
 a.reading-time span {
     background-repeat: no-repeat;
-}
\ No newline at end of file
+}

diff --git a/themes/default/fonts/Roboto.woff b/themes/default/fonts/Roboto.woff
new file mode 100644 (file)
index 0000000..1440b1b
Binary files /dev/null and b/themes/default/fonts/Roboto.woff differ