Merge branch 'dev' into statistics

Conflicts:
	p/themes/Dark/freshrss.css
	p/themes/Flat/freshrss.css
	p/themes/Origine/freshrss.css

3 files changed, 62 insertions, 76 deletions

diff --git a/p/themes/Dark/freshrss.css b/p/themes/Dark/freshrss.css
index 98c742c89..e54a0eadd 100644
--- a/p/themes/Dark/freshrss.css
+++ b/p/themes/Dark/freshrss.css
@@ -876,47 +876,42 @@ input.extend {
 	}
 }
 
-.stat{
+.stat {
 	border:1px solid #2f2f2f;
 	border-radius:10px;
-	margin: 10px 0;
+	margin:10px 0;
+	padding:0 5px;
 }
-.stat h2{
+.stat > h2 {
 	border-bottom:1px solid #2f2f2f;
-	margin:0;
+	margin:0 -5px;
 	padding-left:5px;
 }
-.stat h2 + *{
-	margin:5px;
+.stat > div {
+	margin:5px 0;
 }
-.stat h2 + div + div{
-	margin:0 5px 5px 5px;
-}
-.stat h2 + table{
+.stat > table {
 	border-collapse:collapse;
-	width:calc(100% - 10px);
-}
-.stat h2 + table th{
-	padding:5px;
+	margin:5px 0;
+	width:100%;
 }
-.stat h2 + table td{
-	padding:5px;
-}
-.stat h2 + table td.numeric{
-	text-align:center;
-}
-.stat h2 + table thead th{
+.stat > table > thead > tr {
 	border-bottom:2px solid #2f2f2f;
 }
-.stat h2 + table tbody tr *{
+.stat > table > tbody > tr {
 	border-bottom:1px solid #2f2f2f;
 }
-.stat h2 + table tbody tr:last-child *{
+.stat > table > tbody > tr:last-child {
 	border-bottom:0;
 }
-.stat h2 + table tr *{
+.stat > table th, .stat > table td {
 	border-left:2px solid #2f2f2f;
+	padding:5px;
 }
-.stat h2 + table tr *:first-child{
+.stat > table th:first-child, .stat > table td:first-child {
 	border-left:0;
-}
\ No newline at end of file
+}
+.stat > table td.numeric{
+	margin:5px 0;
+	text-align:center;
+}
diff --git a/p/themes/Flat/freshrss.css b/p/themes/Flat/freshrss.css
index f0ebe2300..19f5967ea 100644
--- a/p/themes/Flat/freshrss.css
+++ b/p/themes/Flat/freshrss.css
@@ -843,47 +843,43 @@ input.extend {
 	}
 }
 
-.stat{
+.stat {
 	border:1px solid #aaa;
 	border-radius:10px;
-	margin: 10px 0;
+	box-shadow:2px 2px 5px #aaa;
+	margin:10px 0;
+	padding:0 5px;
 }
-.stat h2{
+.stat > h2 {
 	border-bottom:1px solid #aaa;
-	margin:0;
+	margin:0 -5px;
 	padding-left:5px;
 }
-.stat h2 + *{
-	margin:5px;
+.stat > div {
+	margin:5px 0;
 }
-.stat h2 + div + div{
-	margin:0 5px 5px 5px;
-}
-.stat h2 + table{
+.stat > table {
 	border-collapse:collapse;
-	width:calc(100% - 10px);
-}
-.stat h2 + table th{
-	padding:5px;
-}
-.stat h2 + table td{
-	padding:5px;
+	margin:5px 0;
+	width:100%;
 }
-.stat h2 + table td.numeric{
-	text-align:center;
-}
-.stat h2 + table thead th{
+.stat > table > thead > tr {
 	border-bottom:2px solid #aaa;
 }
-.stat h2 + table tbody tr *{
+.stat > table > tbody > tr {
 	border-bottom:1px solid #aaa;
 }
-.stat h2 + table tbody tr:last-child *{
+.stat > table > tbody > tr:last-child {
 	border-bottom:0;
 }
-.stat h2 + table tr *{
+.stat > table th, .stat > table td {
 	border-left:2px solid #aaa;
+	padding:5px;
 }
-.stat h2 + table tr *:first-child{
+.stat > table th:first-child, .stat > table td:first-child {
 	border-left:0;
+}
+.stat > table td.numeric{
+	margin:5px 0;
+	text-align:center;
 }
\ No newline at end of file
diff --git a/p/themes/Origine/freshrss.css b/p/themes/Origine/freshrss.css
index fb8abb0b6..85a23140c 100644
--- a/p/themes/Origine/freshrss.css
+++ b/p/themes/Origine/freshrss.css
@@ -899,48 +899,43 @@ input.extend {
 	}
 }
 
-.stat{
+.stat {
 	border:1px solid #aaa;
 	border-radius:10px;
 	box-shadow:2px 2px 5px #aaa;
-	margin: 10px 0;
+	margin:10px 0;
+	padding:0 5px;
 }
-.stat h2{
+.stat > h2 {
 	border-bottom:1px solid #aaa;
-	margin:0;
+	margin:0 -5px;
 	padding-left:5px;
 }
-.stat h2 + *{
-	margin:5px;
+.stat > div {
+	margin:5px 0;
 }
-.stat h2 + div + div{
-	margin:0 5px 5px 5px;
-}
-.stat h2 + table{
+.stat > table {
 	border-collapse:collapse;
-	width:calc(100% - 10px);
-}
-.stat h2 + table th{
-	padding:5px;
-}
-.stat h2 + table td{
-	padding:5px;
+	margin:5px 0;
+	width:100%;
 }
-.stat h2 + table td.numeric{
-	text-align:center;
-}
-.stat h2 + table thead th{
+.stat > table > thead > tr {
 	border-bottom:2px solid #aaa;
 }
-.stat h2 + table tbody tr *{
+.stat > table > tbody > tr {
 	border-bottom:1px solid #aaa;
 }
-.stat h2 + table tbody tr:last-child *{
+.stat > table > tbody > tr:last-child {
 	border-bottom:0;
 }
-.stat h2 + table tr *{
+.stat > table th, .stat > table td {
 	border-left:2px solid #aaa;
+	padding:5px;
 }
-.stat h2 + table tr *:first-child{
+.stat > table th:first-child, .stat > table td:first-child {
 	border-left:0;
+}
+.stat > table td.numeric{
+	margin:5px 0;
+	text-align:center;
 }
\ No newline at end of file