From 6dc1267b9832272abd466579053c2bcdedcb5ecb Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 23 Oct 2014 12:33:22 +0200
Subject: Fix Origine theme

See https://github.com/marienfressinaud/FreshRSS/issues/634
---
 app/layout/aside_subscription.phtml |  2 +-
 p/themes/Origine/origine.css        |  8 ++++----
 p/themes/base-theme/template.css    | 24 ++++++++++++++++++------
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/layout/aside_subscription.phtml b/app/layout/aside_subscription.phtml
index 9a95763c3..cbf5df67d 100644
--- a/app/layout/aside_subscription.phtml
+++ b/app/layout/aside_subscription.phtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-list aside aside_feed">
+<ul class="nav nav-list aside">
 	<li class="nav-header"><?php echo _t('subscription_management'); ?></li>
 
 	<li class="item<?php echo Minz_Request::controllerName() == 'subscription' ? ' active' : ''; ?>">
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 0a317695b..d01bed963 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -505,7 +505,7 @@ a.btn {
 .tree-folder-title {
 	padding: 0 10px;
 	line-height: 2.5rem;
-	font-size: 1.2rem;
+	font-size: 1rem;
 	font-weight: bold;
 }
 .tree-folder-items {
@@ -513,7 +513,7 @@ a.btn {
 	border-bottom: 1px solid #ccc;
 	background: #f6f6f6;
 }
-.tree-folder-items .item {
+.tree-folder-items > .item {
 	padding: 0 10px;
 	line-height: 2.5rem;
 	font-size: 0.8rem;
@@ -606,12 +606,12 @@ a.btn {
 .aside_feed .tree-folder-items .item.error.active > a {
 	color: #fff;
 }
-.aside_feed .tree-folder-items .item > a {
+.aside_feed .tree-folder-items > .item > a {
 	line-height: 3em;
 	text-align: left;
 	text-decoration: none;
 }
-.aside_feed .tree-folder-items .item:not([data-unread="0"]) {
+.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
 	font-weight: bold;
 }
 .aside_feed .tree-folder-items .dropdown-menu:after {
diff --git a/p/themes/base-theme/template.css b/p/themes/base-theme/template.css
index fb02a5b53..bcafd162c 100644
--- a/p/themes/base-theme/template.css
+++ b/p/themes/base-theme/template.css
@@ -331,19 +331,31 @@ a.btn {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-title {
-	display: block;
-}
 .tree-folder-items {
 	padding: 0;
 	list-style: none;
 }
-.tree-folder-items .item {
+.tree-folder-title {
 	display: block;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
 }
+.tree-folder-title .title {
+	vertical-align: middle;
+}
+.tree-folder-items > .item {
+	display: block;
+	white-space: nowrap;
+}
+.tree-folder-items > .item > a {
+	display: inline-block;
+	vertical-align: middle;
+	width: calc(100% - 32px);
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
 
 /*=== STRUCTURE */
 /*===============*/
@@ -392,7 +404,7 @@ a.btn {
 
 /*=== Aside main page (categories) */
 .aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
-.aside_feed.state_unread .tree-folder .item:not(.active)[data-unread="0"] {
+.aside_feed.state_unread .tree-folder > .item:not(.active)[data-unread="0"] {
 	display: none;
 }
 .aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
@@ -403,7 +415,7 @@ a.btn {
 .aside_feed .tree-folder-items:not(.active) {
 	display: none;
 }
-.aside_feed .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_feed .tree-folder-items .dropdown-menu {
-- 
cgit v1.2.3