IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-settings

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-11 12:15:59 +01:00
commit 8354c64ff5
4 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cmd/grafana-server/main.go
View File

@ -30,7 +30,7 @@ import (
_ "github.com/grafana/grafana/pkg/tsdb/testdata" _ "github.com/grafana/grafana/pkg/tsdb/testdata"
) )
var version = "4.6.0" var version = "5.0.0"
var commit = "NA" var commit = "NA"
var buildstamp string var buildstamp string
var build_date string var build_date string

2
public/app/features/dashboard/dashboardLoaderSrv.js
View File

@ -43,7 +43,7 @@ function (angular, moment, _, $, kbn, dateMath, impressionSrv) {
}); });
} else { } else {
promise = backendSrv.getDashboard($routeParams.type, $routeParams.slug) promise = backendSrv.getDashboard($routeParams.type, $routeParams.slug)
.then(result => { .then(function(result) {
if (result.meta.isFolder) { if (result.meta.isFolder) {
$rootScope.appEvent("alert-error", ['Dashboard not found']); $rootScope.appEvent("alert-error", ['Dashboard not found']);
throw new Error("Dashboard not found"); throw new Error("Dashboard not found");

29
public/sass/components/_navbar.scss
View File

@ -1,7 +1,7 @@
.navbar { .navbar {
position: relative; position: relative;
padding-left: $side-menu-width; margin-left: 40px;
z-index: $zindex-navbar-fixed; z-index: $zindex-navbar-fixed;
height: $navbarHeight; height: $navbarHeight;
padding-right: $spacer; padding-right: $spacer;
@ -48,12 +48,6 @@
} }
} }
.sidemenu-open {
.navbar {
padding-left: 15px;
}
}
.navbar-page-btn { .navbar-page-btn {
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
@ -82,6 +76,8 @@
line-height: 8px; line-height: 8px;
opacity: 0.75; opacity: 0.75;
margin-right: 8px; margin-right: 8px;
// icon hidden on smaller screens
display: none;
} }
} }
@ -143,3 +139,22 @@
@include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl); @include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl);
} }
} }
@include media-breakpoint-up(sm) {
.navbar {
margin-left: 50px;
}
.sidemenu-open {
.navbar {
margin-left: 15px;
}
}
.navbar-page-btn {
.gicon {
display: inline-block;
}
}
}

9
public/sass/components/_sidemenu.scss
View File

@ -16,7 +16,6 @@
.sidemenu__close { .sidemenu__close {
display: none; display: none;
} }
} }
// body class that hides sidemenu // body class that hides sidemenu
@ -191,12 +190,6 @@ li.sidemenu-org-switcher {
} }
@include media-breakpoint-down(xs) { @include media-breakpoint-down(xs) {
.sidemenu-open {
.navbar {
padding-left: 60px !important;
}
}
.sidemenu-open--xs { .sidemenu-open--xs {
.sidemenu { .sidemenu {
width: 100%; width: 100%;
@ -227,7 +220,7 @@ li.sidemenu-org-switcher {
} }
.sidemenu__logo_small_breakpoint { .sidemenu__logo_small_breakpoint {
padding: 12px 10px 26px; padding: 16px 10px 26px;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-between; justify-content: space-between;