diff options
author | silverwind <me@silverwind.io> | 2021-05-22 23:29:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-22 23:29:46 +0200 |
commit | 308b562b3c0440e800dc63b0ef2eb6777a1e0026 (patch) | |
tree | c4c55e9dbfd74afda7d754b2138c59752ecae396 | |
parent | 5c7e2f47b7748403a6cf649ca0feb85732dad948 (diff) | |
download | gitea-308b562b3c0440e800dc63b0ef2eb6777a1e0026.tar.gz gitea-308b562b3c0440e800dc63b0ef2eb6777a1e0026.zip |
Remove remaining fontawesome usage in templates (#15952)
Can not remove the dependency yet because easymde depends on it.
-rw-r--r-- | public/img/svg/fontawesome-openid.svg | 1 | ||||
-rw-r--r-- | public/img/svg/fontawesome-windows.svg | 1 | ||||
-rw-r--r-- | templates/repo/issue/view_content/pull.tmpl | 2 | ||||
-rw-r--r-- | templates/user/auth/signin_navbar.tmpl | 4 | ||||
-rw-r--r-- | templates/user/auth/signin_openid.tmpl | 4 | ||||
-rw-r--r-- | templates/user/profile.tmpl | 2 | ||||
-rw-r--r-- | templates/user/settings/security_openid.tmpl | 4 | ||||
-rw-r--r-- | web_src/less/_base.less | 6 | ||||
-rw-r--r-- | web_src/less/_user.less | 3 | ||||
-rw-r--r-- | web_src/svg/fontawesome-openid.svg | 3 | ||||
-rw-r--r-- | web_src/svg/fontawesome-windows.svg | 3 |
11 files changed, 17 insertions, 16 deletions
diff --git a/public/img/svg/fontawesome-openid.svg b/public/img/svg/fontawesome-openid.svg new file mode 100644 index 0000000000..9bcb92b877 --- /dev/null +++ b/public/img/svg/fontawesome-openid.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 448 448" class="svg fontawesome-openid" width="16" height="16" aria-hidden="true"><path d="M271.5 0v384l-68 32C88.5 405.75 0 344.5 0 270.25c0-71.5 82.5-131 191.75-144.25v43c-71.5 12.5-124 53-124 101.25 0 51 58.5 93.25 135.75 103v-340zm167.25 145.5L448 243l-131.25-28.5 36.75-20.75c-19.5-11.5-43.5-20-70-24.75v-43c46.25 5.5 87.75 19.5 120.25 39.25z"/></svg>
\ No newline at end of file diff --git a/public/img/svg/fontawesome-windows.svg b/public/img/svg/fontawesome-windows.svg new file mode 100644 index 0000000000..8e322daf0e --- /dev/null +++ b/public/img/svg/fontawesome-windows.svg @@ -0,0 +1 @@ +<svg viewBox="0 0 416 448" class="svg fontawesome-windows" width="16" height="16" aria-hidden="true"><path d="M170.5 251.5v162.75L0 390.75V251.5h170.5zm0-185.75V230.5H0V89.25zM416 251.5V448l-226.75-31.25V251.5H416zM416 32v198.5H189.25V63.25z"/></svg>
\ No newline at end of file diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index d62d4b7609..69462797a2 100644 --- 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 index 85ebcd90f8..464dec8193 100644 --- 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"}} 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"}} SSPI </a> {{end}} diff --git a/templates/user/auth/signin_openid.tmpl b/templates/user/auth/signin_openid.tmpl index d7fb641e0d..b7d9b9f636 100644 --- 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 index d638fe3859..e5962db65c 100644 --- 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 index 9a807d850e..118f16203d 100644 --- 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 index 7848810940..bf7e442a22 100644 --- 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 index 42c223e9bf..7d8f9b2495 100644 --- 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 new file mode 100644 index 0000000000..ea145d5506 --- /dev/null +++ b/web_src/svg/fontawesome-openid.svg @@ -0,0 +1,3 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="448" height="448" viewBox="0 0 448 448"> + <path d="M271.5 0v384l-68 32c-115-10.25-203.5-71.5-203.5-145.75 0-71.5 82.5-131 191.75-144.25v43c-71.5 12.5-124 53-124 101.25 0 51 58.5 93.25 135.75 103v0-340zM438.75 145.5l9.25 97.5-131.25-28.5 36.75-20.75c-19.5-11.5-43.5-20-70-24.75v-43c46.25 5.5 87.75 19.5 120.25 39.25z"></path> +</svg>
\ No newline at end of file diff --git a/web_src/svg/fontawesome-windows.svg b/web_src/svg/fontawesome-windows.svg new file mode 100644 index 0000000000..4663fd73ed --- /dev/null +++ b/web_src/svg/fontawesome-windows.svg @@ -0,0 +1,3 @@ +<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="416" height="448" viewBox="0 0 416 448"> + <path d="M170.5 251.5v162.75l-170.5-23.5v-139.25h170.5zM170.5 65.75v164.75h-170.5v-141.25zM416 251.5v196.5l-226.75-31.25v-165.25h226.75zM416 32v198.5h-226.75v-167.25z"></path> +</svg>
\ No newline at end of file |