Add achievements link to navbar

This commit is contained in:
Tadej Novak
2014-08-04 18:52:35 +02:00
parent 4d5dbc3762
commit 6b3caad8af
2 changed files with 3 additions and 9 deletions
-8
View File
@@ -68,10 +68,6 @@ h1 br {
font-size: 14px; font-weight: bold;
}
.achievements-button {
margin-top: -48px;
}
#Status {
font-size: x-large;
}
@@ -97,7 +93,3 @@ h1 br {
right: 5px;
position: absolute;
}
#mylab {
margin-right: 48px;
}
+3 -1
View File
@@ -20,6 +20,9 @@
<div class="navbar-header">
<a class="navbar-brand" href="#" data-toggle="modal" data-target="#myModal">Particle Clicker</a>
</div>
<ul class="nav navbar-nav navbar-left">
<li><a href="#" data-toggle="modal" data-target="#achievements-modal"><i class="fa fa-trophy"></i> Achievements</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><a href="https://github.com/particle-clicker/particle-clicker/" target="_blank"><i class="fa fa-github"></i> GitHub</a></li>
<li class="dropdown">
@@ -57,7 +60,6 @@
<div class="col-xs-5 scrollable" ng-controller="LabController as lc">
<h3 id="mylab" contenteditable>{{ lc.lab.name }} <small>Click here to change the name</small></h3>
<button class="pull-right btn btn-info achievements-button" data-toggle="modal" data-target="#achievements-modal"><span class="glyphicon glyphicon-thumbs-up"></span></button>
<hr>
<button class="pull-right btn btn-info" ng-click="lc.showDetectorInfo()"><span class="glyphicon glyphicon-info-sign"></span></button>
<div id="detector" ng-controller="DetectorController as dc">