ソースを参照

Just testing a thing

Torkel Ödegaard 11 年 前
コミット
c6e110100a

+ 8 - 5
src/app/partials/dashboard_topnav.html

@@ -3,18 +3,21 @@
 		<div class="container-fluid">
 			<span class="hamburger">
 				<a class="pointer" ng-click="toggleSideMenu()">
-					<i class="fa fa-bars"></i>
+					<img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
+					Menu
 				</a>
 			</span>
-			<span class="brand">
-				<img class="logo-icon" src="img/fav32.png" bs-tooltip="'Grafana'" data-placement="bottom"></img>
+			<div class="navbar-header">
+				<div class="navbar-header-breadcrumb">
+					Dashboards <i class="fa fa-angle-right"></i>
+				</div>
 				<a ng-click="openSearch()" class="page-title">
-					{{dashboard.title}}
+					<i class="fa fa-th-large"></i> {{dashboard.title}}
 					<span class="small">
 						<i class="fa fa-angle-down"></i>
 					</span>
 				</a>
-			</span>
+			</div>
 
 			<ul class="nav pull-right">
 				<li ng-show="dashboardViewState.fullscreen">

+ 0 - 1
src/app/partials/sidemenu.html

@@ -1,5 +1,4 @@
 <div ng-controller="SideMenuCtrl" ng-init="init()">
-
 	<ul class="sidemenu">
 		<li class="dropdown">
 			<a class="sidemenu-user pointer" data-toggle="dropdown" title="{{grafana.user.email}}">

+ 1 - 1
src/css/less/bootswatch.dark.less

@@ -63,7 +63,7 @@ hr {
 	}
 
 	.nav > li > a {
-		padding: 15px 15px 14px;
+		padding: 22px 15px 16px;
 		border-bottom: 1px solid transparent;
 	}
 

+ 18 - 5
src/css/less/grafana.less

@@ -47,8 +47,8 @@
 
 .logo-icon {
   width: 24px;
-  padding: 13px 11px 0 0;
   display: block;
+  padding-right: 5px;
   float: left;
 }
 
@@ -58,14 +58,27 @@
 
 .hamburger {
   float: left;
-  padding: 15px 0 14px 0;
-  font-size: 1.4em;
+  padding: 17px 20px 16px 0;
+  font-size: 1.1em;
+  color: @gray;
+}
+
+.navbar-header {
+  float: left;
+  padding: 10px;
+  .navbar-header-breadcrumb {
+    font-size: 90%;
+    padding-bottom: 4px;
+  }
 }
 
 .page-title {
- padding: 15px 0;
+ i {
+   padding-right: 6px;
+ }
  display: block;
- float: left;
+ font-size: 1.3em;
+ font-weight: bold;
 }
 
 .row-button {