Backport changes

Author: Gusted

templates/user/dashboard/navbar.tmpl

@@ -75,30 +75,32 @@
 		{{end}}
 
 	{{if .ContextUser.IsOrganization}}
-		<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
-			{{svg "octicon-rss"}}&nbsp;{{.i18n.Tr "activities"}}
-		</a>
-		{{if not .UnitIssuesGlobalDisabled}}
-		<a class="{{if .PageIsIssues}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/issues{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
-			{{svg "octicon-issue-opened"}}&nbsp;{{.i18n.Tr "issues"}}
-		</a>
-		{{end}}
+		<div class="right stackable menu">
+			<a class="{{if .PageIsNews}}active{{end}} item" style="margin-left: auto" href="{{.ContextUser.DashboardLink}}{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
+				{{svg "octicon-rss"}}&nbsp;{{.i18n.Tr "activities"}}
+			</a>
+			{{if not .UnitIssuesGlobalDisabled}}
+			<a class="{{if .PageIsIssues}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/issues{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
+				{{svg "octicon-issue-opened"}}&nbsp;{{.i18n.Tr "issues"}}
+			</a>
+			{{end}}
 			{{if not .UnitPullsGlobalDisabled}}
-		<a class="{{if .PageIsPulls}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/pulls{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
-			{{svg "octicon-git-pull-request"}}&nbsp;{{.i18n.Tr "pull_requests"}}
-		</a>
-		{{end}}
-		{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
-		<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/milestones{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
-			{{svg "octicon-milestone"}}&nbsp;{{.i18n.Tr "milestones"}}
-		</a>
-		{{end}}
-		<div class="item">
-			<a class="ui primary basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
-				{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
+			<a class="{{if .PageIsPulls}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/pulls{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
+				{{svg "octicon-git-pull-request"}}&nbsp;{{.i18n.Tr "pull_requests"}}
+			</a>
+			{{end}}
+			{{if and .ShowMilestonesDashboardPage (not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled))}}
+			<a class="{{if .PageIsMilestonesDashboard}}active{{end}} item" href="{{.ContextUser.OrganisationLink}}/milestones{{if .Team}}/{{PathEscape .Team.Name}}{{end}}">
+				{{svg "octicon-milestone"}}&nbsp;{{.i18n.Tr "milestones"}}
 			</a>
+			{{end}}
+			<div class="item">
+				<a class="ui primary basic button" href="{{.ContextUser.HomeLink}}" title='{{.i18n.Tr "home.view_home" .ContextUser.Name}}'>
+					{{.i18n.Tr "home.view_home" (.ContextUser.ShortName 40)}}
+				</a>
 			</div>
-		{{end}}
+		</div>
+	{{end}}
 	</div>
 </div>
 <div class="ui divider"></div>

web_src/less/_base.less

@@ -2194,7 +2194,7 @@ table th[data-sortt-desc] {
   .ui.stackable.menu:not(.no-vertical-tabs) {
     overflow-y: hidden;
     overflow-x: auto;
-    flex-direction: row !important;
+    flex-direction: row;
     flex-wrap: nowrap !important;
 
     .item {
@@ -2204,5 +2204,9 @@ table th[data-sortt-desc] {
     > .dropdown.item {
       position: initial;
     }
+
+    .menu {
+      flex-direction: row;
+    }
   }
 }