From 0ef1fd6e4dd55f3626bae585b04b82ad194b8c63 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 17 Sep 2014 22:22:14 +0200
Subject: Style: reduce white space of line breaks in articles

Makes articles a bit more compact.
Plus a generic filter for multiple lines breaks, useful for instance in
LeMonde.fr, which uses <br /><br /><br />
https://github.com/marienfressinaud/FreshRSS/issues/618
---
 p/themes/base-theme/template.css | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'p/themes')

diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index f05ddff4e..2a9deb0ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -458,6 +458,12 @@ a.btn {
 .content pre {
 	overflow: auto;
 }
+br {
+	line-height: 1em;
+}
+br + br + br {
+	display: none;
+}
 
 /*=== Notification and actualize notification */
 .notification {
-- 
cgit v1.2.3


From 7d461779b3a98949122ef8b06357a10941143cb1 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Sep 2014 09:00:41 +0200
Subject: Change color:hover for bigMark

See https://github.com/marienfressinaud/FreshRSS/issues/480
---
 p/themes/Origine/origine.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'p/themes')

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 55ff3fc73..2f7baee7d 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) */
-- 
cgit v1.2.3


From 9a9d7a5a315eb34bb83442c2967fe271d500db89 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Sep 2014 16:22:36 +0200
Subject: Fix alignment of tables

---
 p/themes/Dark/dark.css               | 1 -
 p/themes/Flat/flat.css               | 1 -
 p/themes/Origine/origine.css         | 1 -
 p/themes/Screwdriver/screwdriver.css | 1 -
 p/themes/base-theme/template.css     | 9 +++++++++
 5 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'p/themes')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 669f4ce42..a5c499643 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -872,7 +872,6 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #333;
-	text-align: center;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index a942df0e8..e1cf35954 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -859,7 +859,6 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #ddd;
-	text-align: center;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 2f7baee7d..4195bc260 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -913,7 +913,6 @@ a.btn {
 .stat > table td,
 .stat > table th {
 	border-bottom: 1px solid #ddd;
-	text-align: center;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 1d84753c7..5475d2fd9 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -1025,7 +1025,6 @@ opacity: 1;
 	border-bottom: 1px solid #ccc;
 	background: rgba(255,255,255,0.38);
 	box-shadow: 0 1px #fff;
-	text-align: center;
 }
 
 /*=== LOGS */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 2a9deb0ea..733dd6e02 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 */
-- 
cgit v1.2.3


From 097703f23e6799f9c20d282459c461b0462dc737 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Sep 2014 17:39:07 +0200
Subject: Improve stat design

---
 app/views/stats/idle.phtml           | 19 +++++++++++----
 app/views/stats/index.phtml          | 46 ++++++++++++++++++------------------
 app/views/stats/repartition.phtml    |  8 +++----
 p/themes/Dark/dark.css               | 12 ++++++++++
 p/themes/Flat/flat.css               | 12 ++++++++++
 p/themes/Origine/origine.css         | 12 ++++++++++
 p/themes/Screwdriver/screwdriver.css | 12 ++++++++++
 p/themes/base-theme/base.css         | 12 ++++++++++
 p/themes/base-theme/template.css     |  8 +++++++
 9 files changed, 109 insertions(+), 32 deletions(-)

(limited to 'p/themes')

diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 2ba5237f7..608e2d33c 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -1,6 +1,6 @@
 <?php $this->partial('aside_stats'); ?>
 
-<div class="post content">
+<div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h1><?php echo _t('stats_idle'); ?></h1>
@@ -12,11 +12,20 @@
 		<div class="stat">
 			<h2><?php echo _t($period); ?></h2>
 
-			<ul>
-				<?php foreach ($feeds as $feed) { ?>
-					<li><a href="<?php echo _url('configure', 'feed', 'id', $feed['id']); ?>" title="<?php echo date('Y-m-d', $feed['last_date']); ?>"><?php echo $feed['name']; ?></a></li>
-				<?php } ?>
+			<form id="form-delete" method="post" style="display: none"></form>
+
+			<?php foreach ($feeds as $feed) { ?>
+			<ul class="horizontal-list">
+				<li class="item">
+					<div class="stick">
+						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
+						<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
+						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id']); ?>"><?php echo _t('delete'); ?></button>
+					</div>
+				</li>
+				<li class="item"><span title="<?php echo timestamptodate($feed['last_date'], false); ?>"><?php echo $feed['name']; ?></span></li>
 			</ul>
+			<?php } ?>
 		</div>
 	<?php
 			}
diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml
index a48181fe4..46cdc2a8b 100644
--- a/app/views/stats/index.phtml
+++ b/app/views/stats/index.phtml
@@ -1,11 +1,11 @@
 <?php $this->partial('aside_stats'); ?>
 
-<div class="post content">
+<div class="post">
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t ('back_to_rss_feeds'); ?></a>
-	
+
 	<h1><?php echo _t ('stats_main'); ?></h1>
 
