Remove remaining fontawesome usage in templates (go-gitea#15952)

Can not remove the dependency yet because easymde depends on it.
kitspace · Aug 10, 2021 · 8c59822 · 8c59822
1 parent 5c4888c
commit 8c59822
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/public/img/svg/fontawesome-openid.svg b/public/img/svg/fontawesome-openid.svg
diff --git a/public/img/svg/fontawesome-windows.svg b/public/img/svg/fontawesome-windows.svg
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
@@ -35,7 +35,7 @@
 						<div class="review-item-right">
 							{{if .Review.Stale}}
 								<span class="ui poping up type-icon text grey" data-content="{{$.i18n.Tr "repo.issues.is_stale"}}">
-									<i class="octicon icon fa-hourglass-end"></i>
+									{{svg "octicon-hourglass" 16 "icon"}}
 								</span>
 							{{end}}
 							{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}

diff --git a/templates/user/auth/signin_navbar.tmpl b/templates/user/auth/signin_navbar.tmpl
@@ -6,13 +6,13 @@
 		</a>
 		{{if .EnableOpenIDSignIn}}
 		<a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid">
-			<i class="fa fa-openid"></i>
+			{{svg "fontawesome-openid"}}
 			&nbsp;OpenID
 		</a>
 		{{end}}
 		{{if .EnableSSPI}}
 		<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
-			<i class="fa fa-windows"></i>
+			{{svg "fontawesome-windows"}}
 			&nbsp;SSPI
 		</a>
 		{{end}}

diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl
@@ -4,7 +4,7 @@
 	<div class="ui container">
 		{{template "base/alert" .}}
 		<h4 class="ui top attached header center">
-			<i class="fa fa-openid"></i>
+			{{svg "fontawesome-openid"}}
 			OpenID
 		</h4>
 		<div class="ui attached segment">
@@ -15,7 +15,7 @@
 			</div>
 			<div class="required inline field {{if .Err_OpenID}}error{{end}}">
 				<label for="openid">
-				<i class="fa fa-openid"></i>
+				{{svg "fontawesome-openid"}}
 				OpenID URI
 				</label>
 				<input id="openid" name="openid" value="{{.openid}}" autofocus required>

diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
@@ -42,7 +42,7 @@
 							{{range .OpenIDs}}
 								{{if .Show}}
 									<li>
-										<i class="fa fa-openid"></i>
+										{{svg "fontawesome-openid"}}
 										<a target="_blank" rel="noopener noreferrer" href="{{.URI}}">{{.URI}}</a>
 									</li>
 								{{end}}

diff --git a/templates/user/settings/security_openid.tmpl b/templates/user/settings/security_openid.tmpl
@@ -19,12 +19,12 @@
 						<input name="id" type="hidden" value="{{.ID}}">
 						{{if .Show}}
 							<button class="ui tiny button">
-							<i class="icon fa-eye"></i>
+							{{svg "octicon-eye" 16 "icon"}}
 							{{$.i18n.Tr "settings.hide_openid"}}
 							</button>
 						{{else}}
 							<button class="ui tiny button">
-							<i class="icon fa-eye-slash"></i>
+							{{svg "octicon-eye-closed" 16 "icon"}}
 							{{$.i18n.Tr "settings.show_openid"}}
 							</button>
 						{{end}}

diff --git a/web_src/less/_base.less b/web_src/less/_base.less
@@ -1162,12 +1162,6 @@ footer {
     padding: 0 .5rem;
     max-width: calc(100vw - 1rem) !important;
 
-    .fa {
-      width: 16px;
-      text-align: center;
-      color: var(--color-primary);
-    }
-
     .links > * {
       border-left: 1px solid var(--color-secondary);
       padding-left: 8px;

diff --git a/web_src/less/_user.less b/web_src/less/_user.less
@@ -34,8 +34,7 @@
               border-bottom: 1px solid var(--color-secondary);
             }
 
-            .svg,
-            .fa {
+            .svg {
               margin-left: 1px;
               margin-right: 5px;
             }

diff --git a/web_src/svg/fontawesome-openid.svg b/web_src/svg/fontawesome-openid.svg
diff --git a/web_src/svg/fontawesome-windows.svg b/web_src/svg/fontawesome-windows.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,8 +34,7 @@ @@
                   border-bottom: 1px solid var(--color-secondary);
                 }
-                .svg,
-                .fa {
+                .svg {
                   margin-left: 1px;
                   margin-right: 5px;
                 }
@@ Expand Down @@