troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-23 19:11:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Remove remaining fontawesome usage in templates (#15952)

Browse source 
Can not remove the dependency yet because easymde depends on it.
This commit is contained in:
silverwind 2021-05-22 23:29:46 +02:00 committed by GitHub
parent 5c7e2f47b7
commit 308b562b3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
public/img/svg/fontawesome-openid.svg Normal file
View file

@ -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>
Side by side

After

Width:  |  Height:  |  Size: 374 B

1
public/img/svg/fontawesome-windows.svg Normal file
View file

@ -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>
Side by side

After

Width:  |  Height:  |  Size: 250 B

2
templates/repo/issue/view_content/pull.tmpl
View file

@ -35,7 +35,7 @@
<div class="review-item-right"> <div class="review-item-right">
{{if .Review.Stale}} {{if .Review.Stale}}
<span class="ui poping up type-icon text grey" data-content="{{$.i18n.Tr "repo.issues.is_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> </span>
{{end}} {{end}}
{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}} {{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}

4
templates/user/auth/signin_navbar.tmpl
View file

@ -6,13 +6,13 @@
</a> </a>
{{if .EnableOpenIDSignIn}} {{if .EnableOpenIDSignIn}}
<a class="{{if .PageIsLoginOpenID}}active{{end}} item" rel="nofollow" href="{{AppSubUrl}}/user/login/openid"> <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 &nbsp;OpenID
</a> </a>
{{end}} {{end}}
{{if .EnableSSPI}} {{if .EnableSSPI}}
<a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1"> <a class="item" rel="nofollow" href="{{AppSubUrl}}/user/login?auth_with_sspi=1">
<i class="fa fa-windows"></i> {{svg "fontawesome-windows"}}
&nbsp;SSPI &nbsp;SSPI
</a> </a>
{{end}} {{end}}

4
templates/user/auth/signin_openid.tmpl
View file

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

2
templates/user/profile.tmpl
View file

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

4
templates/user/settings/security_openid.tmpl
View file

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

6
web_src/less/_base.less
View file

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

3
web_src/less/_user.less
View file

@ -34,8 +34,7 @@
border-bottom: 1px solid var(--color-secondary); border-bottom: 1px solid var(--color-secondary);
} }
.svg, .svg {
.fa {
margin-left: 1px; margin-left: 1px;
margin-right: 5px; margin-right: 5px;
} }

3
web_src/svg/fontawesome-openid.svg Normal file
View file

@ -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>
Side by side

After

Width:  |  Height:  |  Size: 393 B

3
web_src/svg/fontawesome-windows.svg Normal file
View file

@ -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>
Side by side

After

Width:  |  Height:  |  Size: 286 B