-	<div class="stat">
+	<div class="stat half">
 		<h2><?php echo _t ('stats_entry_repartition'); ?></h2>
 		<table>
 			<thead>
@@ -38,26 +38,9 @@
 				</tr>
 			</tbody>
 		</table>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo _t ('stats_entry_per_day'); ?></h2>
-		<div id="statsEntryPerDay" style="height: 300px"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo _t ('stats_feed_per_category'); ?></h2>
-		<div id="statsFeedPerCategory" style="height: 300px"></div>
-		<div id="statsFeedPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
-		<h2><?php echo _t ('stats_entry_per_category'); ?></h2>
-		<div id="statsEntryPerCategory" style="height: 300px"></div>
-		<div id="statsEntryPerCategoryLegend"></div>
-	</div>
-	
-	<div class="stat">
+	</div><!--
+
+	--><div class="stat half">
 		<h2><?php echo _t ('stats_top_feed'); ?></h2>
 		<table>
 			<thead>
@@ -78,6 +61,23 @@
 			</tbody>
 		</table>
 	</div>
+
+	<div class="stat">
+		<h2><?php echo _t ('stats_entry_per_day'); ?></h2>
+		<div id="statsEntryPerDay" style="height: 300px"></div>
+	</div>
+
+	<div class="stat half">
+		<h2><?php echo _t ('stats_feed_per_category'); ?></h2>
+		<div id="statsFeedPerCategory" style="height: 300px"></div>
+		<div id="statsFeedPerCategoryLegend"></div>
+	</div><!--
+
+	--><div class="stat half">
+		<h2><?php echo _t ('stats_entry_per_category'); ?></h2>
+		<div id="statsEntryPerCategory" style="height: 300px"></div>
+		<div id="statsEntryPerCategoryLegend"></div>
+	</div>
 </div>
 
 <script>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index d9dc4c89d..ead275696 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -1,6 +1,6 @@
 <?php $this->partial('aside_stats'); ?>
 
-<div class="post content">
+<div class="post ">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<h1><?php echo _t('stats_repartition'); ?></h1>
@@ -34,12 +34,12 @@
 		<div id="statsEntryPerHour" style="height: 300px"></div>
 	</div>
 
-	<div class="stat">
+	<div class="stat half">
 		<h2><?php echo _t('stats_entry_per_day_of_week'); ?></h2>
 		<div id="statsEntryPerDayOfWeek" style="height: 300px"></div>
-	</div>
+	</div><!--
 
-	<div class="stat">
+	--><div class="stat half">
 		<h2><?php echo _t('stats_entry_per_month'); ?></h2>
 		<div id="statsEntryPerMonth" style="height: 300px"></div>
 	</div>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index a5c499643..f8051c84a 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -874,6 +874,18 @@ a.btn {
 	border-bottom: 1px solid #333;
 }
 
+.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/Flat/flat.css b/p/themes/Flat/flat.css
index e1cf35954..6f9249ecb 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -861,6 +861,18 @@ a.btn {
 	border-bottom: 1px solid #ddd;
 }
 
+.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/Origine/origine.css b/p/themes/Origine/origine.css
index 4195bc260..208f46265 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -915,6 +915,18 @@ a.btn {
 	border-bottom: 1px solid #ddd;
 }
 
+.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/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 5475d2fd9..c96d4bfe3 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -1027,6 +1027,18 @@ opacity: 1;
 	box-shadow: 0 1px #fff;
 }
 
+.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/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 733dd6e02..0f00632ee 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -541,6 +541,14 @@ br + br + br {
 }
 
 /*=== Statistiques */
+.stat {
+	margin: 15px 0;
+}
+.stat.half {
+	display: inline-block;
+	width: 46%;
+	padding: 0 2%;
+}
 .stat > table {
 	width: 100%;
 }
-- 
cgit v1.2.3


From 2f5304a1f7052bce1315f2ed85141568f0995e7c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 18 Sep 2014 17:44:31 +0200
Subject: Fix width on idle page (stats)

---
 p/themes/Dark/dark.css       | 2 +-
 p/themes/Flat/flat.css       | 2 +-
 p/themes/Origine/origine.css | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'p/themes')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f8051c84a..e47415366 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -883,7 +883,7 @@ a.btn {
 	text-overflow: ellipsis;
 }
 .stat > .horizontal-list .item:first-child {
-	width: 250px;
+	width: 270px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 6f9249ecb..41d03c57d 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -870,7 +870,7 @@ a.btn {
 	text-overflow: ellipsis;
 }
 .stat > .horizontal-list .item:first-child {
-	width: 250px;
+	width: 270px;
 }
 
 /*=== LOGS */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 208f46265..6a4ef9699 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -924,7 +924,7 @@ a.btn {
 	text-overflow: ellipsis;
 }
 .stat > .horizontal-list .item:first-child {
-	width: 250px;
+	width: 270px;
 }
 
 /*=== LOGS */
-- 
cgit v1.2.3