aboutsummaryrefslogtreecommitdiff
path: root/p
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-05-26 12:19:41 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-05-26 12:19:41 +0200
commite12f9d4a98f3e95cea6e9506c2517984e6100b1f (patch)
tree52f36d728f922f54bb99addde2c2acd3a077e87d /p
parentd4d2c62b529b774aa3dcfc98bb9ff135e5f185c3 (diff)
parentb848511574d52ca34c91dfacc7ff0e0059b083a6 (diff)
Merge remote-tracking branch 'FreshRSS/dev' into dev
Diffstat (limited to 'p')
-rw-r--r--p/themes/BlueLagoon/BlueLagoon.css2
-rw-r--r--p/themes/Dark/dark.css2
-rw-r--r--p/themes/Flat/flat.css2
-rw-r--r--p/themes/Origine-compact/origine-compact.css2
-rw-r--r--p/themes/Origine/origine.css2
-rw-r--r--p/themes/Pafat/pafat.css2
-rw-r--r--p/themes/Screwdriver/screwdriver.css2
-rw-r--r--p/themes/base-theme/base.css2
8 files changed, 8 insertions, 8 deletions
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index 27bae5404..17f6003d1 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
font-size: 92%;
}
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f72ed8b5b..85c67807c 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #1c1c1c;
color: #888;
}
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 0672c6a38..2292a078f 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
}
diff --git a/p/themes/Origine-compact/origine-compact.css b/p/themes/Origine-compact/origine-compact.css
index 87d04e93e..d1c37cc96 100644
--- a/p/themes/Origine-compact/origine-compact.css
+++ b/p/themes/Origine-compact/origine-compact.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
}
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index da461087b..bb1cf3a1f 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
}
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index abe808eab..8a0bf57a7 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
color : #666;
}
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 9dbe523a1..03ef45fa9 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
background: #fafafa;
font-size: 92%;
}
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 192a957c9..e20d0b621 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -10,7 +10,7 @@
/*============*/
html, body {
height: 100%;
- font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", sans-serif;
+ font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
}
/*=== Links */