From c6dbe9def83153c7c274ef0fa47fe27ef592d3ab Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 16 Sep 2014 14:12:44 +0200
Subject: Use buttons instead of links for "mark as read"

See https://github.com/marienfressinaud/FreshRSS/issues/599
---
 p/themes/base-theme/base.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'p/themes/base-theme/base.css')

diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 76ac37933..b49cd79ea 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -14,7 +14,7 @@ html, body {
 }
 
 /*=== Links */
-a {
+a, button.as-link {
 	outline: none;
 }
 
@@ -255,7 +255,8 @@ a.btn {
 	padding: 0 25px;
 	line-height: 2.5em;
 }
-.dropdown-menu > .item > span {
+.dropdown-menu > .item > span,
+.dropdown-menu > .item > .as-link {
 	padding: 0 25px;
 	line-height: 2em;
 }
-- 
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/base-theme/base.css')

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 fe32d14cfa3fdf056e00f279ac7ddd91a9e082d9 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 24 Sep 2014 14:32:37 +0200
Subject: Fix .as-link appearance in dropdown

Related to https://github.com/marienfressinaud/FreshRSS/issues/633
---
 p/themes/Dark/dark.css               | 2 +-
 p/themes/Flat/flat.css               | 2 +-
 p/themes/Origine/origine.css         | 2 +-
 p/themes/Screwdriver/screwdriver.css | 2 +-
 p/themes/base-theme/base.css         | 2 +-
 p/themes/base-theme/template.css     | 3 +++
 6 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'p/themes/base-theme/base.css')

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index e47415366..10f6e655b 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -340,7 +340,7 @@ a.btn {
 }
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
-	padding: 0 25px;
+	padding: 0 22px;
 	line-height: 2em;
 }
 .dropdown-menu > .item:hover {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 41d03c57d..484cee9f3 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -340,7 +340,7 @@ a.btn {
 }
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
-	padding: 0 25px;
+	padding: 0 22px;
 	line-height: 2em;
 }
 .dropdown-menu > .item:hover {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 6a4ef9699..08fc08379 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -366,7 +366,7 @@ a.btn {
 }
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
-	padding: 0 25px;
+	padding: 0 22px;
 	line-height: 2em;
 }
 .dropdown-menu > .item:hover {
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index c96d4bfe3..37fa18e10 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -394,7 +394,7 @@ a.btn {
 }
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
-	padding: 0 25px;
+	padding: 0 22px;
 	line-height: 2em;
 	color: #ccc;
 }
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 1688a6f79..ccfab10df 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -257,7 +257,7 @@ a.btn {
 }
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link {
-	padding: 0 25px;
+	padding: 0 22px;
 	line-height: 2em;
 }
 .dropdown-menu > .item:hover {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 0f00632ee..dc011503d 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -96,6 +96,7 @@ button.as-link:active {
 	color: inherit;
 	cursor: pointer;
 	font-size: 1.1em;
+	text-align: left;
 }
 
 /*=== Tables */
@@ -199,8 +200,10 @@ a.btn {
 	display: block;
 }
 .dropdown-menu > .item > a,
+.dropdown-menu > .item > .as-link,
 .dropdown-menu > .item > span {
 	display: block;
+	min-width: 200px;
 }
 .dropdown-menu > .item[aria-checked="true"] > a:before {
 	content: '✓';
-- 
cgit v1.2.3