Merge branch 'root-v1.22-and-main' into release/dcs/v1.22

unfoldingWord · Feb 27, 2025 · 0c6079b · 0c6079b
2 parents 2a2e679 + 545066a
commit 0c6079b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 22 deletions.
diff --git a/templates/catalog/catalog_list.tmpl b/templates/catalog/catalog_list.tmpl
@@ -2,7 +2,7 @@
 	{{range .Door43Metadatas}}
 		<div class="flex-item">
 			<div class="flex-item-leading">
-				{{template "repo/icon" .Repo}}				
+				{{template "repo/icon" .Repo}}
 			</div>
 			<div class="flex-item-main">
 				<div class="flex-item-header">
@@ -50,25 +50,25 @@
 				</div>
 				<div class="flex-item-trailing">
 					<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=lang%3A{{.Language}}" data-tooltip-content="{{ctx.Locale.Tr "repo.metadata.language"}}: {{.LanguageTitle}} ({{.Language}}, {{.LanguageDirection}})">
-						<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .Language}}"></i>{{.Language}}</span>
+						<span class="tx-flex tw-items-center tw-mr-2"><i class="color-icon tw-mr-2" style="background-color: {{GetColorFromString .Language}}"></i>{{.Language}}</span>
 					</a>
 					<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=subject%3A{{.Subject}}">
-						<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .Subject}}"></i>{{.Subject}}</span>
+						<span class="tx-flex tw-items-center tw-mr-2"><i class="color-icon tw-mr-2" style="background-color: {{GetColorFromString .Subject}}"></i>{{.Subject}}</span>
 					</a>
 					<a class="muted" href="?sort={{$.SortType}}&q=metadata_type%3A{{.MetadataType}}" data-tooltip-content="{{ctx.Locale.Tr "repo.metadata.metadata_type"}}: {{.MetadataTypeTitle}} ({{.MetadataType}} {{.MetadataVersion}})">
 						<img src="{{AssetUrlPrefix}}/img/dcs/{{.MetadataTypeIcon}}" style="height:16px;vertical-align:middle" />
 							{{.MetadataType}} {{.MetadataVersion}}
 					</a>
 					{{if not $.DisableStars}}
-					<a class="text grey gt-df gt-ac gt-mr-3" href="{{.Repo.Link}}/stars">{{svg "octicon-star" 16 "gt-mr-3"}}{{.Repo.NumStars}}</a>
+					<a class="text grey tx-flex tw-items-center tw-mr-2" href="{{.Repo.Link}}/stars">{{svg "octicon-star" 16 "tw-mr-2"}}{{.Repo.NumStars}}</a>
 					{{end}}
-					<a class="text grey gt-df gt-ac gt-mr-3" href="{{.Repo.Link}}/forks">{{svg "octicon-git-branch" 16 "gt-mr-3"}}{{.Repo.NumForks}}</a>
-					<a class="text grey gt-df gt-ac gt-mr-3" href="{{.Repo.Link}}/releases" data-tooltip-content="# of releases">{{svg "octicon-tag" 16 "gt-mr-3"}} {{.ReleaseCount}}</a>
+					<a class="text grey tx-flex tw-items-center tw-mr-2" href="{{.Repo.Link}}/forks">{{svg "octicon-git-branch" 16 "tw-mr-2"}}{{.Repo.NumForks}}</a>
+					<a class="text grey tx-flex tw-items-center tw-mr-2" href="{{.Repo.Link}}/releases" data-tooltip-content="# of releases">{{svg "octicon-tag" 16 "tw-mr-2"}} {{.ReleaseCount}}</a>
 				</div>
 			</div>
-			
+
 			<div class="flex-item-body">
-				{{ctx.Locale.Tr "repo.metadata.publisher"}}: 
+				{{ctx.Locale.Tr "repo.metadata.publisher"}}:
 				<a href="?sort={{$.SortType}}&q=owner%3A{{.Repo.OwnerName}}">
 					{{if .Repo.Owner.FullName}}{{.Repo.Owner.FullName}}{{else}}{{.Repo.OwnerName}}{{end}}
 				</a>

diff --git a/templates/catalog/catalog_publisher_list.tmpl b/templates/catalog/catalog_publisher_list.tmpl
@@ -1,7 +1,7 @@
 <div class="ui repository list">
 	{{range .Door43Metadatas}}
 	<div class="item">
-		<div class="ui header gt-df gt-ac">
+		<div class="ui header tx-flex tw-items-center">
 			<div class="publisher-title">
 				<a class="name" href="#">
 					{{.Language}}

diff --git a/templates/explore/repo_list.tmpl b/templates/explore/repo_list.tmpl
@@ -71,12 +71,12 @@
 						<!-- DCS Customizations -->
 						{{if .RepoDM.Language}}
 							<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=lang%3A{{.RepoDM.Language}}" data-tooltip-content="{{.RepoDM.LanguageTitle}} ({{.RepoDM.Language}}, {{.RepoDM.LanguageDirection}})">
