From 0d5a1f3a659b6f407b47859c794a662075e3f48e Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 30 Sep 2014 19:45:49 +0200
Subject: Improve design of .box

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 p/themes/base-theme/base.css | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(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 ccfab10df..3f6ae956d 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -329,6 +329,30 @@ a.btn {
 	font-size: 0;
 }
 
+/*=== Boxes */
+.box {
+}
+.box .box-title {
+	margin: 0;
+	padding: 5px 10px;
+}
+.box .box-content {
+	max-height: 260px;
+}
+
+.box .box-content .item {
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 2.5em;
+}
+
+.box .box-content .item .configure {
+	visibility: hidden;
+}
+.box .box-content .item:hover .configure {
+	visibility: visible;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
-- 
cgit v1.2.3


From e37a126b9de20a11f306d29c8f3d5052eb4310dd Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 22 Oct 2014 23:41:36 +0200
Subject: Fix some parts of aside_flux

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_flux.phtml      | 37 ++++++++++++++++++------
 p/themes/base-theme/base.css     | 16 +++++++++++
 p/themes/base-theme/template.css | 61 ++++++++++++++++++++--------------------
 3 files changed, 75 insertions(+), 39 deletions(-)

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

diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
index e572e9d48..30f362348 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_flux.phtml
@@ -1,4 +1,13 @@
-<div class="aside aside-flux" id="aside-flux">
+<?php
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
 	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
@@ -14,24 +23,36 @@
 
 	<ul class="tree">
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _i('all'), ' ', _t('main_stream'); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+			</div>
 		</li>
 
 		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _i('bookmark'), ' ', _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			<div class="tree-folder-title">
+				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			</div>
 		</li>
 
 		<?php
 			foreach ($this->categories as $cat) {
 				$feeds = $cat->feeds();
 				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('c_' . $cat->id()) ? ' active' : ''; ?>">
-			<a class="tree-folder-title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _i('category'), ' ', $cat->name(); ?></a>
+		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
 
-			<ul class="items">
-				<?php foreach ($feeds as $feed) { ?>
-				<li class="item<?php echo FreshRSS_Context::isCurrentGet('f_' . $feed->id()) ? ' active' : ''; ?>">
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+				<?php
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 					<div class="dropdown">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 3f6ae956d..3b79a0822 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -353,6 +353,22 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1.2rem;
+	font-weight: bold;
+}
+.tree-folder-items .item {
+	padding: 0 5px 0 20px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1a96f1e2f..1eb67c15d 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -325,6 +325,26 @@ a.btn {
 	cursor: grab;
 }
 
+/*=== Tree */
+.tree {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-title {
+	display: block;
+}
+.tree-folder-items {
+	padding: 0;
+	list-style: none;
+}
+.tree-folder-items .item {
+	display: block;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -371,52 +391,31 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	list-style: none;
-	margin: 0;
-}
-.state_unread li:not(.active)[data-unread="0"] {
+.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"],
+.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.category {
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.category .btn:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds {
-	width: 100%;
-	list-style: none;
-}
-.categories .feeds:not(.active) {
+.aside_flux .tree-folder-items:not(.active) {
 	display: none;
 }
-.categories .feeds .feed {
-	display: inline-block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	vertical-align: middle;
-}
-.categories .feeds .feed:not([data-unread="0"]):before {
+.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-.categories .feeds .dropdown-menu {
+.aside_flux .tree-folder-items .dropdown-menu {
 	left: 0;
 }
-.categories .feeds .item .dropdown-toggle > .icon {
+.aside_flux .tree-folder-items .item .dropdown-toggle > .icon {
 	visibility: hidden;
 	cursor: pointer;
-	vertical-align: top;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon {
 	visibility: visible;
 }
 
-- 
cgit v1.2.3


From 8c1789ae060000638c563e05ee42eb9b5b1c4fe0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 09:26:00 +0200
Subject: Begin fixing of Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css | 35 ++++++++++++++++++++++-------------
 p/themes/base-theme/base.css | 16 ++++------------
 2 files changed, 26 insertions(+), 25 deletions(-)

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

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index b25deab0c..c46f72bf8 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -498,6 +498,22 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1.2rem;
+	font-weight: bold;
+}
+.tree-folder-items .item {
+	padding: 0 5px 0 20px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -538,28 +554,21 @@ a.btn {
 }
 .aside.aside_flux {
 	padding: 10px 0 50px;
+	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
+.aside.aside_flux .tree {
 	text-align: left;
 }
-.category .btn:first-child {
+.aside_flux .tree-folder-title {
 	position: relative;
-	width: 213px;
-}
-.category.stick .btn:first-child {
-	width: 176px;
+	margin: 5px 0;
 }
-.category .btn:first-child:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
-	padding: 1px 5px;
+	padding: 0 5px;
 	background: #ccc;
 	color: #fff;
 	border: 1px solid #bbb;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 3b79a0822..bd01a5d70 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -404,25 +404,17 @@ a.btn {
 }
 .aside.aside_flux {
 	padding: 10px 0 50px;
+	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
+.aside.aside_flux .tree {
 	text-align: left;
 }
-.category .btn:first-child {
+.aside_flux .tree-folder-title {
 	position: relative;
-	width: 213px;
-}
-.category.stick .btn:first-child {
-	width: 176px;
 }
-.category .btn:first-child:not([data-unread="0"]):after {
+.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
-- 
cgit v1.2.3


From 8769931a68d0dddb134674c86a43dec75b39bf83 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 09:32:02 +0200
Subject: Rename aside_flux in aside_feed.

---
 app/layout/aside_feed.phtml      | 95 ++++++++++++++++++++++++++++++++++++++++
 app/layout/aside_flux.phtml      | 95 ----------------------------------------
 app/layout/nav_menu.phtml        |  2 +-
 app/views/index/normal.phtml     |  2 +-
 p/scripts/main.js                | 26 +++++------
 p/themes/Origine/origine.css     |  8 ++--
 p/themes/base-theme/base.css     |  8 ++--
 p/themes/base-theme/template.css | 22 +++++-----
 8 files changed, 129 insertions(+), 129 deletions(-)
 create mode 100644 app/layout/aside_feed.phtml
 delete mode 100644 app/layout/aside_flux.phtml

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

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
new file mode 100644
index 000000000..66b7b51af
--- /dev/null
+++ b/app/layout/aside_feed.phtml
@@ -0,0 +1,95 @@
+<?php
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
+
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
+	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
+
+	<?php if (FreshRSS_Auth::hasAccess()) { ?>
+	<div class="stick configure-feeds">
+		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
+		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
+	</div>
+	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
+	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
+	<?php } ?>
+
+	<form id="mark-read-aside" method="post" style="display: none"></form>
+
+	<ul class="tree">
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
+			</div>
+		</li>
+
+		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
+			</div>
+		</li>
+
+		<?php
+			foreach ($this->categories as $cat) {
+				$feeds = $cat->feeds();
+				if (!empty($feeds)) {
+					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
+					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
+					                        FreshRSS_Context::$current_get['feed']);
+		?>
+		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+			<div class="tree-folder-title">
+				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
+			</div>
+
+			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
+				<?php
+					foreach ($feeds as $feed) {
+						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
+				?>
+				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
+					<div class="dropdown">
+						<div class="dropdown-target"></div>
+						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
+						<?php /* feed_config_template */ ?>
+					</div>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
+					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+				</li>
+				<?php } ?>
+			</ul>
+		</li>
+		<?php
+				}
+			}
+		?>
+	</ul>
+</div>
+
+<script id="feed_config_template" type="text/html">
+	<ul class="dropdown-menu">
+		<li class="dropdown-close"><a href="#close">❌</a></li>
+		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
+		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
+		<?php } ?>
+		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
+		<?php if (FreshRSS_Auth::hasAccess()) { ?>
+		<li class="separator"></li>
+		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
+		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
+		<li class="item">
+			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
+			<button class="read_all as-link <?php echo $confirm; ?>"
+			        form="mark-read-aside"
+			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
+			        type="submit"><?php echo _t('mark_read'); ?></button>
+		</li>
+		<?php } ?>
+	</ul>
+</script>
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_flux.phtml
deleted file mode 100644
index 30f362348..000000000
--- a/app/layout/aside_flux.phtml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-	$class = '';
-	if (FreshRSS_Context::$conf->hide_read_feeds &&
-			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
-			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
-		$class = ' state_unread';
-	}
-?>
-
-<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
-	<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
-
-	<?php if (FreshRSS_Auth::hasAccess()) { ?>
-	<div class="stick configure-feeds">
-		<a class="btn btn-important" href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('subscription_management'); ?></a>
-		<a class="btn btn-important" href="<?php echo _url('importExport', 'index'); ?>"><?php echo _i('import'); ?></a>
-	</div>
-	<?php } elseif (Minz_Configuration::needsLogin()) { ?>
-	<a href="<?php echo _url('index', 'about'); ?>"><?php echo _t('about_freshrss'); ?></a>
-	<?php } ?>
-
-	<form id="mark-read-aside" method="post" style="display: none"></form>
-
-	<ul class="tree">
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('a') ? ' active' : ''; ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('all'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_unread); ?>" href="<?php echo _url('index', 'index'); ?>"><?php echo _t('main_stream'); ?></a>
-			</div>
-		</li>
-
-		<li class="tree-folder<?php echo FreshRSS_Context::isCurrentGet('s') ? ' active' : ''; ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('bookmark'); ?> <a data-unread="<?php echo format_number(FreshRSS_Context::$total_starred['unread']); ?>" href="<?php echo _url('index', 'index', 'get', 's'); ?>"><?php echo _t('favorite_feeds', format_number(FreshRSS_Context::$total_starred['all'])); ?></a>
-			</div>
-		</li>
-
-		<?php
-			foreach ($this->categories as $cat) {
-				$feeds = $cat->feeds();
-				if (!empty($feeds)) {
-					$c_active = FreshRSS_Context::isCurrentGet('c_' . $cat->id());
-					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
-					                        FreshRSS_Context::$current_get['feed']);
-		?>
-		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
-			<div class="tree-folder-title">
-				<?php echo _i('category'); ?> <a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
-			</div>
-
-			<ul class="tree-folder-items<?php echo $c_show ? ' active' : ''; ?>">
-				<?php
-					foreach ($feeds as $feed) {
-						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
-				?>
-				<li class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
-					<div class="dropdown">
-						<div class="dropdown-target"></div>
-						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
-						<?php /* feed_config_template */ ?>
-					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
-				</li>
-				<?php } ?>
-			</ul>
-		</li>
-		<?php
-				}
-			}
-		?>
-	</ul>
-</div>
-
-<script id="feed_config_template" type="text/html">
-	<ul class="dropdown-menu">
-		<li class="dropdown-close"><a href="#close">❌</a></li>
-		<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'f_!!!!!!'); ?>"><?php echo _t('filter'); ?></a></li>
-		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="item"><a href="<?php echo _url('stats', 'repartition', 'id', '!!!!!!'); ?>"><?php echo _t('stats'); ?></a></li>
-		<?php } ?>
-		<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
-		<?php if (FreshRSS_Auth::hasAccess()) { ?>
-		<li class="separator"></li>
-		<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
-		<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
-		<li class="item">
-			<?php $confirm = FreshRSS_Context::$conf->reading_confirm ? 'confirm' : ''; ?>
-			<button class="read_all as-link <?php echo $confirm; ?>"
-			        form="mark-read-aside"
-			        formaction="<?php echo _url('entry', 'read', 'get', 'f_!!!!!!'); ?>"
-			        type="submit"><?php echo _t('mark_read'); ?></button>
-		</li>
-		<?php } ?>
-	</ul>
-</script>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 2c9f8724d..6f555c3d0 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -2,7 +2,7 @@
 
 <div class="nav_menu">
 	<?php if ($actual_view === 'normal') { ?>
-	<a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+	<a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
 	<?php } ?>
 
 	<?php if (FreshRSS_Auth::hasAccess()) { ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 36adef2f2..02d621bd0 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -1,6 +1,6 @@
 <?php
 
-$this->partial('aside_flux');
+$this->partial('aside_feed');
 $this->partial('nav_menu');
 
 if (!empty($this->entries)) {
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 1e13ff16a..f4b3898db 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -80,7 +80,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: all
 	if (feed_priority > 0) {
-		elem = $('#aside_flux .all').children(':first').get(0);
+		elem = $('#aside_feed .all').children(':first').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -89,7 +89,7 @@ function incUnreadsFeed(article, feed_id, nb) {
 
 	//Update unread: favourites
 	if (article && article.closest('div').hasClass('favorite')) {
-		elem = $('#aside_flux .favorites').children(':first').get(0);
+		elem = $('#aside_feed .favorites').children(':first').get(0);
 		if (elem) {
 			feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			elem.setAttribute('data-unread', numberFormat(feed_unreads + nb));
@@ -202,7 +202,7 @@ function mark_favorite(active) {
 		}
 
 		if (active.closest('div').hasClass('not_read')) {
-			var elem = $('#aside_flux .favorites').children(':first').get(0),
+			var elem = $('#aside_feed .favorites').children(':first').get(0),
 				feed_unreads = elem ? str2int(elem.getAttribute('data-unread')) : 0;
 			if (elem) {
 				elem.setAttribute('data-unread', numberFormat(feed_unreads + inc));
@@ -292,7 +292,7 @@ function next_entry() {
 }
 
 function prev_feed() {
-	var active_feed = $("#aside_flux .feeds li.active");
+	var active_feed = $("#aside_feed .feeds li.active");
 	if (active_feed.length > 0) {
 		active_feed.prevAll(':visible:first').find('a.feed').each(function(){this.click();});
 	} else {
@@ -301,7 +301,7 @@ function prev_feed() {
 }
 
 function next_feed() {
-	var active_feed = $("#aside_flux .feeds li.active");
+	var active_feed = $("#aside_feed .feeds li.active");
 	if (active_feed.length > 0) {
 		active_feed.nextAll(':visible:first').find('a.feed').each(function(){this.click();});
 	} else {
@@ -310,21 +310,21 @@ function next_feed() {
 }
 
 function first_feed() {
-	var feed = $("#aside_flux .feeds.active li:visible:first");
+	var feed = $("#aside_feed .feeds.active li:visible:first");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function last_feed() {
-	var feed = $("#aside_flux .feeds.active li:visible:last");
+	var feed = $("#aside_feed .feeds.active li:visible:last");
 	if (feed.length > 0) {
 		feed.find('a')[1].click();
 	}
 }
 
 function prev_category() {
-	var active_cat = $("#aside_flux .category.stick.active");
+	var active_cat = $("#aside_feed .category.stick.active");
 
 	if (active_cat.length > 0) {
 		var prev_cat = active_cat.parent('li').prevAll(':visible:first').find('.category.stick a.btn');
@@ -338,7 +338,7 @@ function prev_category() {
 }
 
 function next_category() {
-	var active_cat = $("#aside_flux .category.stick.active");
+	var active_cat = $("#aside_feed .category.stick.active");
 
 	if (active_cat.length > 0) {
 		var next_cat = active_cat.parent('li').nextAll(':visible:first').find('.category.stick a.btn');
@@ -352,14 +352,14 @@ function next_category() {
 }
 
 function first_category() {
-	var cat = $("#aside_flux .category.stick:visible:first");
+	var cat = $("#aside_feed .category.stick:visible:first");
 	if (cat.length > 0) {
 		cat.find('a.btn')[0].click();
 	}
 }
 
 function last_category() {
-	var cat = $("#aside_flux .category.stick:visible:last");
+	var cat = $("#aside_feed .category.stick:visible:last");
 	if (cat.length > 0) {
 		cat.find('a.btn')[0].click();
 	}
@@ -487,7 +487,7 @@ function init_column_categories() {
 	if (context['current_view'] !== 'normal') {
 		return;
 	}
-	$('#aside_flux').on('click', '.category>a.dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.category>a.dropdown-toggle', function () {
 		$(this).children().each(function() {
 			if (this.alt === '▽') {
 				this.src = this.src.replace('/icons/down.', '/icons/up.');
@@ -500,7 +500,7 @@ function init_column_categories() {
 		$(this).parent().next(".feeds").slideToggle();
 		return false;
 	});
-	$('#aside_flux').on('click', '.feeds .dropdown-toggle', function () {
+	$('#aside_feed').on('click', '.feeds .dropdown-toggle', function () {
 		if ($(this).nextAll('.dropdown-menu').length === 0) {
 			var feed_id = $(this).closest('li').attr('id').substr(2),
 				feed_web = $(this).data('fweb'),
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index c46f72bf8..e6d50c2e9 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -552,20 +552,20 @@ a.btn {
 	border-right: 1px solid #aaa;
 	background: #fff;
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	padding: 10px 0 50px;
 	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.aside.aside_flux .tree {
+.aside.aside_feed .tree {
 	text-align: left;
 }
-.aside_flux .tree-folder-title {
+.aside_feed .tree-folder-title {
 	position: relative;
 	margin: 5px 0;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 0 5px;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index bd01a5d70..0b0a04c9a 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -402,19 +402,19 @@ a.btn {
 }
 .aside {
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	padding: 10px 0 50px;
 	text-align: center;
 }
 
 /*=== Aside main page (categories) */
-.aside.aside_flux .tree {
+.aside.aside_feed .tree {
 	text-align: left;
 }
-.aside_flux .tree-folder-title {
+.aside_feed .tree-folder-title {
 	position: relative;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1eb67c15d..40ff8140a 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -386,36 +386,36 @@ a.btn {
 	width: 250px;
 	vertical-align: top;
 }
-.aside.aside_flux {
+.aside.aside_feed {
 	background: #fff;
 }
 
 /*=== Aside main page (categories) */
-.aside_flux.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_flux.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
+.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
 	display: none;
 }
-.aside_flux .tree-folder-title > a:not([data-unread="0"]):after {
+.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
 	content: attr(data-unread);
 }
 
 /*=== Aside main page (feeds) */
-.aside_flux .tree-folder-items:not(.active) {
+.aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_flux .tree-folder-items .item > a:not([data-unread="0"]):before {
+.aside_feed .tree-folder-items .item > a:not([data-unread="0"]):before {
 	content: "(" attr(data-unread) ") ";
 }
-.aside_flux .tree-folder-items .dropdown-menu {
+.aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
-.aside_flux .tree-folder-items .item .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-toggle > .icon {
 	visibility: hidden;
 	cursor: pointer;
 }
-.aside_flux .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.aside_flux .tree-folder-items .item:hover .dropdown-toggle > .icon,
-.aside_flux .tree-folder-items .item.active .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	visibility: visible;
 }
 
-- 
cgit v1.2.3


From 0c8b55fc1317cff28de1f270ada0a75b4de074ac Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:07:53 +0200
Subject: First iteration to update all the themes

See See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_feed.phtml          |  2 +-
 p/themes/Dark/dark.css               | 97 ++++++++++++++++++++++++++++++++----
 p/themes/Flat/flat.css               | 95 +++++++++++++++++++++++++++++++----
 p/themes/Origine/origine.css         |  2 +
 p/themes/Pafat/pafat.css             | 95 +++++++++++++++++++++++++++++++----
 p/themes/Screwdriver/screwdriver.css | 94 +++++++++++++++++++++++++++++++---
 p/themes/base-theme/base.css         | 90 +++++++++++++++++++--------------
 p/themes/base-theme/template.css     |  5 +-
 8 files changed, 400 insertions(+), 80 deletions(-)

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

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 1480173b2..12beba3a1 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -59,7 +59,7 @@
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f3790614e..d00fdcbd3 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -464,6 +464,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -500,10 +536,46 @@ a.btn {
 	border-right: 1px solid #333;
 	background: #1c1c1c;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	border-right: 1px solid #333;
-	background: #1c1c1c;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -963,17 +1035,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #111;
-		border-left: 1px solid #333;
 		border-bottom: 1px solid #333;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index e2151b1f9..a1129771a 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -473,6 +473,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -508,9 +544,46 @@ a.btn {
 .aside {
 	background: #ecf0f1;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #ecf0f1;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -961,15 +1034,19 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 32px;
-		height: 32px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 		background: #34495e;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7f60a1ec5..b4465a717 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -584,10 +584,12 @@ a.btn {
 .aside.aside_feed {
 	padding: 10px 0;
 	text-align: center;
+	background: #fff;
 }
 .aside.aside_feed .tree {
 	position: sticky;
 	top: 0;
+	margin: 10px 0 50px;
 }
 
 /*=== Aside main page (categories) */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 28b17e15f..ed19aa5db 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -520,6 +520,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -572,8 +608,46 @@ a.btn {
 	border-right: 1px solid #aaa;
 	background: #fff;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1056,17 +1130,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #f6f6f6;
-		border-left: 1px solid #ddd;
 		border-bottom: 1px solid #ddd;
-		border-radius: 0 0 0 5px;
+	}
+
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
 	}
 
 	.nav_menu .btn {
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 6206504d1..94a1bccdd 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -531,6 +531,42 @@ a.btn {
 	visibility: visible;
 }
 
+/*=== Tree */
+.tree {
+	margin: 10px 0;
+}
+.tree-folder-title {
+	position: relative;
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
+	font-weight: bold;
+}
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
+	line-height: 2.5rem;
+	font-size: 0.8rem;
+}
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
+
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
@@ -578,9 +614,46 @@ a.btn {
 	background: #222;
 	width: 235px;
 }
-.aside.aside_flux {
-	padding: 10px 0 50px;
-	background: #222;
+.aside.aside_feed {
+	padding: 10px 0;
+	text-align: center;
+}
+.aside.aside_feed .tree {
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
+}
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 3px; right: 3px;
+	padding: 1px 5px;
+}
+
+/*=== Aside main page (feeds) */
+.aside_feed .tree-folder-items > .item.empty.active {
+}
+.aside_feed .tree-folder-items > .item.error.active {
+}
+.aside_feed .tree-folder-items > .item.empty > a {
+}
+.aside_feed .tree-folder-items > .item.error > a {
+}
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
+}
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
+	font-weight: bold;
+}
+.aside_feed .tree-folder-items .dropdown-menu:after {
+	left: 2px;
+}
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
+	vertical-align: middle;
 }
 
 /*=== Aside main page (categories) */
@@ -1135,12 +1208,10 @@ opacity: 1;
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 40px;
+		line-height: 40px;
 		text-align: center;
 		background: #171717;
 		box-shadow: 0 1px rgba(255,255,255,0.08);
@@ -1151,6 +1222,13 @@ opacity: 1;
 		margin: 20px 0 0;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0b0a04c9a..968716073 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -358,16 +358,36 @@ a.btn {
 	margin: 10px 0;
 }
 .tree-folder-title {
+	position: relative;
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
+}
+.tree-folder-title .title {
+	background: inherit;
+}
+.tree-folder-title .title:hover {
+	text-decoration: none;
+}
+.tree-folder.active .tree-folder-title {
 	font-weight: bold;
 }
-.tree-folder-items .item {
-	padding: 0 5px 0 20px;
+.tree-folder.active .tree-folder-title .title {
+}
+.tree-folder-items {
+}
+.tree-folder-items > .item {
+	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
+.tree-folder-items > .item.active {
+}
+.tree-folder-items > .item > a {
+	text-decoration: none;
+}
+.tree-folder-items > .item.active > a {
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -403,55 +423,44 @@ a.btn {
 .aside {
 }
 .aside.aside_feed {
-	padding: 10px 0 50px;
+	padding: 10px 0;
 	text-align: center;
 }
-
-/*=== Aside main page (categories) */
 .aside.aside_feed .tree {
-	text-align: left;
-}
-.aside_feed .tree-folder-title {
-	position: relative;
+	position: sticky;
+	top: 0;
+	margin: 10px 0 50px;
 }
-.aside_feed .tree-folder-title > a:not([data-unread="0"]):after {
+
+/*=== Aside main page (categories) */
+.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
 	top: 3px; right: 3px;
 	padding: 1px 5px;
 }
 
 /*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-}
-.categories .feeds .item.empty.active {
+.aside_feed .tree-folder-items > .item.empty.active {
 }
-.categories .feeds .item.error.active {
+.aside_feed .tree-folder-items > .item.error.active {
 }
-.categories .feeds .item.empty .feed {
+.aside_feed .tree-folder-items > .item.empty > a {
 }
-.categories .feeds .item.error .feed {
+.aside_feed .tree-folder-items > .item.error > a {
 }
-.categories .feeds .item.active .feed,
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
+.aside_feed .tree-folder-items > .item.empty.active > a,
+.aside_feed .tree-folder-items > .item.error.active > a {
 }
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
-.categories .feeds .dropdown-menu:after {
+.aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
+.aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
+.aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
+	border-radius: 3px;
 	vertical-align: middle;
 }
 
@@ -758,15 +767,20 @@ a.btn {
 	}
 	.aside .toggle_aside,
 	#panel .close {
-		position: absolute;
 		display: block;
-		top: 0; right: 0;
-		width: 30px;
-		height: 30px;
-		line-height: 30px;
+		width: 100%;
+		height: 50px;
+		line-height: 50px;
 		text-align: center;
 	}
 
+	.aside.aside_feed {
+		padding: 0;
+	}
+	.aside.aside_feed .tree {
+		position: static;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b4cfec952..86e06f5ea 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -352,7 +352,7 @@ a.btn {
 .tree-folder-items > .item > a {
 	display: inline-block;
 	vertical-align: middle;
-	width: calc(100% - 16px);
+	width: calc(100% - 32px);
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -399,9 +399,6 @@ a.btn {
 	width: 250px;
 	vertical-align: top;
 }
-.aside.aside_feed {
-	background: #fff;
-}
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-- 
cgit v1.2.3


From 958503251f7bb53799fb1665ddfac08f043dfff5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 10:23:16 +0200
Subject: Fix Dark theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css       | 100 +++++++++++--------------------------------
 p/themes/base-theme/base.css |   7 ++-
 2 files changed, 29 insertions(+), 78 deletions(-)

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

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index d00fdcbd3..2b853a45c 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -473,19 +473,23 @@ a.btn {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 1rem;
+	background: #1c1c1c;
+	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
+	color: #888;
 }
 .tree-folder-title .title:hover {
 	text-decoration: none;
 }
 .tree-folder.active .tree-folder-title {
-	font-weight: bold;
-}
-.tree-folder.active .tree-folder-title .title {
+	background: #2c2c2c;
 }
 .tree-folder-items {
+	border-top: 1px solid #222;
+	border-bottom: 1px solid #222;
+	background: #161616;
 }
 .tree-folder-items > .item {
 	padding: 0 10px;
@@ -493,11 +497,13 @@ a.btn {
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
+	background: #1c1c1c;
 }
 .tree-folder-items > .item > a {
 	text-decoration: none;
 }
 .tree-folder-items > .item.active > a {
+	color: #888;
 }
 
 /*=== STRUCTURE */
@@ -549,21 +555,33 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	right: 0;
+	margin: 10px 0;
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
+	background: inherit;
+	border-left: 1px solid #666;
 }
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
+	background: #c95;
 }
 .aside_feed .tree-folder-items > .item.error.active {
+	background: #a44;
 }
 .aside_feed .tree-folder-items > .item.empty > a {
+	color: #c95;
 }
 .aside_feed .tree-folder-items > .item.error > a {
+	color: #a44;
+}
+.aside_feed .tree-folder-items > .item.empty.active > a {
+	color: #111;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
 .aside_feed .tree-folder-items > .item.error.active > a {
+	color: #fff;
 }
 .aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
@@ -576,77 +594,7 @@ a.btn {
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
 	vertical-align: middle;
-}
-
-/*=== Aside main page (categories) */
-.categories {
-	text-align: center;
-}
-.category {
-	width: 235px;
-	margin: 10px auto;
-	text-align: left;
-}
-.category .btn:first-child {
-	position: relative;
-	width: 213px;
-}
-.category.stick .btn:first-child {
-	width: 176px;
-}
-.category .btn:first-child:not([data-unread="0"]):after {
-	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
-	background: #111;
-	color: #888;
-	border: 1px solid #000;
-	border-radius: 5px;
-}
-
-/*=== Aside main page (feeds) */
-.categories .feeds .item.active {
-	background: #333;
-}
-.categories .feeds .item.active .feed {
-	color: #888;
-}
-.categories .feeds .item.empty .feed {
-	color: #c95;
-}
-.categories .feeds .item.empty.active {
-	background: #c95;
-}
-.categories .feeds .item.error .feed {
-	color: #a44;
-}
-.categories .feeds .item.error.active {
-	background: #a44;
-}
-.categories .feeds .item.empty.active .feed,
-.categories .feeds .item.error.active .feed {
-	color: #fff;
-}
-.categories .feeds .item .feed {
-	margin: 0;
-	width: 165px;
-	line-height: 3em;
-	font-size: 0.8em;
-	text-align: left;
-	text-decoration: none;
-}
-.categories .feeds .feed:not([data-unread="0"]) {
-	font-weight: bold;
-}
-.categories .feeds .dropdown-menu:after {
-	left: 2px;
-}
-.categories .feeds .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.categories .feeds .item:hover .dropdown-toggle > .icon,
-.categories .feeds .item.active .dropdown-toggle > .icon {
-	vertical-align: middle;
 	background-color: #111;
-	border-radius: 3px;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 968716073..4de5fa98a 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -435,8 +435,11 @@ a.btn {
 /*=== Aside main page (categories) */
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
 	position: absolute;
-	top: 3px; right: 3px;
-	padding: 1px 5px;
+	right: 0;
+	margin: 10px 0;
+	padding: 0 10px;
+	font-size: 0.9rem;
+	line-height: 1.5rem;
 }
 
 /*=== Aside main page (feeds) */
-- 
cgit v1.2.3


From fa0c7d75e6b9d01130f1c9518eef5f37d8e6d4ff Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 13:50:08 +0200
Subject: Begin to fix global view

---
 app/layout/aside_feed.phtml          |  6 ++--
 app/views/index/global.phtml         | 27 ++++++++++++------
 p/scripts/global_view.js             |  2 +-
 p/themes/Dark/dark.css               |  3 --
 p/themes/Origine/origine.css         | 11 +++-----
 p/themes/Pafat/pafat.css             |  4 ---
 p/themes/Screwdriver/screwdriver.css |  3 --
 p/themes/base-theme/base.css         |  3 --
 p/themes/base-theme/template.css     | 54 ++++++++++++------------------------
 9 files changed, 44 insertions(+), 69 deletions(-)

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

diff --git a/app/layout/aside_feed.phtml b/app/layout/aside_feed.phtml
index 12beba3a1..06e12a5cf 100644
--- a/app/layout/aside_feed.phtml
+++ b/app/layout/aside_feed.phtml
@@ -42,7 +42,7 @@
 					$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
 					                        FreshRSS_Context::$current_get['feed']);
 		?>
-		<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
 			<div class="tree-folder-title">
 				<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
 				<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
@@ -53,13 +53,13 @@
 					foreach ($feeds as $feed) {
 						$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
 				?>
-				<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
+				<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
 					<div class="dropdown no-mobile">
 						<div class="dropdown-target"></div>
 						<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
 						<?php /* feed_config_template */ ?>
 					</div>
-					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
+					<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
 				</li>
 				<?php } ?>
 			</ul>
diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index ab63c409a..5159882ba 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -1,11 +1,20 @@
-<?php //$this->partial('nav_menu'); ?>
+<?php
+	$this->partial('nav_menu');
+
+	$class = '';
+	if (FreshRSS_Context::$conf->hide_read_feeds &&
+			FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
+			!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
+		$class = ' state_unread';
+	}
+?>
 
-<div id="stream" class="global categories">
+<div id="stream" class="global<?php echo $class; ?>">
 <?php
 	$url_base = array(
 		'c' => 'index',
 		'a' => 'index',
-		'params' => array()
+		'params' => Minz_Request::params()
 	);
 
 	foreach ($this->categories as $cat) {
@@ -14,20 +23,20 @@
 
 		if (!empty($feeds)) {
 ?>
-	<div class="box">
-		<div class="box-title"><a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
+	<div class="box category" data-unread="<?php echo $cat->nbNotRead(); ?>">
+		<div class="box-title"><a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
 
 		<ul class="box-content">
 			<?php
 				foreach ($feeds as $feed) {
 					$nb_not_read = $feed->nbNotRead();
-					$error = $feed->inError() ? 'error ' : '';
-					$empty = $feed->nbEntries() === 0 ? 'empty ' : '';
+					$error = $feed->inError() ? ' error' : '';
+					$empty = $feed->nbEntries() === 0 ? ' empty' : '';
 					$url_base['params']['get'] = 'f_' . $feed->id();
 			?>
-			<li class="item feed<?php echo $error, $empty; ?>">
+			<li class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
-				<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
+				<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
 			</li>
 			<?php } ?>
 		</ul>
diff --git a/p/scripts/global_view.js b/p/scripts/global_view.js
index 8c2e6c1a2..14909f44e 100644
--- a/p/scripts/global_view.js
+++ b/p/scripts/global_view.js
@@ -9,7 +9,7 @@ function load_panel(link) {
 	panel_loading = true;
 
 	$.get(link, function (data) {
-		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
+		$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data));
 
 		$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
 
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 2b853a45c..25a3e66f6 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -852,9 +852,6 @@ a.btn {
 	border-radius: 5px;
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index b4465a717..7230aa128 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -593,7 +593,7 @@ a.btn {
 }
 
 /*=== Aside main page (categories) */
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
+.aside_feed .category .title:not([data-unread="0"]):after {
 	position: absolute;
 	right: 0;
 	margin: 10px 0;
@@ -603,6 +603,9 @@ a.btn {
 	background: inherit;
 	border-left: 1px solid #aaa;
 }
+.feed .item-title:not([data-unread="0"]) {
+	font-weight: bold;
+}
 
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items > .item.empty.active {
@@ -621,9 +624,6 @@ a.btn {
 .aside_feed .tree-folder-items > .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
@@ -903,9 +903,6 @@ a.btn {
 	text-align: left;
 	box-shadow: 0 0 3px #bbb;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index cdbedbf22..84a485e13 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -914,10 +914,6 @@ a.btn {
 	text-align: left;
 }
 
-#stream.global .category {
-	margin: 0;
-}
-
 #stream.global .category:first-child {
 	margin: 0;
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index aa5758a90..5771bb68f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -969,9 +969,6 @@ opacity: 1;
 	box-shadow: 0 0 4px #171717;
 	overflow:hidden;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 4de5fa98a..53f59bbe5 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -668,9 +668,6 @@ a.btn {
 #stream.global .box-category {
 	text-align: left;
 }
-#stream.global .category {
-	margin: 0;
-}
 #stream.global .btn {
 	width: auto;
 	height: 2em;
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index b07b579d0..1af7a73d6 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -289,6 +289,7 @@ a.btn {
 	vertical-align: top;
 }
 .box .box-title {
+	position: relative;
 	font-size: 1.2rem;
 	font-weight: bold;
 	text-align: center;
@@ -400,22 +401,10 @@ a.btn {
 	vertical-align: top;
 }
 
-/*=== Aside main page (categories) */
-.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
-	display: none;
-}
-.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
-	content: attr(data-unread);
-}
-
 /*=== Aside main page (feeds) */
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
-	content: "(" attr(data-unread) ") ";
-}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -612,32 +601,13 @@ br + br + br {
 
 /*=== GLOBAL VIEW */
 /*================*/
-/*=== Category boxes */
-
-/* TODO <delete> */
-#stream.global .box-category {
-	display: inline-block;
-	width: 19em;
-	max-width: 95%;
-	margin: 20px 10px;
-	border: 1px solid #ccc;
-	vertical-align: top;
-}
-#stream.global .category {
-	width: 100%;
-}
-#stream.global .btn {
-	display: block;
-}
-#stream.global .box-category .feeds {
-	display: block;
-	overflow: auto;
+#stream.global {
+	text-align: center;
 }
-#stream.global .box-category .feed {
-	width: 19em;
-	max-width: 90%;
+
+#stream.global .box {
+	text-align: left;
 }
-/* TODO </delete */
 
 /*=== Panel */
 #overlay {
@@ -694,6 +664,18 @@ br + br + br {
 
 /*=== DIVERS */
 /*===========*/
+.category .title:not([data-unread="0"]):after {
+	content: attr(data-unread);
+}
+.feed .item-title:not([data-unread="0"]):before {
+	content: "(" attr(data-unread) ") ";
+}
+
+.state_unread .category:not(.active)[data-unread="0"],
+.state_unread .feed:not(.active)[data-unread="0"] {
+	display: none;
+}
+
 .nav-login,
 .nav_menu .search,
 .aside .toggle_aside,
-- 
cgit v1.2.3


From 62727b1d4f101fa328b57eda716803c2f7147d7b Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:10:45 +0200
Subject: Fix Origine and base-theme themes for global view

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Origine/origine.css     | 39 ++++++++++++++-------------------------
 p/themes/base-theme/base.css     | 32 ++++++++++++++++----------------
 p/themes/base-theme/template.css |  3 +++
 3 files changed, 33 insertions(+), 41 deletions(-)

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

diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7230aa128..918d4f653 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -897,32 +897,24 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
-	background: #fff;
-	border-radius: 5px;
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
-	box-shadow: 0 0 3px #bbb;
-}
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	background: #f6f6f6;
-	border: none;
-	border-bottom: 1px solid #ddd;
-	border-radius: 5px 5px 0 0;
-	line-height: 2em;
-	font-size: 1.2rem;
 }
-#stream.global .btn:not([data-unread="0"]) {
+.box.category:not([data-unread="0"]) .box-title {
 	background: #0084CC;
+}
+.box.category:not([data-unread="0"]) .box-title:active {
+	background: #3498db;
+}
+.box.category:not([data-unread="0"]) .box-title .title {
 	color: #fff;
 	font-weight: bold;
-	text-shadow: none;
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
 	border: 0;
 	background: none;
 	color: #fff;
@@ -930,12 +922,9 @@ a.btn {
 	box-shadow: none;
 	text-shadow: none;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
-}
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 53f59bbe5..029c2d254 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -665,30 +665,30 @@ a.btn {
 
 /*=== GLOBAL VIEW */
 /*================*/
-#stream.global .box-category {
+.box.category .box-title .title {
+	font-weight: normal;
+	text-decoration: none;
 	text-align: left;
 }
-#stream.global .btn {
-	width: auto;
-	height: 2em;
-	margin: 0;
-	padding: 0 10px;
-	line-height: 2em;
-	font-size: 1.2rem;
+.box.category:not([data-unread="0"]) .box-title {
 }
-#stream.global .btn:not([data-unread="0"]) {
-	font-weight: bold;
+.box.category:not([data-unread="0"]) .box-title:active {
 }
-#stream.global .btn:first-child:not([data-unread="0"]):after {
-	top: 0; right: 5px;
+.box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
 }
-#stream.global .box-category .feeds {
-	max-height: 250px;
+.box.category .title:not([data-unread="0"]):after {
+	position: absolute;
+	top: 5px; right: 10px;
+	border: 0;
+	background: none;
+	font-weight: bold;
+	box-shadow: none;
+	text-shadow: none;
 }
-#stream.global .box-category .feeds .item {
+.box.category .item.feed {
 	padding: 2px 10px;
-	font-size: 0.9rem;
+	font-size: 0.8rem;
 }
 
 /*=== DIVERS */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index 1af7a73d6..f4f19ee71 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -294,6 +294,9 @@ a.btn {
 	font-weight: bold;
 	text-align: center;
 }
+.box .box-title a {
+	display: block;
+}
 .box .box-title form {
 	margin: 0;
 }
-- 
cgit v1.2.3


From 27c380400dc715441c4193d7c4a7056f960fbfd5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:42:46 +0200
Subject: Fix feed in error or empty (all the themes)

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 p/themes/Dark/dark.css               | 15 ++++++---------
 p/themes/Flat/flat.css               | 15 ++++++---------
 p/themes/Origine/origine.css         | 12 ++++++------
 p/themes/Pafat/pafat.css             | 15 ++++++---------
 p/themes/Screwdriver/screwdriver.css |  9 +++------
 p/themes/base-theme/base.css         | 15 ++++++---------
 6 files changed, 33 insertions(+), 48 deletions(-)

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

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index f48f42b68..1f26224e4 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -565,27 +565,24 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #c95;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #a44;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #c95;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #a44;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a {
+.feed.item.empty.active > a {
 	color: #111;
 }
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 432a9a0fb..46c874311 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -570,25 +570,22 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #f39c12;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 7231abd01..1b54e9bfe 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -605,20 +605,20 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index f10b66086..15fdb3a1a 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -615,25 +615,22 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 	background: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 	background: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #bd362f;
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index c38cb617e..ae6ceb00f 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -649,15 +649,12 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 	color: #e67e22;
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 	color: #BD362F;
 }
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
-}
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
 }
@@ -997,7 +994,7 @@ opacity: 1;
 	padding: 2px 10px;
 	font-size: 0.8rem;
 }
-.box.category .item.feed .item-title {
+.box.category .item.feed:not(.empty):not(.error) .item-title {
 	color: #222;
 }
 
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 029c2d254..0d53c50d1 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -443,19 +443,16 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
-.aside_feed .tree-folder-items > .item.empty.active {
+.feed.item.empty.active {
 }
-.aside_feed .tree-folder-items > .item.error.active {
+.feed.item.error.active {
 }
-.aside_feed .tree-folder-items > .item.empty > a {
+.feed.item.empty > a {
 }
-.aside_feed .tree-folder-items > .item.error > a {
+.feed.item.error > a {
 }
-.aside_feed .tree-folder-items > .item.empty.active > a,
-.aside_feed .tree-folder-items > .item.error.active > a {
-}
-.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
-	font-weight: bold;
+.feed.item.empty.active > a,
+.feed.item.error.active > a {
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
 	left: 2px;
-- 
cgit v1.2.3


From cdad09ae2c363ee74ef7feba58e00e3500a35317 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Fri, 24 Oct 2014 14:53:38 +0200
Subject: Fix feed colors on subscription page (all themes)

---
 p/themes/Dark/dark.css               | 4 ++++
 p/themes/Flat/flat.css               | 4 ++++
 p/themes/Origine/origine.css         | 4 ++++
 p/themes/Pafat/pafat.css             | 4 ++++
 p/themes/Screwdriver/screwdriver.css | 2 ++
 p/themes/base-theme/base.css         | 4 ++++
 p/themes/base-theme/template.css     | 1 +
 7 files changed, 23 insertions(+)

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

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 1f26224e4..e551aa9c0 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -571,15 +571,19 @@ a.btn {
 .feed.item.error.active {
 	background: #a44;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #c95;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #a44;
 }
+.feed.item.empty.active,
 .feed.item.empty.active > a {
 	color: #111;
 }
+.feed.item.error.active,
 .feed.item.error.active > a {
 	color: #fff;
 }
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 46c874311..eb7737c5d 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -576,12 +576,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 1b54e9bfe..464422a0b 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -611,12 +611,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 15fdb3a1a..49cb3bc17 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -621,12 +621,16 @@ a.btn {
 .feed.item.error.active {
 	background: #bd362f;
 }
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #bd362f;
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 	color: #fff;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index ae6ceb00f..4f55d752e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -649,9 +649,11 @@ a.btn {
 }
 
 /*=== Aside main page (feeds) */
+.feed.item.empty,
 .feed.item.empty > a {
 	color: #e67e22;
 }
+.feed.item.error,
 .feed.item.error > a {
 	color: #BD362F;
 }
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 0d53c50d1..871a632d8 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -447,10 +447,14 @@ a.btn {
 }
 .feed.item.error.active {
 }
+.feed.item.empty,
 .feed.item.empty > a {
 }
+.feed.item.error,
 .feed.item.error > a {
 }
+.feed.item.empty.active,
+.feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
 }
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fd95cb697..a79d539d8 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -179,6 +179,7 @@ a.btn {
 .dropdown {
 	position: relative;
 	display: inline-block;
+	vertical-align: middle;
 }
 .dropdown-target {
 	display: none;
-- 
cgit v1.2.3


From 659515862566744fc90511bc4182fc32ccf2e6b3 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 26 Oct 2014 14:13:05 +0100
Subject: Fix themes (aside_feed)

---
 p/themes/Dark/dark.css               |  3 +--
 p/themes/Flat/flat.css               |  3 +--
 p/themes/Origine/origine.css         |  4 +---
 p/themes/Pafat/pafat.css             |  1 -
 p/themes/Screwdriver/screwdriver.css |  1 -
 p/themes/base-theme/base.css         |  1 -
 p/themes/base-theme/template.css     | 14 ++++++++++++--
 7 files changed, 15 insertions(+), 12 deletions(-)

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

diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index e551aa9c0..03bf3c985 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -474,7 +474,6 @@ a.btn {
 	line-height: 2.5rem;
 	font-size: 1rem;
 	background: #1c1c1c;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -485,6 +484,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2c2c2c;
+	font-weight: bold;
 }
 .tree-folder-items {
 	border-top: 1px solid #222;
@@ -594,7 +594,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #111;
 }
 
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index eb7737c5d..313bee0ee 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -483,7 +483,6 @@ a.btn {
 	background: #34495e;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -494,6 +493,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #2980b9;
+	font-weight: bold;
 }
 .tree-folder-items {
 	background: #2c3e50;
@@ -597,7 +597,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 464422a0b..afd6ec04f 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -508,7 +508,6 @@ a.btn {
 	background: #fff;
 	line-height: 2.5rem;
 	font-size: 1rem;
-	font-weight: bold;
 }
 .tree-folder-title .title {
 	background: inherit;
@@ -519,6 +518,7 @@ a.btn {
 }
 .tree-folder.active .tree-folder-title {
 	background: #f0f0f0;
+	font-weight: bold;
 }
 .tree-folder.active .tree-folder-title .title {
 	color: #0062BE;
@@ -629,11 +629,9 @@ a.btn {
 	left: 2px;
 }
 .aside_feed .tree-folder-items .item .dropdown-target:target ~ .dropdown-toggle > .icon,
-.aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	background-color: #fff;
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 49cb3bc17..8b1e7866c 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -642,7 +642,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 	background-color: #fff;
 }
 
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 4f55d752e..b6c2e670e 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -664,7 +664,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 871a632d8..ac30dbfea 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -465,7 +465,6 @@ a.btn {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	vertical-align: middle;
 }
 
 /*=== Configuration pages */
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index a79d539d8..ffb104af2 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -401,14 +401,23 @@ a.btn {
 .aside {
 	display: table-cell;
 	height: 100%;
-	width: 250px;
+	width: 300px;
 	vertical-align: top;
 }
 
-/*=== Aside main page (feeds) */
+/*=== Aside main page */
+.aside_feed .tree-folder-title .icon {
+	padding: 5px;
+}
+.aside_feed .tree-folder-items .item.feed {
+	padding: 0px 15px;
+}
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
+.aside_feed .tree-folder-items .dropdown {
+	vertical-align: top;
+}
 .aside_feed .tree-folder-items .dropdown-menu {
 	left: 0;
 }
@@ -472,6 +481,7 @@ a.btn {
 .flux .item.date {
 	width: 145px;
 	text-align: right;
+	overflow: hidden;
 }
 .flux .item > a {
 	display: block;
-- 
cgit v1.2.3


From f31b02be7882f8a7b180d64f3f77ba83cd9935f5 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Tue, 13 Jan 2015 14:10:31 +0100
Subject: Remove sticky feed aside. Work on an extension.

See https://github.com/FreshRSS/FreshRSS/issues/697
---
 p/themes/BlueLagoon/BlueLagoon.css   | 5 -----
 p/themes/Dark/dark.css               | 5 -----
 p/themes/Flat/flat.css               | 5 -----
 p/themes/Origine/origine.css         | 5 -----
 p/themes/Pafat/pafat.css             | 5 -----
 p/themes/Screwdriver/screwdriver.css | 5 -----
 p/themes/base-theme/base.css         | 5 -----
 7 files changed, 35 deletions(-)

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

diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index ae1c24604..ffb80ddb2 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -622,8 +622,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1140,9 +1138,6 @@ opacity: 1;
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index 909444d43..dd7502f25 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -547,8 +547,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -982,9 +980,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 313bee0ee..42b73bae2 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -553,8 +553,6 @@ a.btn {
 	border-radius: 0 10px 0 0;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -979,9 +977,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index eb2ecd5e8..18df4468a 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -587,8 +587,6 @@ a.btn {
 	background: #fff;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1028,9 +1026,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index 8b1e7866c..61e5c8f63 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -586,8 +586,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 5px;
 	margin: 10px 0 50px;
 }
 
@@ -1039,9 +1037,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 8dbd2ec34..a43d1801c 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -617,8 +617,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -1139,9 +1137,6 @@ opacity: 1;
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index ac30dbfea..f874d554c 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -427,8 +427,6 @@ a.btn {
 	text-align: center;
 }
 .aside.aside_feed .tree {
-	position: sticky;
-	top: 0;
 	margin: 10px 0 50px;
 }
 
@@ -777,9 +775,6 @@ a.btn {
 	.aside.aside_feed {
 		padding: 0;
 	}
-	.aside.aside_feed .tree {
-		position: static;
-	}
 
 	.nav_menu .btn {
 		margin: 5px 10px;
-- 
cgit v1.2.3