From f43e9fc4fd6ce0dc1e4704c0996e6698b275a85e Mon Sep 17 00:00:00 2001 From: Gusted Date: Tue, 6 Jun 2023 19:14:26 +0000 Subject: [PATCH] [MOBILE] Improve mobile experience (#812) - Add `stackable` to `very relaxed` pages, such they don't take extra margins from the space. - Add margin bottom to the user item in the navbar, so it doesn't look like crammed. - Make the migrate page usable, by reducing three to two cards in a row and making the icon smaller. Co-authored-by: Gusted Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/812 --- templates/base/head_navbar.tmpl | 2 +- templates/install.tmpl | 2 +- templates/org/create.tmpl | 2 +- templates/repo/create.tmpl | 2 +- templates/repo/migrate/codebase.tmpl | 2 +- templates/repo/migrate/git.tmpl | 2 +- templates/repo/migrate/gitbucket.tmpl | 2 +- templates/repo/migrate/gitea.tmpl | 2 +- templates/repo/migrate/github.tmpl | 2 +- templates/repo/migrate/gitlab.tmpl | 2 +- templates/repo/migrate/gogs.tmpl | 2 +- templates/repo/migrate/migrate.tmpl | 4 ++-- templates/repo/migrate/onedev.tmpl | 2 +- templates/repo/pulls/fork.tmpl | 2 +- templates/user/auth/activate.tmpl | 2 +- templates/user/auth/forgot_passwd.tmpl | 2 +- templates/user/auth/link_account.tmpl | 2 +- templates/user/auth/prohibit_login.tmpl | 2 +- templates/user/auth/reset_passwd.tmpl | 2 +- templates/user/auth/signin.tmpl | 2 +- templates/user/auth/signup.tmpl | 2 +- templates/user/auth/twofa.tmpl | 2 +- templates/user/auth/twofa_scratch.tmpl | 2 +- templates/user/auth/webauthn.tmpl | 2 +- web_src/css/base.css | 7 +++++++ web_src/css/modules/card.css | 6 ++++++ 26 files changed, 38 insertions(+), 25 deletions(-) diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index a61c623964..cb8ea73c93 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -148,7 +148,7 @@ -
+
{{avatar $.Context .SignedUser 24 "tiny"}} {{.locale.Tr "user_profile_and_more"}} diff --git a/templates/install.tmpl b/templates/install.tmpl index 52be6a6013..4e57c2faea 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+

{{.locale.Tr "install.title"}} diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl index 7e988ba0c7..8585ffe69f 100644 --- a/templates/org/create.tmpl +++ b/templates/org/create.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 05e7052ff4..020acaead0 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/migrate/codebase.tmpl b/templates/repo/migrate/codebase.tmpl index 41e9c273bc..825a263457 100644 --- a/templates/repo/migrate/codebase.tmpl +++ b/templates/repo/migrate/codebase.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{template "base/disable_form_autofill"}} diff --git a/templates/repo/migrate/git.tmpl b/templates/repo/migrate/git.tmpl index ba092a32a0..6650707885 100644 --- a/templates/repo/migrate/git.tmpl +++ b/templates/repo/migrate/git.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{template "base/disable_form_autofill"}} diff --git a/templates/repo/migrate/gitbucket.tmpl b/templates/repo/migrate/gitbucket.tmpl index da14d569a8..2a282a60f2 100644 --- a/templates/repo/migrate/gitbucket.tmpl +++ b/templates/repo/migrate/gitbucket.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{template "base/disable_form_autofill"}} diff --git a/templates/repo/migrate/gitea.tmpl b/templates/repo/migrate/gitea.tmpl index daa1205557..1258294e18 100644 --- a/templates/repo/migrate/gitea.tmpl +++ b/templates/repo/migrate/gitea.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index e9f2b11e75..0030c2d62f 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 656b5c50ee..77e98d05d8 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index 78700a7910..1323db897d 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/repo/migrate/migrate.tmpl b/templates/repo/migrate/migrate.tmpl index 01245322f8..680d809399 100644 --- a/templates/repo/migrate/migrate.tmpl +++ b/templates/repo/migrate/migrate.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .}}
-
+
{{template "repo/migrate/helper" .}} -
+
{{range .Services}} {{if eq .Name "github"}} diff --git a/templates/repo/migrate/onedev.tmpl b/templates/repo/migrate/onedev.tmpl index 50858edd60..d11877c280 100644 --- a/templates/repo/migrate/onedev.tmpl +++ b/templates/repo/migrate/onedev.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{template "base/disable_form_autofill"}} diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl index 34adc7b2f1..939644800c 100644 --- a/templates/repo/pulls/fork.tmpl +++ b/templates/repo/pulls/fork.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/user/auth/activate.tmpl b/templates/user/auth/activate.tmpl index 5a44529d18..2f6f5a6fcf 100644 --- a/templates/user/auth/activate.tmpl +++ b/templates/user/auth/activate.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/user/auth/forgot_passwd.tmpl b/templates/user/auth/forgot_passwd.tmpl index f80e28937e..fb0149d27c 100644 --- a/templates/user/auth/forgot_passwd.tmpl +++ b/templates/user/auth/forgot_passwd.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/user/auth/link_account.tmpl b/templates/user/auth/link_account.tmpl index 1e059f6814..2c27e20794 100644 --- a/templates/user/auth/link_account.tmpl +++ b/templates/user/auth/link_account.tmpl @@ -15,7 +15,7 @@
-
+
diff --git a/templates/user/auth/prohibit_login.tmpl b/templates/user/auth/prohibit_login.tmpl index ddb16a7f26..10c1bc9fc4 100644 --- a/templates/user/auth/prohibit_login.tmpl +++ b/templates/user/auth/prohibit_login.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+

diff --git a/templates/user/auth/reset_passwd.tmpl b/templates/user/auth/reset_passwd.tmpl index 4493778698..b81bad3414 100644 --- a/templates/user/auth/reset_passwd.tmpl +++ b/templates/user/auth/reset_passwd.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{.CsrfTokenHtml}} diff --git a/templates/user/auth/signin.tmpl b/templates/user/auth/signin.tmpl index b0e9ce8c74..d9b6f8dc80 100644 --- a/templates/user/auth/signin.tmpl +++ b/templates/user/auth/signin.tmpl @@ -1,7 +1,7 @@ {{template "base/head" .}}
{{template "user/auth/signin_navbar" .}} -
+
{{template "user/auth/signin_inner" .}}
diff --git a/templates/user/auth/signup.tmpl b/templates/user/auth/signup.tmpl index 1d03f610dc..6a404670f0 100644 --- a/templates/user/auth/signup.tmpl +++ b/templates/user/auth/signup.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{template "user/auth/signup_inner" .}}
diff --git a/templates/user/auth/twofa.tmpl b/templates/user/auth/twofa.tmpl index 4002266054..461eefec71 100644 --- a/templates/user/auth/twofa.tmpl +++ b/templates/user/auth/twofa.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}