Merge pull request #93 from bechi/feature/01navbar

01 navbar
This commit is contained in:
Mario Colque 2014-01-20 12:33:47 -08:00
commit 0da8cdef87
2 changed files with 36 additions and 6 deletions

View File

@ -4,7 +4,7 @@
font-style: italic; font-style: italic;
font-size: 34px; font-size: 34px;
color: #FFFFFF !important; color: #FFFFFF !important;
line-height: 18px; line-height: 25px;
margin-right: 50px; margin-right: 50px;
} }
@ -46,15 +46,22 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
} }
.navbar-default { .navbar-default {
min-height: 60px;
padding: 0;
background-color: #8DC429; background-color: #8DC429;
border-bottom: 4px solid #64920F; border-bottom: 4px solid #64920F;
color: #fff; color: #fff;
} }
.navbar-form {
margin: 12px 0;
}
.navbar-default .navbar-nav>li>a { .navbar-default .navbar-nav>li>a {
color: #F4FBE8; color: #F4FBE8;
font-family: Ubuntu, sans-serif; font-family: Ubuntu, sans-serif;
font-size: 16px; font-size: 16px;
line-height: 28px;
} }
.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>li>a:hover { .navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>li>a:hover {
@ -67,7 +74,7 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
.navbar-form .form-control { .navbar-form .form-control {
border: 0; border: 0;
border-radius: 2px; border-radius: 3px;
background: #7CAD23; background: #7CAD23;
-moz-box-shadow: 1px 1px 0px 0px rgba(255,255,255,0.41), inset 1px 1px 3px 0px rgba(0,0,0,0.10); -moz-box-shadow: 1px 1px 0px 0px rgba(255,255,255,0.41), inset 1px 1px 3px 0px rgba(0,0,0,0.10);
-webkit-box-shadow: 1px 1px 0px 0px rgba(255,255,255,0.41), inset 1px 1px 3px 0px rgba(0,0,0,0.10); -webkit-box-shadow: 1px 1px 0px 0px rgba(255,255,255,0.41), inset 1px 1px 3px 0px rgba(0,0,0,0.10);
@ -98,12 +105,25 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
line-height: 18px; line-height: 18px;
} }
.status {
border-radius: 3px;
background: #597338;
float: right;
padding: 8px 15px;
margin: 11px 0;
font-weight: 300;
}
.status i {
margin: 0 5px;
}
.col-gray { .col-gray {
background-color: #F4F4F4; background-color: #F4F4F4;
padding: 15px; padding: 15px;
margin-top: 10px; margin-top: 21px;
width: 265px; width: 265px;
height: 89%; height: 87%;
border-radius: 5px; border-radius: 5px;
} }

View File

@ -15,14 +15,24 @@
<a href="#!/{{item.link}}">{{item.title}}</a> <a href="#!/{{item.link}}">{{item.title}}</a>
</li> </li>
</ul> </ul>
<div ng-controller="SearchController" class="pull-right"> <div ng-controller="SearchController">
<form class="navbar-form navbar-left" role="search" ng-submit="search()"> <form class="navbar-form navbar-left" role="search" ng-submit="search()">
<div class="form-group" ng-class="{'has-error': badQuery}"> <div class="form-group" ng-class="{'has-error': badQuery}">
<input id="search" type="text" class="form-control" ng-model="q" placeholder="Search for block, transaction or address"> <input id="search" type="text" class="form-control" ng-model="q" placeholder="Search for block, transaction or address">
</div> </div>
<span class="text-danger" ng-show="badQuery">No matching records found!</span> <span class="text-danger" ng-show="badQuery">No matching records found!</span>
</form> </form>
<div class="status" data-ng-controller="FooterController" data-ng-init="getFooter()">
<i class="small" data-ng-show="info.blocks">
<strong>Status:</strong> On Sync
</i>
<i class="small">
<strong> Connections: </strong> {{info.connections}}
</i>
<i class="small">
<strong>Height:</strong> {{info.blocks}}
</i>
</div>
</div> </div>
</div> </div>
</div> </div>