Domů Procházet Nápověda
Registrovat se Přihlásit se
oscarleiva
/
energylink
1
0
Rozštěpit 0
Soubory Úkoly 0 Pull Requesty 0 Wiki
Procházet zdrojové kódy

more design work

Torkel Ödegaard před 11 roky
rodič
d272b0f56d
revize
56aa8ae6e0
6 změnil soubory, kde provedl 61 přidání a 24 odebrání
Jednotné zobrazení Ukázat statistiku rozdílových dat
  1. 0 3
      src/app/directives/topnav.js
  2. 16 1
      src/app/features/account/partials/account.html
  3. 4 4
      src/app/panels/graph/module.html
  4. 5 0
      src/app/partials/navbar.html
  5. 33 14
      src/css/less/sidemenu.less
  6. 3 2
      src/views/index.html

+ 0 - 3
src/app/directives/topnav.js
Zobrazit soubor 

@@ -37,9 +37,6 @@ function (angular) {
 
 
 
             '<a ng-click="titleAction()" class="top-nav-title">' +
 
             '<a ng-click="titleAction()" class="top-nav-title">' +
 
               '{{title}}' +
 
               '{{title}}' +
 
-              '<span class="small" ng-show="titleAction">' +
 
-                '<i class="fa fa-angle-down"></i>' +
 
-              '</span>' +
 
             '</a>' +
 
             '</a>' +
 
           '</div><div ng-transclude></div></div></div></div>',
 
           '</div><div ng-transclude></div></div></div></div>',
 
         link: function(scope, elem, attrs) {
 
         link: function(scope, elem, attrs) {

+ 16 - 1
src/app/features/account/partials/account.html
Zobrazit soubor 

@@ -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">
 
 <div class="gf-box" style="min-height: 500px">

+ 4 - 4
src/app/panels/graph/module.html
Zobrazit soubor 

@@ -24,9 +24,9 @@
 
 
 
 	<div class="clearfix"></div>
 
 	<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>
 
 				<i class="fa fa-bar-chart"></i>
 
 				Graph
 
 				Graph
 
 			</div>
 
 			</div>
 
@@ -37,7 +37,7 @@
 
 			</div>
 
 			</div>
 
 		</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-repeat="tab in panelMeta.editorTabs" ng-if="editor.index === $index">
 
 				<div ng-include src="tab.src"></div>
 
 				<div ng-include src="tab.src"></div>
 
 			</div>
 
 			</div>

+ 5 - 0
src/app/partials/navbar.html
Zobrazit soubor 

@@ -7,6 +7,11 @@
 
 							section="{{pageSection}}"
 
 							section="{{pageSection}}"
 
 							show-menu-btn="!grafana.sidemenu">
 
 							show-menu-btn="!grafana.sidemenu">
 
 			</topnav>
 
 			</topnav>
 
+			<ul class="nav">
 
+				<li>
 
+					<a href="asd">Data Sources</a>
 
+				</li>
 
+			</ul>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 </div>
 
 </div>

+ 33 - 14
src/css/less/sidemenu.less
Zobrazit soubor 

@@ -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 {
 
 .sidemenu-wrapper {
 
+  position: absolute;
 
   display: none;
 
   display: none;
 
+  top: 0;
 
+  left: 0;
 
+  width: 200px;
 
+  background: @bodyBackground;
 
+  min-height: 100%;
 
+  z-index: 101;
 
+
 
   a:focus {
 
   a:focus {
 
     text-decoration: none;
 
     text-decoration: none;
 
   }
 
   }
 
@@ -8,26 +33,20 @@
 
 .sidemenu-open {
 
 .sidemenu-open {
 
   .sidemenu-wrapper {
 
   .sidemenu-wrapper {
 
     display: block;
 
     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 {
 
   .main-view {
 
     padding-left: 200px;
 
     padding-left: 200px;
 
   }
 
   }
 
 
 
-  .panel-fullscreen {
 
-    left: 200px;
 
+  .sidemenu-canvas {
 
+    //-webkit-transform: translateX(200px);
 
+    //transform: translateX(200px);
 
+  }
 
+
 
+  .dashboard-notice {
 
+    margin-left: 200px;
 
+    width: auto;
 
   }
 
   }
 
 }
 
 }

+ 3 - 2
src/views/index.html
Zobrazit soubor 

@@ -24,10 +24,10 @@
 
 
 
   </head>
 
   </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'">
 
     <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">
 
 			<aside class="sidemenu-wrapper" ng-if="grafana.sidemenu">
 
 				<div ng-include="'app/partials/sidemenu.html'"></div>
 
 				<div ng-include="'app/partials/sidemenu.html'"></div>
 
@@ -44,6 +44,7 @@
 
 			</div>
 
 			</div>
 
 
 
 			<div ng-view class="main-view"></div>
 
 			<div ng-view class="main-view"></div>
 
+			</div>
 
 
 
 		</div>
 
 		</div>