]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Theme: change global font to Roboto and include bold variant 832/head
authorArthurHoaro <arthur@hoa.ro>
Fri, 24 Mar 2017 17:42:55 +0000 (18:42 +0100)
committerArthurHoaro <arthur@hoa.ro>
Fri, 24 Mar 2017 17:49:45 +0000 (18:49 +0100)
Fixes #822

tpl/default/css/shaarli.css
tpl/default/fonts/Fira-Sans-regular.woff [deleted file]
tpl/default/fonts/Fira-Sans-regular.woff2 [deleted file]
tpl/default/fonts/Roboto-Bold.woff [new file with mode: 0644]
tpl/default/fonts/Roboto-Bold.woff2 [new file with mode: 0644]
tpl/default/fonts/Roboto-Regular.woff [new file with mode: 0644]
tpl/default/fonts/Roboto-Regular.woff2 [new file with mode: 0644]

index 8fcd13afdad80956789f8842e329ef1d3ac1233e..73fade5ffa3a4a6570ecb296baa7e51391f0f3df 100644 (file)
@@ -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 (file)
index 014ac31..0000000
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 (file)
index bf3ad9a..0000000
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 (file)
index 0000000..3d86753
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 (file)
index 0000000..bd05e2e
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 (file)
index 0000000..464d206
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 (file)
index 0000000..f966196
Binary files /dev/null and b/tpl/default/fonts/Roboto-Regular.woff2 differ