Just testing a thing

This commit is contained in:
Torkel Ödegaard 2015-01-27 18:20:12 +01:00
parent 4572747bd6
commit c6e110100a
4 changed files with 27 additions and 12 deletions

View File

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

View File

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

View File

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

View File

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