moved version in help menu to top

pkg/api/index.go

@@ -289,7 +289,7 @@ func setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, error) {
 
 	data.NavTree = append(data.NavTree, &dtos.NavLink{
 		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",
 		Url:          "#",
 		Icon:         "gicon gicon-question",

public/app/core/components/sidemenu/sidemenu.html

@@ -54,6 +54,9 @@
       </span>
     </a>
     <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">
         <a ng-click="ctrl.switchOrg()">
           <div>
@@ -70,9 +73,6 @@
           {{::child.text}}
         </a>
       </li>
-      <li ng-if="item.subTitle" class="side-menu-subtitle">
-        <span class="sidemenu-item-text">{{::item.subTitle}}</span>
-      </li>
       <li class="side-menu-header">
         <span class="sidemenu-item-text">{{::item.text}}</span>
       </li>

public/sass/components/_sidemenu.scss

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