garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

remove bootstrap icons as we are using fontawesome now

Browse Source
This commit is contained in:
Athou
2013-04-15 10:32:47 +02:00
parent c52fdf9f9f
commit b1e7504bac
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java
View File

@@ -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"))));
}

12
src/main/webapp/css/app.css
View File

@@ -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;
}

4
src/main/webapp/directives/category.html
View File

@@ -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>