From 263f8c9ec11da7085270e4df1962132669be4fae Mon Sep 17 00:00:00 2001
From: Finn <finn@finn.io>
Date: Tue, 23 Apr 2024 15:42:31 -0700
Subject: [PATCH] update forgejo template override

---
 k8s/forgejo/config.yaml | 52 ++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/k8s/forgejo/config.yaml b/k8s/forgejo/config.yaml
index 7b9627e..b76155e 100644
--- a/k8s/forgejo/config.yaml
+++ b/k8s/forgejo/config.yaml
@@ -63,16 +63,16 @@ data:
         </a>
 
         <!-- mobile right menu, it must be here because in mobile view, each item is a flex column, the first item is a full row column -->
-        <div class="ui secondary menu item navbar-mobile-right">
+        <div class="ui secondary menu item navbar-mobile-right only-mobile">
           {{if .IsSigned}}
-          <a id="mobile-notifications-icon" class="item gt-w-auto gt-p-3" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
-            <div class="gt-relative">
+          <a id="mobile-notifications-icon" class="item tw-w-auto tw-p-2" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
+            <div class="tw-relative">
               {{svg "octicon-bell"}}
-              <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
+              <span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
             </div>
           </a>
           {{end}}
-          <button class="item gt-w-auto ui icon mini button gt-p-3 gt-m-0" id="navbar-expand-toggle">{{svg "octicon-three-bars"}}</button>
+          <button class="item tw-w-auto ui icon mini button tw-p-2 tw-m-0" id="navbar-expand-toggle" aria-label="{{ctx.Locale.Tr "toggle_menu"}}">{{svg "octicon-three-bars"}}</button>
         </div>
 
         <!-- navbar links non-mobile -->
@@ -108,9 +108,9 @@ data:
       <div class="navbar-right ui secondary menu">
         {{if and .IsSigned .MustChangePassword}}
           <div class="ui dropdown jump item" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
-            <span class="text gt-df gt-ac">
-              {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
-              <span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
+            <span class="text tw-flex tw-items-center">
+              {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
+              <span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
               <span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
             </span>
             <div class="menu user-menu">
@@ -127,19 +127,19 @@ data:
           </div><!-- end dropdown avatar menu -->
         {{else if .IsSigned}}
           {{if EnableTimetracking}}
-          <a class="active-stopwatch-trigger item gt-mx-0{{if not .ActiveStopwatch}} gt-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}">
-            <div class="gt-relative">
+          <a class="active-stopwatch-trigger item tw-mx-0{{if not .ActiveStopwatch}} tw-hidden{{end}}" href="{{.ActiveStopwatch.IssueLink}}" title="{{ctx.Locale.Tr "active_stopwatch"}}">
+            <div class="tw-relative">
               {{svg "octicon-stopwatch"}}
               <span class="header-stopwatch-dot"></span>
             </div>
-            <span class="mobile-only gt-ml-3">{{ctx.Locale.Tr "active_stopwatch"}}</span>
+            <span class="only-mobile tw-ml-2">{{ctx.Locale.Tr "active_stopwatch"}}</span>
           </a>
-          <div class="active-stopwatch-popup item tippy-target gt-p-3">
-            <div class="gt-df gt-ac">
-              <a class="stopwatch-link gt-df gt-ac" href="{{.ActiveStopwatch.IssueLink}}">
-                {{svg "octicon-issue-opened" 16 "gt-mr-3"}}
+          <div class="active-stopwatch-popup item tippy-target tw-p-2">
+            <div class="tw-flex tw-items-center">
+              <a class="stopwatch-link tw-flex tw-items-center" href="{{.ActiveStopwatch.IssueLink}}">
+                {{svg "octicon-issue-opened" 16 "tw-mr-2"}}
                 <span class="stopwatch-issue">{{.ActiveStopwatch.RepoSlug}}#{{.ActiveStopwatch.IssueIndex}}</span>
-                <span class="ui primary label stopwatch-time gt-my-0 gt-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
+                <span class="ui primary label stopwatch-time tw-my-0 tw-mx-4" data-seconds="{{.ActiveStopwatch.Seconds}}">
                   {{if .ActiveStopwatch}}{{Sec2Time .ActiveStopwatch.Seconds}}{{end}}
                 </span>
               </a>
@@ -163,18 +163,18 @@ data:
           </div>
           {{end}}
 
-          <a class="item not-mobile gt-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
-            <div class="gt-relative">
+          <a class="item not-mobile tw-mx-0" href="{{AppSubUrl}}/notifications" data-tooltip-content="{{ctx.Locale.Tr "notifications"}}" aria-label="{{ctx.Locale.Tr "notifications"}}">
+            <div class="tw-relative">
               {{svg "octicon-bell"}}
-              <span class="notification_count{{if not $notificationUnreadCount}} gt-hidden{{end}}">{{$notificationUnreadCount}}</span>
+              <span class="notification_count{{if not $notificationUnreadCount}} tw-hidden{{end}}">{{$notificationUnreadCount}}</span>
             </div>
           </a>
 
-          <div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
+          <div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "create_new"}}">
             <span class="text">
               {{svg "octicon-plus"}}
               <span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
-              <span class="mobile-only">{{ctx.Locale.Tr "create_new"}}</span>
+              <span class="only-mobile">{{ctx.Locale.Tr "create_new"}}</span>
             </span>
             <div class="menu">
               <a class="item" href="{{AppSubUrl}}/repo/create">
@@ -193,10 +193,10 @@ data:
             </div><!-- end content create new menu -->
           </div><!-- end dropdown menu create new -->
 
-          <div class="ui dropdown jump item gt-mx-0 gt-pr-3" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
-            <span class="text gt-df gt-ac">
-              {{ctx.AvatarUtils.Avatar .SignedUser 24 "gt-mr-2"}}
-              <span class="mobile-only gt-ml-3">{{.SignedUser.Name}}</span>
+          <div class="ui dropdown jump item tw-mx-0 tw-pr-2" data-tooltip-content="{{ctx.Locale.Tr "user_profile_and_more"}}">
+            <span class="text tw-flex tw-items-center">
+              {{ctx.AvatarUtils.Avatar .SignedUser 24 "tw-mr-1"}}
+              <span class="only-mobile tw-ml-2">{{.SignedUser.Name}}</span>
               <span class="not-mobile">{{svg "octicon-triangle-down"}}</span>
             </span>
             <div class="menu user-menu">
@@ -249,7 +249,7 @@ data:
               {{svg "octicon-person"}} {{ctx.Locale.Tr "register"}}
             </a>
           {{end}}
-          <a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/oauth2/Janky%20Solutions{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
+          <a class="item{{if .PageIsSignIn}} active{{end}}" rel="nofollow" href="{{AppSubUrl}}/user/oauth2/MY_OAUTH_PROVIDER_NAME{{if not .PageIsSignIn}}?redirect_to={{.CurrentURL}}{{end}}">
             {{svg "octicon-sign-in"}} {{ctx.Locale.Tr "sign_in"}}
           </a>
         {{end}}