diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-03-24 18:42:55 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-03-24 18:49:45 +0100 |
commit | ad5c75706637136ab83f52115c3108460aca6f96 (patch) | |
tree | 1e86a9ed1de4e098b98a3c1486aa9397d64e351f /tpl/default | |
parent | bae74cb292833a4482b3a42b78c020b7f97b7ffd (diff) | |
download | Shaarli-ad5c75706637136ab83f52115c3108460aca6f96.tar.gz Shaarli-ad5c75706637136ab83f52115c3108460aca6f96.tar.zst Shaarli-ad5c75706637136ab83f52115c3108460aca6f96.zip |
Theme: change global font to Roboto and include bold variant
Fixes #822
Diffstat (limited to 'tpl/default')
-rw-r--r-- | tpl/default/css/shaarli.css | 31 | ||||
-rw-r--r-- | tpl/default/fonts/Fira-Sans-regular.woff | bin | 17100 -> 0 bytes | |||
-rw-r--r-- | tpl/default/fonts/Fira-Sans-regular.woff2 | bin | 13836 -> 0 bytes | |||
-rw-r--r-- | tpl/default/fonts/Roboto-Bold.woff | bin | 0 -> 89584 bytes | |||
-rw-r--r-- | tpl/default/fonts/Roboto-Bold.woff2 | bin | 0 -> 63320 bytes | |||
-rw-r--r-- | tpl/default/fonts/Roboto-Regular.woff | bin | 0 -> 89732 bytes | |||
-rw-r--r-- | tpl/default/fonts/Roboto-Regular.woff2 | bin | 0 -> 63412 bytes |
7 files changed, 20 insertions, 11 deletions
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 { | |||
35 | } | 35 | } |
36 | 36 | ||
37 | @font-face { | 37 | @font-face { |
38 | font-family: 'Roboto Slab'; | 38 | font-family: 'Roboto'; |
39 | font-weight: 400; | 39 | font-weight: 400; |
40 | font-style: normal; | 40 | font-style: normal; |
41 | src: | 41 | src: |
42 | local('Fira Sans'), | 42 | local('Roboto'), |
43 | local('Fira-Sans-regular'), | 43 | local('Roboto-Regular'), |
44 | url('../fonts/Fira-Sans-regular.woff2') format('woff2'), | 44 | url('../fonts/Roboto-Regular.woff2') format('woff2'), |
45 | url('../fonts/Fira-Sans-regular.woff') format('woff'); | 45 | url('../fonts/Roboto-Regular.woff') format('woff'); |
46 | } | ||
47 | |||
48 | @font-face { | ||
49 | font-family: 'Roboto'; | ||
50 | font-weight: 700; | ||
51 | font-style: normal; | ||
52 | src: | ||
53 | local('Roboto'), | ||
54 | local('Roboto-Bold'), | ||
55 | url('../fonts/Roboto-Bold.woff2') format('woff2'), | ||
56 | url('../fonts/Roboto-Bold.woff') format('woff'); | ||
57 | } | ||
58 | |||
59 | body, .pure-g [class*="pure-u"] { | ||
60 | font-family: Roboto, Arial, sans-serif; | ||
46 | } | 61 | } |
47 | 62 | ||
48 | /** | 63 | /** |
@@ -68,10 +83,6 @@ pre { | |||
68 | .pure-u-xl-visible { display: inline-block !important; } | 83 | .pure-u-xl-visible { display: inline-block !important; } |
69 | } | 84 | } |
70 | 85 | ||
71 | .pure-g [class*="pure-u"]{ | ||
72 | font-family: Roboto Slab, Arial, sans-serif; | ||
73 | } | ||
74 | |||
75 | /** | 86 | /** |
76 | * Make pure-extras alert closable. | 87 | * Make pure-extras alert closable. |
77 | */ | 88 | */ |
@@ -504,7 +515,6 @@ pre { | |||
504 | color: #252525; | 515 | color: #252525; |
505 | text-decoration: none; | 516 | text-decoration: none; |
506 | vertical-align: middle; | 517 | vertical-align: middle; |
507 | font-family: Roboto Slab, Arial, sans-serif; | ||
508 | } | 518 | } |
509 | 519 | ||
510 | .linklist-item-title .linklist-link { | 520 | .linklist-item-title .linklist-link { |
@@ -560,7 +570,6 @@ pre { | |||
560 | .linklist-item-description { | 570 | .linklist-item-description { |
561 | position: relative; | 571 | position: relative; |
562 | padding: 10px; | 572 | padding: 10px; |
563 | font-family: Roboto Slab, Arial, sans-serif; | ||
564 | word-wrap: break-word; | 573 | word-wrap: break-word; |
565 | color: #252525; | 574 | color: #252525; |
566 | line-height: 1.3em; | 575 | 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 --- a/tpl/default/fonts/Fira-Sans-regular.woff +++ /dev/null | |||
Binary files 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 --- a/tpl/default/fonts/Fira-Sans-regular.woff2 +++ /dev/null | |||
Binary files differ | |||
diff --git a/tpl/default/fonts/Roboto-Bold.woff b/tpl/default/fonts/Roboto-Bold.woff new file mode 100644 index 00000000..3d86753b --- /dev/null +++ b/tpl/default/fonts/Roboto-Bold.woff | |||
Binary files differ | |||
diff --git a/tpl/default/fonts/Roboto-Bold.woff2 b/tpl/default/fonts/Roboto-Bold.woff2 new file mode 100644 index 00000000..bd05e2ea --- /dev/null +++ b/tpl/default/fonts/Roboto-Bold.woff2 | |||
Binary files differ | |||
diff --git a/tpl/default/fonts/Roboto-Regular.woff b/tpl/default/fonts/Roboto-Regular.woff new file mode 100644 index 00000000..464d2062 --- /dev/null +++ b/tpl/default/fonts/Roboto-Regular.woff | |||
Binary files differ | |||
diff --git a/tpl/default/fonts/Roboto-Regular.woff2 b/tpl/default/fonts/Roboto-Regular.woff2 new file mode 100644 index 00000000..f9661967 --- /dev/null +++ b/tpl/default/fonts/Roboto-Regular.woff2 | |||
Binary files differ | |||