Merge pull request #1549 from FreshRSS/dev1.7.0

Version 1.7.0

2 files changed, 5 insertions, 7 deletions

diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 192a957c9..1bf73d8b3 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 */
@@ -251,14 +251,11 @@ a.btn {
 }
 .dropdown-menu > .item {
 }
-.dropdown-menu > .item > a {
-	padding: 0 25px;
-	line-height: 2.5em;
-}
+.dropdown-menu > .item > a,
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
 	padding: 0 22px;
-	line-height: 2em;
+	line-height: 2.5em;
 }
 .dropdown-menu > .item:hover {
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index cc36c3ffa..277bb61b2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -88,6 +88,7 @@ input.extend:focus {
 input, select, textarea {
 	display: inline-block;
 	max-width: 100%;
+	font-size: 0.8rem;
 }
 input[type="radio"],
 input[type="checkbox"] {
@@ -345,7 +346,7 @@ a.btn {
 /*=== Tree */
 .tree {
 	margin: 0;
-	padding: 0;
+	padding: 0 0 15em 0;
 	list-style: none;
 	text-align: left;
 }