Merge branch 'dev' of https://github.com/marienfressinaud/FreshRSS into dev

6 files changed, 85 insertions, 6 deletions

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 669f4ce42..e47415366 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -872,7 +872,18 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #333;
-	text-align: center;
+}
+
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 270px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index a942df0e8..41d03c57d 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -859,7 +859,18 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #ddd;
-	text-align: center;
+}
+
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 270px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 55ff3fc73..6a4ef9699 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -808,12 +808,12 @@ a.btn {
 	background: #fafafa;
 }
 #bigMarkAsRead:hover {
-	color: #27ae60;
+	color: #0062be;
 	background: #fff;
 	box-shadow: 0 -5px 10px #eee inset;
 }
 #bigMarkAsRead:hover .bigTick {
-	text-shadow: 0 0 5px #27ae60;
+	text-shadow: 0 0 5px #0062be;
 }
 
 /*=== Navigation menu (for articles) */
@@ -913,7 +913,18 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #ddd;
-	text-align: center;
+}
+
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 270px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 1d84753c7..c96d4bfe3 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -1025,7 +1025,18 @@ opacity: 1;
 	border-bottom: 1px solid #ccc;
 	background: rgba(255,255,255,0.38);
 	box-shadow: 0 1px #fff;
-	text-align: center;
+}
+
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 250px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index b49cd79ea..1688a6f79 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -678,6 +678,18 @@ a.btn {
 	text-align: center;
 }
 
+.stat > .horizontal-list {
+	margin: 0 0 5px;
+}
+.stat > .horizontal-list .item {
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.stat > .horizontal-list .item:first-child {
+	width: 250px;
+}
+
 /*=== LOGS */
 /*=========*/
 .logs {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f05ddff4e..0f00632ee 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -98,6 +98,15 @@ button.as-link:active {
 	font-size: 1.1em;
 }
 
+/*=== Tables */
+table {
+	max-width: 100%;
+}
+th.numeric,
+td.numeric {
+	text-align: center;
+}
+
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
@@ -458,6 +467,12 @@ a.btn {
 .content pre {
 	overflow: auto;
 }
+br {
+	line-height: 1em;
+}
+br + br + br {
+	display: none;
+}
 
 /*=== Notification and actualize notification */
 .notification {
@@ -526,6 +541,14 @@ a.btn {
 }
 
 /*=== Statistiques */
+.stat {
+	margin: 15px 0;
+}
+.stat.half {
+	display: inline-block;
+	width: 46%;
+	padding: 0 2%;
+}
 .stat > table {
 	width: 100%;
 }