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

moved version in help menu to top

Browse Source
This commit is contained in:
David Kaltschmidt
2018-04-16 16:25:28 +02:00
parent 712212d6aa
commit 5a29c17282
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/index.go
View File

@@ -289,7 +289,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
data.NavTree = append(data.NavTree, &dtos.NavLink{ data.NavTree = append(data.NavTree, &dtos.NavLink{
Text: "Help", Text: "Help",
SubTitle: fmt.Sprintf(`Grafana version: %s+%s`, setting.BuildVersion, setting.BuildCommit), SubTitle: fmt.Sprintf(`Grafana v%s (%s)`, setting.BuildVersion, setting.BuildCommit),
Id: "help", Id: "help",
Url: "#", Url: "#",
Icon: "gicon gicon-question", Icon: "gicon gicon-question",

6
public/app/core/components/sidemenu/sidemenu.html
View File

@@ -54,6 +54,9 @@
</span> </span>
</a> </a>
<ul class="dropdown-menu dropdown-menu--sidemenu" role="menu"> <ul class="dropdown-menu dropdown-menu--sidemenu" role="menu">
<li ng-if="item.subTitle" class="sidemenu-subtitle">
<span class="sidemenu-item-text">{{::item.subTitle}}</span>
</li>
<li ng-if="item.showOrgSwitcher" class="sidemenu-org-switcher"> <li ng-if="item.showOrgSwitcher" class="sidemenu-org-switcher">
<a ng-click="ctrl.switchOrg()"> <a ng-click="ctrl.switchOrg()">
<div> <div>
@@ -70,9 +73,6 @@
{{::child.text}} {{::child.text}}
</a> </a>
</li> </li>
<li ng-if="item.subTitle" class="side-menu-subtitle">
<span class="sidemenu-item-text">{{::item.subTitle}}</span>
</li>
<li class="side-menu-header"> <li class="side-menu-header">
<span class="sidemenu-item-text">{{::item.text}}</span> <span class="sidemenu-item-text">{{::item.text}}</span>
</li> </li>

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

@@ -149,12 +149,13 @@
color: #ebedf2; color: #ebedf2;
} }
.side-menu-subtitle { .sidemenu-subtitle {
padding: 0.5rem 0.5rem 0.5rem 1rem; padding: 0.5rem 1rem 0.5rem;
font-size: $font-size-sm; font-size: $font-size-sm;
color: $text-color-weak; color: $text-color-weak;
border-top: 1px solid $dropdownDividerBottom; border-bottom: 1px solid $dropdownDividerBottom;
margin-top: 0.25rem; margin-bottom: 0.25rem;
white-space: nowrap;
} }
li.sidemenu-org-switcher { li.sidemenu-org-switcher {