From ad5c75706637136ab83f52115c3108460aca6f96 Mon Sep 17 00:00:00 2001
From: ArthurHoaro <arthur@hoa.ro>
Date: Fri, 24 Mar 2017 18:42:55 +0100
Subject: Theme: change global font to Roboto and include bold variant

Fixes #822
---
 tpl/default/css/shaarli.css               |  31 +++++++++++++++++++-----------
 tpl/default/fonts/Fira-Sans-regular.woff  | Bin 17100 -> 0 bytes
 tpl/default/fonts/Fira-Sans-regular.woff2 | Bin 13836 -> 0 bytes
 tpl/default/fonts/Roboto-Bold.woff        | Bin 0 -> 89584 bytes
 tpl/default/fonts/Roboto-Bold.woff2       | Bin 0 -> 63320 bytes
 tpl/default/fonts/Roboto-Regular.woff     | Bin 0 -> 89732 bytes
 tpl/default/fonts/Roboto-Regular.woff2    | Bin 0 -> 63412 bytes
 7 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100644 tpl/default/fonts/Fira-Sans-regular.woff
 delete mode 100644 tpl/default/fonts/Fira-Sans-regular.woff2
 create mode 100644 tpl/default/fonts/Roboto-Bold.woff
 create mode 100644 tpl/default/fonts/Roboto-Bold.woff2
 create mode 100644 tpl/default/fonts/Roboto-Regular.woff
 create mode 100644 tpl/default/fonts/Roboto-Regular.woff2

(limited to 'tpl')

diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css
index 8fcd13af..73fade5f 100644
--- a/tpl/default/css/shaarli.css
+++ b/tpl/default/css/shaarli.css
@@ -35,14 +35,29 @@ pre {
 }
 
 @font-face {
-    font-family: 'Roboto Slab';
+    font-family: 'Roboto';
     font-weight: 400;
     font-style: normal;
     src:
-    local('Fira Sans'),
-    local('Fira-Sans-regular'),
-    url('../fonts/Fira-Sans-regular.woff2') format('woff2'),
-    url('../fonts/Fira-Sans-regular.woff') format('woff');
+    local('Roboto'),
+    local('Roboto-Regular'),
+    url('../fonts/Roboto-Regular.woff2') format('woff2'),
+    url('../fonts/Roboto-Regular.woff') format('woff');
+}
+
+@font-face {
+    font-family: 'Roboto';
+    font-weight: 700;
+    font-style: normal;
+    src:
+    local('Roboto'),
+    local('Roboto-Bold'),
+    url('../fonts/Roboto-Bold.woff2') format('woff2'),
+    url('../fonts/Roboto-Bold.woff') format('woff');
+}
+
+body, .pure-g [class*="pure-u"] {
+    font-family: Roboto, Arial, sans-serif;
 }
 
 /**
@@ -68,10 +83,6 @@ pre {
     .pure-u-xl-visible { display: inline-block !important; }
 }
 
-.pure-g [class*="pure-u"]{
-    font-family: Roboto Slab, Arial, sans-serif;
-}
-
 /**
  * Make pure-extras alert closable.
  */
@@ -504,7 +515,6 @@ pre {
     color: #252525;
     text-decoration: none;
     vertical-align: middle;
-    font-family: Roboto Slab, Arial, sans-serif;
 }
 
 .linklist-item-title .linklist-link {
@@ -560,7 +570,6 @@ pre {
 .linklist-item-description {
     position: relative;
     padding: 10px;
-    font-family: Roboto Slab, Arial, sans-serif;
     word-wrap: break-word;
     color: #252525;
     line-height: 1.3em;
diff --git a/tpl/default/fonts/Fira-Sans-regular.woff b/tpl/default/fonts/Fira-Sans-regular.woff
deleted file mode 100644
index 014ac317..00000000
Binary files a/tpl/default/fonts/Fira-Sans-regular.woff and /dev/null differ
diff --git a/tpl/default/fonts/Fira-Sans-regular.woff2 b/tpl/default/fonts/Fira-Sans-regular.woff2
deleted file mode 100644
index bf3ad9a4..00000000
Binary files a/tpl/default/fonts/Fira-Sans-regular.woff2 and /dev/null differ
diff --git a/tpl/default/fonts/Roboto-Bold.woff b/tpl/default/fonts/Roboto-Bold.woff
new file mode 100644
index 00000000..3d86753b
Binary files /dev/null and b/tpl/default/fonts/Roboto-Bold.woff differ
diff --git a/tpl/default/fonts/Roboto-Bold.woff2 b/tpl/default/fonts/Roboto-Bold.woff2
new file mode 100644
index 00000000..bd05e2ea
Binary files /dev/null and b/tpl/default/fonts/Roboto-Bold.woff2 differ
diff --git a/tpl/default/fonts/Roboto-Regular.woff b/tpl/default/fonts/Roboto-Regular.woff
new file mode 100644
index 00000000..464d2062
Binary files /dev/null and b/tpl/default/fonts/Roboto-Regular.woff differ
diff --git a/tpl/default/fonts/Roboto-Regular.woff2 b/tpl/default/fonts/Roboto-Regular.woff2
new file mode 100644
index 00000000..f9661967
Binary files /dev/null and b/tpl/default/fonts/Roboto-Regular.woff2 differ
-- 
cgit v1.2.3