(refs #529)Add icons

This commit is contained in:
Naoki Takezoe
2014-11-03 05:25:03 +09:00
parent 1c2af36c92
commit f59e86f5ca
4 changed files with 765 additions and 1849 deletions

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 78 KiB

View File

@@ -3,22 +3,20 @@
@import view.helpers._ @import view.helpers._
<div class="dashboard-nav"> <div class="dashboard-nav">
<div class="container"> <div class="container">
<a href="@path/" @if(active == ""){ class="active"}>News Feed</a> <a href="@path/" @if(active == ""){ class="active"}>
<img src="@assets/common/images/menu-feed.png">
News Feed
</a>
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}> <a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}>
<img src="@assets/common/images/activity-merge.png" width="16"> <img src="@assets/common/images/menu-pulls.png">
Pull Requests Pull Requests
</a> </a>
<a href="@path/dashboard/issues/repos" @if(active == "issues"){ class="active"}> <a href="@path/dashboard/issues/repos" @if(active == "issues"){ class="active"}>
<img src="@assets/common/images/activity-issue.png" width="16"> <img src="@assets/common/images/menu-issues.png">
Issues Issues
</a> </a>
} }
@*
@if(active == ""){
<a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
}
*@
</div> </div>
</div> </div>
<style type="text/css"> <style type="text/css">
@@ -28,6 +26,7 @@ div.dashboard-nav {
height: 32px; height: 32px;
margin-bottom: 20px; margin-bottom: 20px;
} }
div.dashboard-nav a { div.dashboard-nav a {
line-height: 10px; line-height: 10px;
margin-left: 20px; margin-left: 20px;
@@ -37,6 +36,10 @@ div.dashboard-nav a {
color: #888; color: #888;
} }
div.dashboard-nav a:hover {
text-decoration: none;
}
div.dashboard-nav a.active { div.dashboard-nav a.active {
border-bottom: 2px solid #bb4444; border-bottom: 2px solid #bb4444;
color: #333; color: #333;

View File

@@ -8,6 +8,9 @@
<div class="container"> <div class="container">
<div class="row-fluid"> <div class="row-fluid">
<div class="span8"> <div class="span8">
<div class="pull-right">
<a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
</div>
@helper.html.activities(activities) @helper.html.activities(activities)
</div> </div>
<div class="span4"> <div class="span4">

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB