Remove fomantic loader module (#26670)

Replace Fomantic `loader` CSS module with our existing `is-loading` spinner. Only three places in the UI used this module, which are pictured here: imagediff: <img width="1237" alt="Screenshot 2023-08-22 at 22 18 01" src="https://github.com/go-gitea/gitea/assets/115237/b0d82531-f05e-43c6-9e5b-1bfc268c056d"> webauthn: <img width="894" alt="Screenshot 2023-08-22 at 22 05 05" src="https://github.com/go-gitea/gitea/assets/115237/7b583425-d944-474a-a57a-22a65bbd8b29"> heatmap (I removed the previous loading text, it was unreadable because it was tiny and on fast machines only visible for a fraction of a second): <img width="764" alt="Screenshot 2023-08-22 at 22 18 44" src="https://github.com/go-gitea/gitea/assets/115237/1c7472d6-3e17-4224-a992-d8c0b380cc73"> Also, heatmap container does not resize any more after loading now and previous duplicate id `user-heatmap` is gone. --------- Co-authored-by: wxiaoguang <[email protected]>
go-gitea · Aug 25, 2023 · 8b5c081 · 8b5c081
1 parent f626366
commit 8b5c081
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 993 deletions.
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
@@ -598,7 +598,6 @@ overview = Overview
 following = Following
 follow = Follow
 unfollow = Unfollow
-heatmap.loading = Loading Heatmap…
 user_bio = Biography
 disabled_public_activity = This user has disabled the public visibility of the activity.
 email_visibility.limited = Your email address is visible to all authenticated users

diff --git a/templates/user/auth/webauthn.tmpl b/templates/user/auth/webauthn.tmpl
@@ -10,8 +10,8 @@
 				{{template "base/alert" .}}
 				<p>{{.locale.Tr "webauthn_sign_in"}}</p>
 			</div>
-			<div class="ui attached segment">
-				<div class="ui active indeterminate inline loader"></div>
+			<div class="ui attached segment gt-df gt-ac gt-jc gt-gap-2 gt-py-3">
+				<div class="is-loading" style="width: 40px; height: 40px"></div>
 				{{.locale.Tr "webauthn_press_button"}}
 			</div>
 			<div class="ui attached segment">

diff --git a/templates/user/heatmap.tmpl b/templates/user/heatmap.tmpl
@@ -1,14 +1,10 @@
 {{if .HeatmapData}}
-	<div id="user-heatmap"
+	<div id="user-heatmap" class="is-loading"
 		data-heatmap-data="{{JsonUtils.EncodeToString .HeatmapData}}"
 		data-locale-total-contributions="{{$.locale.Tr "heatmap.number_of_contributions_in_the_last_12_months" ($.locale.PrettyNumber .HeatmapTotalContributions)}}"
 		data-locale-no-contributions="{{.locale.Tr "heatmap.no_contributions"}}"
 		data-locale-more="{{.locale.Tr "heatmap.more"}}"
 		data-locale-less="{{.locale.Tr "heatmap.less"}}"
-	>
-		<div slot="loading">
-			<div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.locale.Tr "user.heatmap.loading"}}</div>
-		</div>
-	</div>
+	></div>
 	<div class="divider"></div>
 {{end}}
diff --git a/web_src/css/features/heatmap.css b/web_src/css/features/heatmap.css
@@ -2,7 +2,15 @@
   width: 100%;
   font-size: 9px;
   position: relative;
-  min-height: 125px;
+}
+
+/* before the Vue component is mounted, show a loading indicator with dummy size */
+/* the ratio is guesswork, see https://github.com/razorness/vue3-calendar-heatmap/issues/26 */
+#user-heatmap.is-loading {
+  aspect-ratio: 5.415; /* the size is about 790 x 145 */
+}
+.user.profile #user-heatmap.is-loading {
+  aspect-ratio: 5.645; /* the size is about 953 x 169 */
 }
 
 #user-heatmap text {
@@ -32,37 +40,15 @@
 }
 
 @media (max-width: 1200px) {
-  #user-heatmap {
-    min-height: 105px;
-  }
   #user-heatmap .total-contributions {
     left: 21px;
   }
 }
 
 @media (max-width: 1000px) {
-  #user-heatmap {
-    min-height: 80px;
-  }
   #user-heatmap .total-contributions {
     font-size: 10px;
     left: 17px;
     bottom: -4px;
   }
 }
-
-.user.profile #user-heatmap {
-  min-height: 135px;
-}
-
-@media (max-width: 1200px) {
-  .user.profile #user-heatmap {
-    min-height: 115px;
-  }
-}
-
-@media (max-width: 1000px) {
-  .user.profile #user-heatmap {
-    min-height: 90px;
-  }
-}
diff --git a/web_src/css/user.css b/web_src/css/user.css
@@ -58,10 +58,6 @@
   }
 }
 
-.user.profile #loading-heatmap {
-  margin-bottom: 1em;
-}
-
 .user.profile .ui.secondary.stackable.pointing.menu {
   flex-wrap: wrap;
 }