public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more design work

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-02-01 19:13:33 +01:00
parent d272b0f56d
commit 56aa8ae6e0
6 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/directives/topnav.js
-3
View File
@@ -37,9 +37,6 @@ function (angular) {
'<a ng-click="titleAction()" class="top-nav-title">' +
'{{title}}' +
'<span class="small" ng-show="titleAction">' +
'<i class="fa fa-angle-down"></i>' +
'</span>' +
'</a>' +
'</div><div ng-transclude></div></div></div></div>',
link: function(scope, elem, attrs) {
src/app/features/account/partials/account.html
+16 -1
View File
@@ -1,4 +1,19 @@
<topnav toggle="toggleSideMenu()" title="Details" icon="fa fa-shield" section="Account" show-menu-btn="!grafana.sidemenu"></topnav>
<topnav toggle="toggleSideMenu()" icon="fa fa-shield" section="Account" show-menu-btn="!grafana.sidemenu">
<!-- <ul class="nav"> -->
<!-- <li> -->
<!-- <a href="asd">Details</a> -->
<!-- </li> -->
<!-- <li> -->
<!-- <a href="asd">Data Sources</a> -->
<!-- </li> -->
<!-- <li> -->
<!-- <a href="asd">Users</a> -->
<!-- </li> -->
<!-- <li> -->
<!-- <a href="asd">API Keys</a> -->
<!-- </li> -->
<!-- </ul> -->
</topnav>
<div class="gf-box" style="min-height: 500px">
src/app/panels/graph/module.html
+4 -4
View File
@@ -24,9 +24,9 @@
<div class="clearfix"></div>
<div style="margin-top: 30px" ng-if="editMode">
<div class="dashboard-editor-header">
<div class="dashboard-editor-title">
<div class="gf-box" ng-if="editMode">
<div class="gf-box-header">
<div class="gf-box-title">
<i class="fa fa-bar-chart"></i>
Graph
</div>
@@ -37,7 +37,7 @@
</div>
</div>
<div class="dashboard-editor-body">
<div class="gf-box-body">
<div ng-repeat="tab in panelMeta.editorTabs" ng-if="editor.index === $index">
<div ng-include src="tab.src"></div>
</div>
src/app/partials/navbar.html
+5
View File
@@ -7,6 +7,11 @@
section="{{pageSection}}"
show-menu-btn="!grafana.sidemenu">
</topnav>
<ul class="nav">
<li>
<a href="asd">Data Sources</a>
</li>
</ul>
</div>
</div>
</div>
src/css/less/sidemenu.less
+33 -14
View File
@@ -1,5 +1,30 @@
// body {
// position: absolute;
// overflow: hidden;
// width: 100%;
// height: 100%;
// }
// .sidemenu-canvas {
// width: 100%;
// height: 100%;
// position: relative;
// -webkit-transform: translateX(0);
// transform: translateX(0);
// -webkit-transition: .3s ease all;
// transition: .3s ease all;
// }
.sidemenu-wrapper {
position: absolute;
display: none;
top: 0;
left: 0;
width: 200px;
background: @bodyBackground;
min-height: 100%;
z-index: 101;
a:focus {
text-decoration: none;
}
@@ -8,26 +33,20 @@
.sidemenu-open {
.sidemenu-wrapper {
display: block;
position: absolute;
top: 0;
left: 0;
width: 200px;
background: @bodyBackground;
min-height: 100%;
z-index: 101;
}
.dashboard-notice {
margin-left: 200px;
width: auto;
}
.main-view {
padding-left: 200px;
}
.panel-fullscreen {
left: 200px;
.sidemenu-canvas {
//-webkit-transform: translateX(200px);
//transform: translateX(200px);
}
.dashboard-notice {
margin-left: 200px;
width: auto;
}
}
src/views/index.html
+3 -2
View File
@@ -24,10 +24,10 @@
</head>
<body ng-cloak ng-controller="GrafanaCtrl">
<body ng-cloak ng-controller="GrafanaCtrl" ng-class="{'sidemenu-open': grafana.sidemenu}">
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css" ng-if="grafana.style === 'light'">
<div class="main-view-wrapper" ng-class="{'sidemenu-open': grafana.sidemenu}">
<div class="sidemenu-canvas">
<aside class="sidemenu-wrapper" ng-if="grafana.sidemenu">
<div ng-include="'app/partials/sidemenu.html'"></div>
@@ -44,6 +44,7 @@
</div>
<div ng-view class="main-view"></div>
</div>
</div>