diff --git a/public/img/svg/gitea-github.svg b/public/img/svg/gitea-github.svg deleted file mode 100644 index ee3c9fdafcf..00000000000 --- a/public/img/svg/gitea-github.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/img/svg/gitea-gitlab.svg b/public/img/svg/gitea-gitlab.svg index 2891da094f3..742370ac9ac 100644 --- a/public/img/svg/gitea-gitlab.svg +++ b/public/img/svg/gitea-gitlab.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/public/img/svg/gitea-openid.svg b/public/img/svg/gitea-openid.svg new file mode 100644 index 00000000000..f8e313f5159 --- /dev/null +++ b/public/img/svg/gitea-openid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index 44769e60bd4..01245322f86 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -6,7 +6,15 @@
{{range .Services}} - {{svg (printf "gitea-%s" .Name) 184}} + {{if eq .Name "github"}} + {{svg "octicon-mark-github" 184 "gt-p-4"}} + {{else if eq .Name "gitlab"}} + {{svg "gitea-gitlab" 184 "gt-p-4"}} + {{else if eq .Name "gitbucket"}} + {{svg "gitea-gitbucket" 184 "gt-p-4"}} + {{else}} + {{svg (printf "gitea-%s" .Name) 184}} + {{end}}
{{.Title}} diff --git a/templates/user/auth/signin_inner.tmpl b/templates/user/auth/signin_inner.tmpl index f14bac10eee..ceafc257eae 100644 --- a/templates/user/auth/signin_inner.tmpl +++ b/templates/user/auth/signin_inner.tmpl @@ -1,78 +1,89 @@ - {{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} - {{template "base/alert" .}} - {{end}} -

- {{if .LinkAccountMode}} - {{.locale.Tr "auth.oauth_signin_title"}} - {{else}} - {{.locale.Tr "auth.login_userpass"}} - {{end}} -

-
-
- {{.CsrfTokenHtml}} -
- - -
- {{if or (not .DisablePassword) .LinkAccountMode}} -
- - -
- {{end}} - {{if not .LinkAccountMode}} -
- -
- - -
-
- {{end}} - - {{template "user/auth/captcha" .}} - -
- - - {{.locale.Tr "auth.forgot_password"}} -
- - {{if .ShowRegistrationButton}} -
- - {{.locale.Tr "auth.sign_up_now" | Str2html}} -
- {{end}} - - {{if and .OrderedOAuth2Names .OAuth2Providers}} -
-
-
-
-
-

{{.locale.Tr "sign_in_with"}}

- {{range $key := .OrderedOAuth2Names}} - {{$provider := index $.OAuth2Providers $key}} - - - {{end}} -
-
-
-
- {{end}} -
+{{if or (not .LinkAccountMode) (and .LinkAccountMode .LinkAccountModeSignIn)}} +{{template "base/alert" .}} +{{end}} +

+ {{if .LinkAccountMode}} + {{.locale.Tr "auth.oauth_signin_title"}} + {{else}} + {{.locale.Tr "auth.login_userpass"}} + {{end}} +

+
+
+ {{.CsrfTokenHtml}} +
+ + +
+ {{if or (not .DisablePassword) .LinkAccountMode}} +
+ + +
+ {{end}} + {{if not .LinkAccountMode}} +
+ +
+ +
+
+ {{end}} + + {{template "user/auth/captcha" .}} + +
+ + + {{.locale.Tr "auth.forgot_password"}} +
+ + {{if .ShowRegistrationButton}} +
+ + {{.locale.Tr "auth.sign_up_now" | Str2html}} +
+ {{end}} + + {{if and .OrderedOAuth2Names .OAuth2Providers}} +
+
+
+ +
+ {{end}} +
+
diff --git a/web_src/css/base.css b/web_src/css/base.css index ed00b1a2952..30a9c631387 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -338,7 +338,11 @@ a { text-decoration-skip-ink: all; } +/* muted link = only colored when hovered */ +/* silenced link = never colored */ + a.muted, +a.silenced, .muted-links a { color: inherit; } @@ -350,6 +354,10 @@ a.muted:hover [class*="color-text"], color: var(--color-primary); } +a.silenced:hover { + color: inherit; +} + .delete-button, .delete-button:hover { color: var(--color-red); diff --git a/web_src/css/form.css b/web_src/css/form.css index 85d1136de81..9e1a72380b3 100644 --- a/web_src/css/form.css +++ b/web_src/css/form.css @@ -206,32 +206,6 @@ textarea:focus, } } -.signin .oauth2 div { - display: inline-block; -} - -.signin .oauth2 div p { - margin: 10px 5px 0 0; - float: left; -} - -.signin .oauth2 a { - margin-right: 3px; -} - -.signin .oauth2 a:last-child { - margin-right: 0; -} - -.signin .oauth2 img { - width: 32px; - height: 32px; -} - -.signin .oauth2 img.openidConnect { - width: auto; -} - @media (min-width: 768px) { .g-recaptcha-style, .h-captcha-style { diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 22e18f79269..306e4bd51db 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -73,6 +73,8 @@ Gitea's private styles use `g-` prefix. .gt-whitespace-nowrap { white-space: nowrap !important; } .gt-whitespace-pre { white-space: pre !important; } .gt-whitespace-pre-wrap { white-space: pre-wrap !important; } +.gt-object-contain { object-fit: contain !important; } +.gt-self-center { align-self: center !important; } .gt-overflow-x-auto { overflow-x: auto !important; } .gt-overflow-x-scroll { overflow-x: scroll !important; } diff --git a/web_src/svg/gitea-github.svg b/web_src/svg/gitea-github.svg deleted file mode 100644 index 918a35ecf6b..00000000000 --- a/web_src/svg/gitea-github.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/web_src/svg/gitea-gitlab.svg b/web_src/svg/gitea-gitlab.svg index 6a9c8a80f47..e966a4ece53 100644 --- a/web_src/svg/gitea-gitlab.svg +++ b/web_src/svg/gitea-gitlab.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/web_src/svg/gitea-openid.svg b/web_src/svg/gitea-openid.svg new file mode 100644 index 00000000000..262ca1017c2 --- /dev/null +++ b/web_src/svg/gitea-openid.svg @@ -0,0 +1 @@ + \ No newline at end of file