From 79740937b9c8a7b249700206e510a9948eaf5c2f Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 28 Mar 2013 13:58:27 +0100
Subject: [PATCH] styling

---
 src/main/webapp/css/app.css          | 19 +++++++++++++++++--
 src/main/webapp/templates/feeds.html |  8 +++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index 9f034f0d..a0d0e58e 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -11,10 +11,11 @@
 
 /* tree*/
 .sidebar-nav-fixed {
-	overflow-x: hidden;
+	overflow: visible;
 }
 
 .css-treeview {
+	margin-top: 15px;
 	font-family: inherit;
 	font-size: 11px;
 	white-space: nowrap;
@@ -25,6 +26,12 @@
 	font-style: italic;
 }
 
+.css-treeview label {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: block;
+}
+
 .css-treeview label,.css-treeview a,.css-treeview label::before {
 	font-family: inherit;
 	font-size: 11px;
@@ -78,6 +85,14 @@
 	cursor: pointer;
 }
 
+#feed-accordion .entry-heading .feed-name {
+	color: #555;
+	width: 150px;
+	display: inline-block;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
 #feed-accordion a.entry-heading:hover {
 	text-decoration: none;
 }
@@ -90,7 +105,7 @@
 	background-color: #EBEBEB;
 }
 
-#feed-accordion .entry-heading.unread {
+#feed-accordion .entry-heading .unread {
 	font-weight: bold;
 }
 
diff --git a/src/main/webapp/templates/feeds.html b/src/main/webapp/templates/feeds.html
index dce59bac..f3cc3439 100644
--- a/src/main/webapp/templates/feeds.html
+++ b/src/main/webapp/templates/feeds.html
@@ -6,9 +6,11 @@
 	
 	<div infinite-scroll="loadMoreEntries()" infinite-scroll-disabled="busy" infinite-scroll-distance="1" id="feed-accordion">
 		<div ng-repeat="entry in entryList.entries" class="entry">
-			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="entryClicked(entry, $event)" ng-class="{unread: entry.read == false, open: current == entry, closed: current != entry}">
-				<span ng-show="selectedType == 'category'">{{entry.feedName}}
-					- </span>{{entry.title}} <span class="pull-right">{{entry.date}}</span>
+			<a href="{{entry.url}}" target="_blank" class="entry-heading" ng-click="entryClicked(entry, $event)" 
+				ng-class="{open: current == entry, closed: current != entry}">
+				<span ui-if="selectedType == 'category'" class="feed-name">{{entry.feedName}}</span>
+				<span class="entry-name" ng-class="{unread: entry.read == false}" ng-bind-html-unsafe="entry.title"></span>
+				<span class="pull-right">{{entry.date}}</span>
 			</a>
 			<div class="entry-body" ui-if="isOpen && current == entry">
 				<div>