Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove remaining fontawesome usage in templates #15952

Merged
merged 1 commit into from
May 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/img/svg/fontawesome-openid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/img/svg/fontawesome-windows.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/pull.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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))}}
Expand Down
4 changes: 2 additions & 2 deletions templates/user/auth/signin_navbar.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
4 changes: 2 additions & 2 deletions templates/user/auth/signin_openid.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion templates/user/profile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
4 changes: 2 additions & 2 deletions templates/user/settings/security_openid.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
6 changes: 0 additions & 6 deletions web_src/less/_base.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions web_src/less/_user.less
Original file line number Diff 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
3 changes: 3 additions & 0 deletions web_src/svg/fontawesome-openid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions web_src/svg/fontawesome-windows.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.