Move the navigation bar milestone to the right.

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Optimize the length of the clone button.
 - Optimize the color of the branch/tag/submission history icon for the soft dark theme in the template.
 
+##### Template File
+
+- Move the navigation bar milestone to the right.
+
 ### 🐞 Fix
 
 - Fix template submission list avatar alignment issue.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitea-github-theme",
-  "version": "1.26.1",
+  "version": "1.26.2",
   "license": "Apache-2.0",
   "author": {
     "name": "lutinglt",

styles/public/transition.ts

@@ -89,6 +89,10 @@ export const transition = css`
     &:active {
       transform: translateY(1px);
     }
+    /* 下拉图标的过渡会导致在下移过程中出现的菜单被短暂遮挡 */
+    &.dropdown {
+      z-index: 999;
+    }
     .button:active {
       transform: none;
     }

templates/base/head_navbar.tmpl

@@ -15,11 +15,6 @@
 		{{if and .IsSigned .MustChangePassword}}
 			{{/* No links */}}
 		{{else if .IsSigned}}
-			{{if not (and ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled ctx.Consts.RepoUnitTypePullRequests.UnitGlobalDisabled)}}
-				{{if .ShowMilestonesDashboardPage}}
-					<a class="item{{if .PageIsMilestonesDashboard}} active{{end}}" href="{{AppSubUrl}}/milestones">{{ctx.Locale.Tr "milestones"}}</a>
-				{{end}}
-			{{end}}
 			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/repos">{{ctx.Locale.Tr "explore_title"}}</a>
 		{{else if .IsLandingPageOrganizations}}
 			<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore/organizations">{{ctx.Locale.Tr "explore_title"}}</a>
@@ -78,7 +73,7 @@
 					{{end}}
 				</div><!-- end content create new menu -->
 			</div><!-- end dropdown menu create new -->
-			{{template "base/head_navbar_icons" dict "ItemExtraClass" "not-mobile" "PageGlobalData" .PageGlobalData}}
+			{{template "base/head_navbar_icons" dict "ItemExtraClass" "not-mobile" "PageGlobalData" .PageGlobalData "ShowMilestonesDashboardPage" .ShowMilestonesDashboardPage}}
 
 			<div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
 				<span class="text tw-flex tw-items-center">

templates/base/head_navbar_icons.tmpl

@@ -21,6 +21,13 @@
 		{{svg "octicon-git-pull-request"}}
 	</a>
 	{{end}}
+	{{if not (and ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled ctx.Consts.RepoUnitTypePullRequests.UnitGlobalDisabled)}}
+		{{if .ShowMilestonesDashboardPage}}
+			<a class="item {{$itemExtraClass}}" href="{{AppSubUrl}}/milestones" data-tooltip-content="{{ctx.Locale.Tr "milestones"}}">
+				{{svg "octicon-milestone"}}
+			</a>
+		{{end}}
+	{{end}}
 	<a class="item {{$itemExtraClass}}" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}">
 		<div class="tw-relative flex-text-block">
 			{{svg "octicon-inbox"}}