Bladeren bron

added hamburger

Torkel Ödegaard 11 jaren geleden
bovenliggende
commit
83899eb884
3 gewijzigde bestanden met toevoegingen van 17 en 4 verwijderingen
  1. 6 3
      src/app/partials/dashboard_topnav.html
  2. 1 1
      src/app/partials/login.html
  3. 10 0
      src/css/less/grafana.less

+ 6 - 3
src/app/partials/dashboard_topnav.html

@@ -1,10 +1,13 @@
 <div class="navbar navbar-static-top">
 	<div class="navbar-inner">
 		<div class="container-fluid">
-			<span class="brand">
-				<a ng-click="toggleSideMenu()">
-				  <img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
+			<span class="hamburger">
+				<a class="pointer" ng-click="toggleSideMenu()">
+					<i class="fa fa-bars"></i>
 				</a>
+			</span>
+			<span class="brand">
+				<img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
 				<span class="page-title">{{dashboard.title}}</span>
 			</span>
 

+ 1 - 1
src/app/partials/login.html

@@ -28,7 +28,7 @@
               Password
             </li>
             <li>
-              <input type="password" class="tight-form-input last" required ng-model="loginModel.password" id="inputPassword" style="width: 246px">
+              <input type="password" class="tight-form-input last" required ng-model="loginModel.password" id="inputPassword" style="width: 246px" placeholder="password"
             </li>
           </ul>
           <div class="clearfix"></div>

+ 10 - 0
src/css/less/grafana.less

@@ -52,6 +52,16 @@
   float: left;
 }
 
+.navbar .brand {
+  margin-left: 0;
+}
+
+.hamburger {
+  float: left;
+  padding: 15px 0 14px 0;
+  font-size: 1.4em;
+}
+
 .page-title {
  padding: 15px 0;
  display: block;