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 @@ + \ 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 @@ + \ 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 @@
{{if .Review.Stale}} - + {{svg "octicon-hourglass" 16 "icon"}} {{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 @@ {{if .EnableOpenIDSignIn}} - + {{svg "fontawesome-openid"}}  OpenID {{end}} {{if .EnableSSPI}} - + {{svg "fontawesome-windows"}}  SSPI {{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 @@
{{template "base/alert" .}}

- + {{svg "fontawesome-openid"}} OpenID

@@ -15,7 +15,7 @@
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}}
  • - + {{svg "fontawesome-openid"}} {{.URI}}
    • {{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 @@ {{if .Show}} {{else}} {{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 @@ + + + \ 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 @@ + + + \ No newline at end of file