From b1e7504baca8aacf4abd6c15f84ddabe68e154c4 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Mon, 15 Apr 2013 10:32:47 +0200
Subject: [PATCH] remove bootstrap icons as we are using fontawesome now

---
 .../references/bootstrap/BootstrapReference.java     |  2 +-
 src/main/webapp/css/app.css                          | 12 +++++++++---
 src/main/webapp/directives/category.html             |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java b/src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java
index f5bf5a0e..1d1bbde7 100644
--- a/src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java
+++ b/src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java
@@ -29,7 +29,7 @@ public class BootstrapReference extends UrlResourceReference {
 				.asList(JavaScriptHeaderItem
 						.forReference(JQueryReference.INSTANCE),
 						CssHeaderItem.forReference(new UrlResourceReference(
-								Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css"))),
+								Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.no-icons.min.css"))),
 						CssHeaderItem.forReference(new UrlResourceReference(
 								Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css"))));
 	}
diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
index b44fb12b..b56d9312 100644
--- a/src/main/webapp/css/app.css
+++ b/src/main/webapp/css/app.css
@@ -66,16 +66,22 @@
 	line-height: 20px;
 }
 
-.css-treeview .icon-fldr {
+.css-treeview .fldr {
 	background: url("../images/tree_icons.png") no-repeat;
 	cursor: pointer;
+	display: inline-block;
+	width: 14px;
+	height: 14px;
+	line-height: 14px;
+	vertical-align: text-top;
+	margin-top: 1px;
 }
 
-.css-treeview .icon-fldr-open {
+.css-treeview .fldr-open {
 	background-position: 0 -16px;
 }
 
-.css-treeview .icon-fldr-closed {
+.css-treeview .fldr-closed {
 	background-position: 0 -32px;
 }
 
diff --git a/src/main/webapp/directives/category.html b/src/main/webapp/directives/category.html
index fbbed316..65ab5c01 100644
--- a/src/main/webapp/directives/category.html
+++ b/src/main/webapp/directives/category.html
@@ -13,9 +13,9 @@
 				</li>
 			</ul>
 		</div>
-		<span class="icon-fldr" ng-class="{'icon-fldr-closed': !node.expanded, 'icon-fldr-open': node.expanded}" ng-click="toggleCategory(node)"></span>
+		<span class="fldr" ng-class="{'fldr-closed': !node.expanded, 'fldr-open': node.expanded}" ng-click="toggleCategory(node)"></span>
 		<span ng-click="categoryClick({id: node.id})">
-			<span class="icon-fldr icon-fldr-folder"></span>
+			<span class="fldr"></span>
 			<span ng-class="{selected: (node.id == selectedId && selectedType == 'category'), unread: unreadCount({category:node})}">{{formatCategoryName({category:node})}}
 			</span>
 		</span>