-								<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Language}}"></i>{{.RepoDM.Language}}</span>
+								<span class="tx-flex tw-items-center tw-mr-2"><i class="color-icon tw-mr-2" style="background-color: {{GetColorFromString .RepoDM.Language}}"></i>{{.RepoDM.Language}}</span>
 							</a>
 						{{end}}
 						{{if .RepoDM.Subject}}
 							<a class="muted" href="{{$.Link}}?sort={{$.SortType}}&q=subject%3A{{.RepoDM.Subject}}" data-tooltip-content="Abbreviation: {{.RepoDM.Abbreviation}}">
-								<span class="gt-df gt-ac gt-mr-3"><i class="color-icon gt-mr-3" style="background-color: {{GetColorFromString .RepoDM.Subject}}"></i>{{.RepoDM.Subject}}</span>
+								<span class="tx-flex tw-items-center tw-mr-2"><i class="color-icon tw-mr-2" style="background-color: {{GetColorFromString .RepoDM.Subject}}"></i>{{.RepoDM.Subject}}</span>
 							</a>
 						{{end}}
 						{{if and .RepoDM.MetadataType .RepoDM.MetadataVersion}}

diff --git a/templates/repo/dcs_healthcheck_list.tmpl b/templates/repo/dcs_healthcheck_list.tmpl
@@ -3,7 +3,7 @@
 	{{if $healthcheck}}
 	<div class="ui list">
 	{{range $issueCode := $healthcheck.GetOrder}}
-		{{$issues := index $healthcheck.Issues $issueCode}}							
+		{{$issues := index $healthcheck.Issues $issueCode}}
 		<div class="ui item">
 			<div class="toggle show-panel" data-panel="#{{$issueCode}}">
 			{{if not $issues}}
@@ -20,7 +20,7 @@
 			{{$issueCode.IssuePositiveString}}
 			</div>
 			{{if $issues}}
-				<div class="ui list gt-hidden" id="{{$issueCode}}">
+				<div class="ui list tw-hidden" id="{{$issueCode}}">
 					{{range $issue := $issues}}
 						<div class="status-item {{$issue.SeverityLevel}}">
 							<div class="item-text">

diff --git a/templates/repo/dcs_metadata.tmpl b/templates/repo/dcs_metadata.tmpl
@@ -47,11 +47,11 @@
 		<div class="ui attached segment">
 			{{if or .BranchDMs .ReleaseDMs}}
 				<h3 class="ui top attached header toggle show-panel" data-panel="#branches">{{ctx.Locale.Tr "repo.branches"}}</h3>
-				<div class="ui attached segment gt-hidden" id="branches">
+				<div class="ui attached segment tw-hidden" id="branches">
 					{{template "repo/dcs_metadata_list" (dict "ctxData" . "Door43Metadatas" .BranchDMs)}}
 				</div>
 				<h3 class="ui top attached header toggle show-panel" data-panel="#releases">Releases</h3>
-				<div class="ui attached segment gt-hidden" id="releases">
+				<div class="ui attached segment tw-hidden" id="releases">
 					{{template "repo/dcs_metadata_list" (dict "ctxData" . "Door43Metadatas" .ReleaseDMs)}}
 				</div>
 			{{else}}

diff --git a/templates/repo/dcs_metadata_list_item.tmpl b/templates/repo/dcs_metadata_list_item.tmpl
@@ -1,7 +1,7 @@
 {{$dm := .Door43Metadata}}
 {{if $dm}}
 <div class="item">
-	<div class="flex-text-block gt-sb">
+	<div class="flex-text-block tw-justify-between">
 		<div class="flex-text-inline">
 			{{$color := "grey"}}
 			{{$type := $dm.RefType}}
@@ -33,17 +33,15 @@
 			{{else if and $dm.IsLatestForStage (lt $dm.Stage 3)}}
 				{{$tooltip = printf "%s; Latest" $tooltip}}
 			{{end}}
-			<a data-tooltip-content="{{$type}}" href="{{.ctxData.RepoLink}}/src/{{$dm.RefType}}/{{$dm.Ref}}">{{svg $icon 16
-				"mr-3"}}</a>
-			<span data-tooltip-content="{{$tooltip}}" class="text {{$color}} gt-mr-3">{{svg "octicon-dot-fill"
-				22}}</span>
+			<a data-tooltip-content="{{$type}}" href="{{.ctxData.RepoLink}}/src/{{$dm.RefType}}/{{$dm.Ref}}">{{svg $icon 16 "tw-mr-2"}}</a>
+			<span data-tooltip-content="{{$tooltip}}" class="text {{$color}} tw-mr-2">{{svg "octicon-dot-fill" 22}}</span>
 			<a class="ui primary sha label toggle button show-panel" data-panel="#info-{{$dm.ID}}">{{$dm.Ref}}</a>
 		</div>
 		<span class="text grey">
 			{{TimeSince $dm.ReleaseDateUnix.AsTime ctx.Locale}}
 		</span>
 	</div>
-	<div class="info gt-hidden" id="info-{{$dm.ID}}">
+	<div class="info tw-hidden" id="info-{{$dm.ID}}">
 		<div class="ui top attached tabular menu">
 			<a class="item active" data-tab="db-{{$dm.ID}}">
 				Metadata (DB)
@@ -227,4 +225,4 @@
 		{{end}}
 	</div>
 </div>
-{{end}}
+{{end}}