From 5630a83ff687ed00114a0638517c7fa5a7dc62a4 Mon Sep 17 00:00:00 2001 From: HesterG Date: Sun, 23 Apr 2023 17:44:09 +0800 Subject: [PATCH 01/25] fix some mobile layout --- templates/repo/settings/collaboration.tmpl | 2 +- templates/repo/settings/tags.tmpl | 2 +- web_src/css/base.css | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 654bbba5d05c8..504a73831c708 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -17,7 +17,7 @@ {{.DisplayName}} -
+
{{svg "octicon-shield-lock"}}
{{if eq .Collaboration.Mode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .Collaboration.Mode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .Collaboration.Mode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
diff --git a/templates/repo/settings/tags.tmpl b/templates/repo/settings/tags.tmpl index 6387a20de6e6f..39c7cbe2ac608 100644 --- a/templates/repo/settings/tags.tmpl +++ b/templates/repo/settings/tags.tmpl @@ -15,7 +15,7 @@
-
+
{{.CsrfTokenHtml}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 7e510346b3392..15a5578e202fc 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1202,6 +1202,12 @@ img.ui.avatar, padding-bottom: 80px; } +/* overwrite semantic container width */ +.ui.ui.ui.container:not(.fluid) { + width: 1280px; + max-width: calc(100vw - 64px); +} + /* enable fluid page widths for medium size viewports */ @media (min-width: 768px) and (max-width: 1200px) { .ui.ui.ui.container:not(.fluid) { @@ -1209,6 +1215,16 @@ img.ui.avatar, } } +@media only screen and (max-width: 767.98px) { + .ui.ui.ui.container:not(.fluid) { + max-width: 100%; + /* copied from semantic css */ + width: auto; + margin-left: 1em; + margin-right: 1em; + } +} + .following.bar { z-index: 900; left: 0; From fe0b8a7350dbc16646441b08a872ec873586f90c Mon Sep 17 00:00:00 2001 From: HesterG Date: Sun, 23 Apr 2023 18:28:57 +0800 Subject: [PATCH 02/25] runner table auto overflow --- web_src/css/runner.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/runner.css b/web_src/css/runner.css index d0ea5252e5166..1ef02588fdf19 100644 --- a/web_src/css/runner.css +++ b/web_src/css/runner.css @@ -52,3 +52,7 @@ background-color: var(--color-yellow); color: var(--color-white); } + +.runner-container > .table { + overflow-x: auto; +} From 33b2df746fd36723fd710c9e28e7a073bbb4d3e3 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 15:15:25 +0800 Subject: [PATCH 03/25] use stackable grid and fix some css --- templates/admin/packages/list.tmpl | 2 +- templates/org/team/members.tmpl | 2 +- templates/org/team/repositories.tmpl | 2 +- templates/org/team/teams.tmpl | 2 +- templates/repo/actions/list.tmpl | 2 +- web_src/css/organization.css | 6 ++++++ web_src/css/runner.css | 3 ++- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 48046f4296e4e..918e7c1051693 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -56,7 +56,7 @@ {{end}} {{.Package.Type.Name}} - {{.Package.Name}} + {{.Package.Name}} {{.Creator.Name}} diff --git a/templates/org/team/members.tmpl b/templates/org/team/members.tmpl index e387090b3b617..e704e62be1039 100644 --- a/templates/org/team/members.tmpl +++ b/templates/org/team/members.tmpl @@ -3,7 +3,7 @@ {{template "org/header" .}}
{{template "base/alert" .}} -
+
{{template "org/team/sidebar" .}}
{{template "org/team/navbar" .}} diff --git a/templates/org/team/repositories.tmpl b/templates/org/team/repositories.tmpl index 41561da311445..b5cb4b838f369 100644 --- a/templates/org/team/repositories.tmpl +++ b/templates/org/team/repositories.tmpl @@ -3,7 +3,7 @@ {{template "org/header" .}}
{{template "base/alert" .}} -
+
{{template "org/team/sidebar" .}}
{{template "org/team/navbar" .}} diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index c31b6caf1c1da..2ab249d00cc49 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -10,7 +10,7 @@
{{end}} -
+
{{range .Teams}}
diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 15f0d607a3c29..0f446302011bd 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .}}
-
+
{{.locale.Tr "actions.runs.all_workflows"}} diff --git a/web_src/css/organization.css b/web_src/css/organization.css index 42a6dcc5eac86..e662b4acab202 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -232,6 +232,12 @@ height: 60px; } +@media (max-width: 767px) { + .organization.teams #repo-top-segment { + height: 100px; + } +} + .org-team-navbar .active.item { background: var(--color-box-body) !important; } diff --git a/web_src/css/runner.css b/web_src/css/runner.css index 1ef02588fdf19..124c9029a2d46 100644 --- a/web_src/css/runner.css +++ b/web_src/css/runner.css @@ -53,6 +53,7 @@ color: var(--color-white); } -.runner-container > .table { +.runner-container > .table.segment { overflow-x: auto; + font-size: 13px; /* same font size as .admin .table.segment */ } From b5d88173d07a33a8c7cbd6605e5e8599c20dd2da Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 15:25:21 +0800 Subject: [PATCH 04/25] fix margin-left --- web_src/css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 00ed675e2d572..176b6e1dd5e11 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -49,7 +49,7 @@ } .admin dl.admin-dl-horizontal dd { - margin-left: 275px; + margin-left: 285px; /* same as width of .admin dl.admin-dl-horizontal dt */ } @media (max-width: 767px) { From 52080d16983e8bb58f7ab5e8ee224e3d6db551bf Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 16:20:40 +0800 Subject: [PATCH 05/25] save runners changes --- web_src/css/base.css | 5 +---- web_src/css/runner.css | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index eb451a7940556..f8dd7246787e4 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1191,11 +1191,8 @@ img.ui.avatar, @media only screen and (max-width: 767.98px) { .ui.ui.ui.container:not(.fluid) { + width: auto; /* copied from semantic css */ max-width: 100%; - /* copied from semantic css */ - width: auto; - margin-left: 1em; - margin-right: 1em; } } diff --git a/web_src/css/runner.css b/web_src/css/runner.css index 124c9029a2d46..261cbb4a489aa 100644 --- a/web_src/css/runner.css +++ b/web_src/css/runner.css @@ -57,3 +57,21 @@ overflow-x: auto; font-size: 13px; /* same font size as .admin .table.segment */ } + +.runner-container > .table.segment:not(.striped) thead th:last-child { + padding-right: 5px !important; +} + +.runner-container > .table.segment th { + padding-top: 5px; + padding-bottom: 5px; +} + +.runner-container > .table.segment:not(.select) th:first-of-type, +.runner-container > .table.segment:not(.select) td:first-of-type { + padding-left: 15px !important; +} + +.runner-container > .table.segment form tbody button[type="submit"] { + padding: 5px 8px; +} From 74dcc0822c8074f0dda0dddc081e731d48210a1e Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 16:51:07 +0800 Subject: [PATCH 06/25] share table css with admin tables --- web_src/css/admin.css | 24 -------------------- web_src/css/index.css | 1 + web_src/css/runner.css | 23 ------------------- web_src/css/shared/settingtable.css | 35 +++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 47 deletions(-) create mode 100644 web_src/css/shared/settingtable.css diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 176b6e1dd5e11..b2eb41e67fb41 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -4,30 +4,6 @@ margin: 12px -1rem -1rem; } -.admin .table.segment { - padding: 0; - font-size: 13px; - overflow-x: auto; -} - -.admin .table.segment:not(.striped) thead th:last-child { - padding-right: 5px !important; -} - -.admin .table.segment th { - padding-top: 5px; - padding-bottom: 5px; -} - -.admin .table.segment:not(.select) th:first-of-type, -.admin .table.segment:not(.select) td:first-of-type { - padding-left: 15px !important; -} - -.admin .table.segment form tbody button[type="submit"] { - padding: 5px 8px; -} - .admin .settings .button.adopt, .admin .settings .button.delete { margin-top: -15px; diff --git a/web_src/css/index.css b/web_src/css/index.css index 828251180446c..fb2ea4cd6f108 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -3,6 +3,7 @@ @import "./animations.css"; @import "./shared/issuelist.css"; @import "./shared/repoorg.css"; +@import "./shared/settingtable.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; diff --git a/web_src/css/runner.css b/web_src/css/runner.css index 261cbb4a489aa..d0ea5252e5166 100644 --- a/web_src/css/runner.css +++ b/web_src/css/runner.css @@ -52,26 +52,3 @@ background-color: var(--color-yellow); color: var(--color-white); } - -.runner-container > .table.segment { - overflow-x: auto; - font-size: 13px; /* same font size as .admin .table.segment */ -} - -.runner-container > .table.segment:not(.striped) thead th:last-child { - padding-right: 5px !important; -} - -.runner-container > .table.segment th { - padding-top: 5px; - padding-bottom: 5px; -} - -.runner-container > .table.segment:not(.select) th:first-of-type, -.runner-container > .table.segment:not(.select) td:first-of-type { - padding-left: 15px !important; -} - -.runner-container > .table.segment form tbody button[type="submit"] { - padding: 5px 8px; -} diff --git a/web_src/css/shared/settingtable.css b/web_src/css/shared/settingtable.css new file mode 100644 index 0000000000000..6be5a64198508 --- /dev/null +++ b/web_src/css/shared/settingtable.css @@ -0,0 +1,35 @@ +.admin .table.segment, +.repository.settings .table.segment, +.organization.settings .table.segment { + padding: 0; + font-size: 13px; + overflow-x: auto; +} + +.admin .table.segment:not(.striped) thead th:last-child, +.repository.settings .table.segment:not(.striped) thead th:last-child, +.organization.settings .table.segment:not(.striped) thead th:last-child { + padding-right: 5px !important; +} + +.admin .table.segment th, +.repository.settings .table.segment th, +.organization.settings .table.segment th { + padding-top: 5px; + padding-bottom: 5px; +} + +.admin .table.segment:not(.select) th:first-of-type, +.admin .table.segment:not(.select) td:first-of-type, +.repository.settings .table.segment:not(.select) th:first-of-type, +.repository.settings .table.segment:not(.select) td:first-of-type, +.organization.settings .table.segment:not(.select) th:first-of-type, +.organization.settings .table.segment:not(.select) td:first-of-type { + padding-left: 15px !important; +} + +.admin .table.segment form tbody button[type="submit"], +.repository.settings .table.segment form tbody button[type="submit"], +.organization.settings .table.segment form tbody button[type="submit"] { + padding: 5px 8px; +} From a2081657e6234ce40d3abbf2a6e394d663f0644b Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 24 Apr 2023 17:09:23 +0800 Subject: [PATCH 07/25] fix label difference --- web_src/css/organization.css | 5 ----- web_src/css/shared/repoorg.css | 6 ++++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web_src/css/organization.css b/web_src/css/organization.css index e662b4acab202..25d4940fe53e6 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -40,11 +40,6 @@ } } -.organization .head .ui.header .org-visibility .label { - margin-left: 5px; - margin-top: 5px; -} - .organization .head .ui.header .ui.right { margin-top: 5px; } diff --git a/web_src/css/shared/repoorg.css b/web_src/css/shared/repoorg.css index ee9d94bafac62..7f0a805d0ff30 100644 --- a/web_src/css/shared/repoorg.css +++ b/web_src/css/shared/repoorg.css @@ -17,3 +17,9 @@ margin-top: 14px; margin-bottom: 0; } + +.repository .head .ui.header .org-visibility .label, +.organization .head .ui.header .org-visibility .label { + margin-left: 5px; + margin-top: 5px; +} From c0b6b601c10e2dc0bf0448dae5a927ac3194487b Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 09:05:41 +0800 Subject: [PATCH 08/25] revert change --- web_src/css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/admin.css b/web_src/css/admin.css index b2eb41e67fb41..8e4a94fabad01 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -25,7 +25,7 @@ } .admin dl.admin-dl-horizontal dd { - margin-left: 285px; /* same as width of .admin dl.admin-dl-horizontal dt */ + margin-left: 275px; } @media (max-width: 767px) { From 8ed9562c55bf3815ca8b93646a8142694e12ae1c Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 09:41:36 +0800 Subject: [PATCH 09/25] add comment --- web_src/css/shared/settingtable.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/shared/settingtable.css b/web_src/css/shared/settingtable.css index 6be5a64198508..1cea1b3a4f6c9 100644 --- a/web_src/css/shared/settingtable.css +++ b/web_src/css/shared/settingtable.css @@ -1,3 +1,7 @@ +/* This css is for table elements inside admin, organization, and repository settings + TODO: Right now there is no table inside user settings, but in the future there is table + in user settings, should also use this common style here. +*/ .admin .table.segment, .repository.settings .table.segment, .organization.settings .table.segment { From cfaed33003d4d67d32f27f08b7e2173857c41ba7 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 10:12:19 +0800 Subject: [PATCH 10/25] collaboration mobile column --- templates/repo/settings/collaboration.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 4354b387c548a..84f23ee0bdea4 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -62,7 +62,7 @@ {{.Name}}
-
+
{{svg "octicon-shield-lock"}}
{{if eq .AccessMode 1}}{{$.locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{$.locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{$.locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{$.locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{$.locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
From b1a5166bf33e0468d26eabc9d90f35bd00ad5e67 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 10:35:53 +0800 Subject: [PATCH 11/25] revert --- templates/admin/packages/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/packages/list.tmpl b/templates/admin/packages/list.tmpl index 779d1ede50dc8..2edcad4b7bbfd 100644 --- a/templates/admin/packages/list.tmpl +++ b/templates/admin/packages/list.tmpl @@ -56,7 +56,7 @@ {{end}} {{.Package.Type.Name}} - {{.Package.Name}} + {{.Package.Name}} {{.Creator.Name}} From dd166a23f6b61251bb8c98ac43007e0773d81163 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 10:45:05 +0800 Subject: [PATCH 12/25] comment --- web_src/css/shared/settingtable.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/settingtable.css b/web_src/css/shared/settingtable.css index 1cea1b3a4f6c9..6f53ce869744d 100644 --- a/web_src/css/shared/settingtable.css +++ b/web_src/css/shared/settingtable.css @@ -1,5 +1,5 @@ /* This css is for table elements inside admin, organization, and repository settings - TODO: Right now there is no table inside user settings, but in the future there is table + TODO: Right now there is no table inside user settings, but in the future if there is table in user settings, should also use this common style here. */ .admin .table.segment, From b4edd183486ea717a48ede332151c7f4171e552e Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 14:49:38 +0800 Subject: [PATCH 13/25] add common class to layout_head and use em for font --- templates/admin/layout_head.tmpl | 2 +- templates/org/settings/layout_head.tmpl | 2 +- templates/org/settings/runners.tmpl | 6 ++--- templates/repo/settings/layout_head.tmpl | 2 +- templates/user/settings/layout_head.tmpl | 2 +- web_src/css/shared/settingtable.css | 31 ++++++------------------ 6 files changed, 15 insertions(+), 30 deletions(-) diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index 6d84f8f3590e3..cb3c6cbe8e17e 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -2,7 +2,7 @@
{{template "admin/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: admin-setting-content */}} diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl index c245a3bf62460..75e179c8fb5fa 100644 --- a/templates/org/settings/layout_head.tmpl +++ b/templates/org/settings/layout_head.tmpl @@ -3,7 +3,7 @@ {{template "org/header" .ctxData}}
{{template "org/settings/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: org-setting-content */}} diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl index 2350f68ba9e9b..86cb1bcd787c3 100644 --- a/templates/org/settings/runners.tmpl +++ b/templates/org/settings/runners.tmpl @@ -1,5 +1,5 @@ {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}} -
- {{template "shared/actions/runner_list" .}} -
+
+ {{template "shared/actions/runner_list" .}} +
{{template "org/settings/layout_footer" .}} diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl index 3117309831892..b3e2eee54da47 100644 --- a/templates/repo/settings/layout_head.tmpl +++ b/templates/repo/settings/layout_head.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .ctxData}}
{{template "repo/settings/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: repo-setting-content */}} diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl index 26d1653948746..0ec9982fa4464 100644 --- a/templates/user/settings/layout_head.tmpl +++ b/templates/user/settings/layout_head.tmpl @@ -2,7 +2,7 @@
{{template "user/settings/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: user-setting-content */}} diff --git a/web_src/css/shared/settingtable.css b/web_src/css/shared/settingtable.css index 6f53ce869744d..5fb9cf38e4206 100644 --- a/web_src/css/shared/settingtable.css +++ b/web_src/css/shared/settingtable.css @@ -1,39 +1,24 @@ -/* This css is for table elements inside admin, organization, and repository settings - TODO: Right now there is no table inside user settings, but in the future if there is table - in user settings, should also use this common style here. -*/ -.admin .table.segment, -.repository.settings .table.segment, -.organization.settings .table.segment { +/* This css is for table elements inside all levels settings pages */ +.g-grid-setting-right .table.segment { padding: 0; - font-size: 13px; + font-size: 0.9em; overflow-x: auto; } -.admin .table.segment:not(.striped) thead th:last-child, -.repository.settings .table.segment:not(.striped) thead th:last-child, -.organization.settings .table.segment:not(.striped) thead th:last-child { +.g-grid-setting-right .table.segment:not(.striped) thead th:last-child { padding-right: 5px !important; } -.admin .table.segment th, -.repository.settings .table.segment th, -.organization.settings .table.segment th { +.g-grid-setting-right .table.segment th { padding-top: 5px; padding-bottom: 5px; } -.admin .table.segment:not(.select) th:first-of-type, -.admin .table.segment:not(.select) td:first-of-type, -.repository.settings .table.segment:not(.select) th:first-of-type, -.repository.settings .table.segment:not(.select) td:first-of-type, -.organization.settings .table.segment:not(.select) th:first-of-type, -.organization.settings .table.segment:not(.select) td:first-of-type { +.g-grid-setting-right .table.segment:not(.select) th:first-of-type, +.g-grid-setting-right .table.segment:not(.select) td:first-of-type { padding-left: 15px !important; } -.admin .table.segment form tbody button[type="submit"], -.repository.settings .table.segment form tbody button[type="submit"], -.organization.settings .table.segment form tbody button[type="submit"] { +.g-grid-setting-right .table.segment form tbody button[type="submit"] { padding: 5px 8px; } From 629f4834fad5fd2bd4746dec7ef870066351a385 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 14:55:18 +0800 Subject: [PATCH 14/25] rename --- web_src/css/shared/{settingtable.css => settingstable.css} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web_src/css/shared/{settingtable.css => settingstable.css} (100%) diff --git a/web_src/css/shared/settingtable.css b/web_src/css/shared/settingstable.css similarity index 100% rename from web_src/css/shared/settingtable.css rename to web_src/css/shared/settingstable.css From 4d37e18d86c5730cdd7bbe6a732230bf39d81a15 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 25 Apr 2023 14:56:21 +0800 Subject: [PATCH 15/25] rename --- web_src/css/index.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/index.css b/web_src/css/index.css index fb2ea4cd6f108..55e08f970d047 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -3,7 +3,7 @@ @import "./animations.css"; @import "./shared/issuelist.css"; @import "./shared/repoorg.css"; -@import "./shared/settingtable.css"; +@import "./shared/settingstable.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; From 2381abc8d0c6796eeaad8d48daf147a85242c49f Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 26 Apr 2023 11:07:30 +0800 Subject: [PATCH 16/25] fix rule to exclude ui container inside top navbar --- web_src/css/base.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index f06f2b53659e6..61895270ce417 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1183,8 +1183,8 @@ img.ui.avatar, padding-bottom: 80px; } -/* overwrite semantic container width */ -.ui.ui.ui.container:not(.fluid) { +/* overwrite semantic container width inside the div with role="main" */ +.page-content .ui.ui.ui.container:not(.fluid) { width: 1280px; max-width: calc(100vw - 64px); } From 4fcbad87bc76fd2997b6c5ee63c371a7dd589ef7 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 26 Apr 2023 11:13:48 +0800 Subject: [PATCH 17/25] update for mobile --- web_src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 61895270ce417..7761ba44ab2bf 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1197,7 +1197,7 @@ img.ui.avatar, } @media only screen and (max-width: 767.98px) { - .ui.ui.ui.container:not(.fluid) { + .page-content .ui.ui.ui.container:not(.fluid) { width: auto; /* copied from semantic css */ max-width: 100%; } From 4715e77b9de795b87bf568786e25efa7109cd944 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 26 Apr 2023 11:15:36 +0800 Subject: [PATCH 18/25] use same viewport size as others --- web_src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 7761ba44ab2bf..b599e0d508073 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1196,7 +1196,7 @@ img.ui.avatar, } } -@media only screen and (max-width: 767.98px) { +@media only screen and (max-width: 767px) { .page-content .ui.ui.ui.container:not(.fluid) { width: auto; /* copied from semantic css */ max-width: 100%; From 3abc95a20ae441d0711eabe6551dc9012160aa62 Mon Sep 17 00:00:00 2001 From: HesterG Date: Wed, 26 Apr 2023 11:35:59 +0800 Subject: [PATCH 19/25] update comment --- web_src/css/base.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index b599e0d508073..e80c951d77200 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1183,7 +1183,7 @@ img.ui.avatar, padding-bottom: 80px; } -/* overwrite semantic container width inside the div with role="main" */ +/* overwrite semantic width of containers inside the main page content div (div with class "page-content") */ .page-content .ui.ui.ui.container:not(.fluid) { width: 1280px; max-width: calc(100vw - 64px); From 03f301b3ac101d8519b0ec11db8e78b83e5ab018 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 20:15:54 +0800 Subject: [PATCH 20/25] fix --- templates/admin/dashboard.tmpl | 24 +++--- templates/admin/notice.tmpl | 109 +++++++++++++-------------- web_src/css/admin.css | 2 +- web_src/css/index.css | 1 - web_src/css/shared/settingstable.css | 24 ------ 5 files changed, 66 insertions(+), 94 deletions(-) delete mode 100644 web_src/css/shared/settingstable.css diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl index 93fcae4ca4d42..0aa95c0e73c50 100644 --- a/templates/admin/dashboard.tmpl +++ b/templates/admin/dashboard.tmpl @@ -19,55 +19,55 @@ {{.CsrfTokenHtml}}
- +
- + - + - + - + {{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}} - + - + {{end}} - + - + - + - + - +
{{.locale.Tr "admin.dashboard.delete_inactive_accounts"}}
{{.locale.Tr "admin.dashboard.delete_repo_archives"}}
{{.locale.Tr "admin.dashboard.delete_missing_repos"}}
{{.locale.Tr "admin.dashboard.git_gc_repos"}}
{{.locale.Tr "admin.dashboard.resync_all_sshkeys"}}
{{.locale.Tr "admin.dashboard.resync_all_sshkeys.desc"}}
{{.locale.Tr "admin.dashboard.resync_all_sshprincipals"}}
{{.locale.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}
{{.locale.Tr "admin.dashboard.resync_all_hooks"}}
{{.locale.Tr "admin.dashboard.reinit_missing_repos"}}
{{.locale.Tr "admin.dashboard.sync_external_users"}}
{{.locale.Tr "admin.dashboard.repo_health_check"}}
{{.locale.Tr "admin.dashboard.delete_generated_repository_avatars"}}
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index bd6b74dd2bdf4..60c6295b77271 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -3,67 +3,64 @@

{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})

-
- - +
+ + + + + + + + + + + + {{range .Notices}} - - - - - - + + + + + + - - - {{range .Notices}} + {{end}} + + {{if .Notices}} + - - - - - - - - {{end}} - - {{if .Notices}} - - - - + - - - {{end}} -
ID{{.locale.Tr "admin.notices.type"}}{{.locale.Tr "admin.notices.desc"}}{{.locale.Tr "admin.users.created"}}{{.locale.Tr "admin.notices.op"}}
ID{{.locale.Tr "admin.notices.type"}}{{.locale.Tr "admin.notices.desc"}}{{.locale.Tr "admin.users.created"}}{{.locale.Tr "admin.notices.op"}} +
+ +
+ 		{{.ID}}{{$.locale.Tr .TrStr}}{{.Description}}{{DateTime "short" .CreatedUnix}}{{svg "octicon-note" 16 "view-detail"}}
-
- -
- 		{{.ID}}{{$.locale.Tr .TrStr}}{{.Description}}{{DateTime "short" .CreatedUnix}}{{svg "octicon-note" 16 "view-detail"}}
- - {{.CsrfTokenHtml}} - - -
{{/* TODO: Make this dropdown accessible */}} - {{.locale.Tr "admin.notices.operations"}} -
-
- {{.locale.Tr "admin.notices.select_all"}} -
-
- {{.locale.Tr "admin.notices.deselect_all"}} -
-
- {{.locale.Tr "admin.notices.inverse_selection"}} -
+
+
+ {{.CsrfTokenHtml}} + +
+
{{/* TODO: Make this dropdown accessible */}} + {{.locale.Tr "admin.notices.operations"}} +
+
+ {{.locale.Tr "admin.notices.select_all"}} +
+
+ {{.locale.Tr "admin.notices.deselect_all"}} +
+
+ {{.locale.Tr "admin.notices.inverse_selection"}}
- -
-
- +
+ + + + + {{end}} + {{template "base/paginate" .}}
diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 48e3e59560303..03715586c420b 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -20,7 +20,7 @@ } .admin dl.admin-dl-horizontal { - padding: 20px; + padding: 1em; margin: 0; } diff --git a/web_src/css/index.css b/web_src/css/index.css index 653a0911268a7..e59f3eb02abda 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -3,7 +3,6 @@ @import "./animations.css"; @import "./shared/issuelist.css"; @import "./shared/repoorg.css"; -@import "./shared/settingstable.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; diff --git a/web_src/css/shared/settingstable.css b/web_src/css/shared/settingstable.css deleted file mode 100644 index 5fb9cf38e4206..0000000000000 --- a/web_src/css/shared/settingstable.css +++ /dev/null @@ -1,24 +0,0 @@ -/* This css is for table elements inside all levels settings pages */ -.g-grid-setting-right .table.segment { - padding: 0; - font-size: 0.9em; - overflow-x: auto; -} - -.g-grid-setting-right .table.segment:not(.striped) thead th:last-child { - padding-right: 5px !important; -} - -.g-grid-setting-right .table.segment th { - padding-top: 5px; - padding-bottom: 5px; -} - -.g-grid-setting-right .table.segment:not(.select) th:first-of-type, -.g-grid-setting-right .table.segment:not(.select) td:first-of-type { - padding-left: 15px !important; -} - -.g-grid-setting-right .table.segment form tbody button[type="submit"] { - padding: 5px 8px; -} From 11f3f0cc15bfeffd408cbff594dd4476baf9b3b7 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 20:48:45 +0800 Subject: [PATCH 21/25] fix table ellipsis --- templates/admin/notice.tmpl | 16 ++++++---------- web_src/css/admin.css | 24 ------------------------ web_src/css/helpers.css | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 34 deletions(-) diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl index 60c6295b77271..3dbae04625751 100644 --- a/templates/admin/notice.tmpl +++ b/templates/admin/notice.tmpl @@ -3,30 +3,26 @@

{{.locale.Tr "admin.notices.system_notice_list"}} ({{.locale.Tr "admin.total" .Total}})

- +
- + {{range .Notices}} - + - - - + + + {{end}} diff --git a/web_src/css/admin.css b/web_src/css/admin.css index 03715586c420b..c8e17dbba9164 100644 --- a/web_src/css/admin.css +++ b/web_src/css/admin.css @@ -60,27 +60,3 @@ white-space: pre-wrap; word-wrap: break-word; } - -@media (max-width: 767px) { - .admin #notice-table .notice-description { - max-width: 80vw; - } -} - -@media (min-width: 768px) and (max-width: 991px) { - .admin #notice-table .notice-description { - max-width: 360px; - } -} - -@media (min-width: 992px) and (max-width: 1200px) { - .admin #notice-table .notice-description { - max-width: 510px; - } -} - -@media (min-width: 1201px) { - .admin #notice-table .notice-description { - max-width: 640px; - } -} diff --git a/web_src/css/helpers.css b/web_src/css/helpers.css index 70ac8ff4698d5..22a284d43c091 100644 --- a/web_src/css/helpers.css +++ b/web_src/css/helpers.css @@ -2,6 +2,7 @@ Gitea's tailwind-style CSS helper classes have `gt-` prefix. Gitea's private styles use `g-` prefix. */ +.gt-db { display: block !important; } .gt-df { display: flex !important; } .gt-di { display: inline !important; } .gt-dif { display: inline-flex !important; } @@ -42,6 +43,23 @@ Gitea's private styles use `g-` prefix. text-overflow: ellipsis !important; } + +.g-table-auto-ellipsis td.auto-ellipsis { + position: relative; +} + +.g-table-auto-ellipsis td.auto-ellipsis span { + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + padding: inherit; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + /* below class names match Tailwind CSS */ .gt-break-all { word-break: break-all !important; } .gt-content-center { align-content: center !important; } From df2db9be97e7c0cf143aee150fb3f194cbf1e2c5 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 21:03:54 +0800 Subject: [PATCH 22/25] fix lables page --- templates/repo/issue/labels/label_list.tmpl | 4 ++-- web_src/css/base.css | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/labels/label_list.tmpl b/templates/repo/issue/labels/label_list.tmpl index d2c041e2ca111..b294036f0cccd 100644 --- a/templates/repo/issue/labels/label_list.tmpl +++ b/templates/repo/issue/labels/label_list.tmpl @@ -30,11 +30,11 @@ {{range .Labels}}
  • -
    +
    {{RenderLabel $.Context .}} {{if .Description}}
    {{.Description | RenderEmoji $.Context}}{{end}}
    -
    +
    {{if $.PageIsOrgSettingsLabels}} {{svg "octicon-issue-opened"}} {{$.locale.Tr "repo.issues.label_open_issues" .NumOpenIssues}} {{else}} diff --git a/web_src/css/base.css b/web_src/css/base.css index c0d99e8cc6b7f..dc7942e8a2770 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2651,10 +2651,6 @@ table th[data-sortt-desc] .svg { } .labelspage .item { - margin-top: 0; - margin-right: -14px; - margin-left: -14px; - padding: 10px; border-bottom: 1px solid var(--color-secondary); border-top: none; } From ea0f79ae3250e50f2eb76547ba066a474692ad36 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 21:05:37 +0800 Subject: [PATCH 23/25] fix incorrect merge --- templates/repo/settings/deploy_keys.tmpl | 2 +- templates/user/settings/applications.tmpl | 2 +- templates/user/settings/keys_principal.tmpl | 2 +- templates/user/settings/keys_ssh.tmpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 1a0f8f826af90..9012c1f8e2c61 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -60,7 +60,7 @@ {{.Fingerprint}}
    - {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix.FormatLong .UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}} + {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} - {{$.locale.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.locale.Tr "settings.can_write_info"}} {{end}}
    diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index ffb9a8f677a07..a9ca652564241 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -27,7 +27,7 @@
    - {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix.FormatLong .UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    diff --git a/templates/user/settings/keys_principal.tmpl b/templates/user/settings/keys_principal.tmpl index 020a56479e585..fbb35b90d6d6a 100644 --- a/templates/user/settings/keys_principal.tmpl +++ b/templates/user/settings/keys_principal.tmpl @@ -25,7 +25,7 @@
    {{.Name}}
    - {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix.FormatLong .UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index 2e46869aebcc9..c365ef226da44 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -59,7 +59,7 @@ {{.Fingerprint}}
    - {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix.FormatLong .UpdatedUnix.FormatShort}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}} + {{$.locale.Tr "settings.add_on"}} {{DateTime "short" .CreatedUnix}} — {{svg "octicon-info"}} {{if .HasUsed}}{{$.locale.Tr "settings.last_used"}} {{DateTime "short" .UpdatedUnix}}{{else}}{{$.locale.Tr "settings.no_activity"}}{{end}}
    From 41f7d44c0f4d38290587c5a0128a1fbdcebe735b Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 21:09:48 +0800 Subject: [PATCH 24/25] fix 500 --- templates/user/settings/repos.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user/settings/repos.tmpl b/templates/user/settings/repos.tmpl index 3d9f4e5a80d5e..d60f1ffcf269a 100644 --- a/templates/user/settings/repos.tmpl +++ b/templates/user/settings/repos.tmpl @@ -46,7 +46,7 @@ {{$.CsrfTokenHtml}} - {{template "base/modal_actions_confirm" .}} + {{template "base/modal_actions_confirm" $}} {{end}} From cbe8a468c146b5be2b7ccc840570b655507d48f1 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 26 Apr 2023 21:29:13 +0800 Subject: [PATCH 25/25] no need to use g-grid-setting-right --- templates/admin/layout_head.tmpl | 2 +- templates/org/settings/layout_head.tmpl | 2 +- templates/repo/settings/layout_head.tmpl | 2 +- templates/user/settings/layout_head.tmpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/admin/layout_head.tmpl b/templates/admin/layout_head.tmpl index cb3c6cbe8e17e..6d84f8f3590e3 100644 --- a/templates/admin/layout_head.tmpl +++ b/templates/admin/layout_head.tmpl @@ -2,7 +2,7 @@
    {{template "admin/navbar" .ctxData}} -
    +
    {{template "base/alert" .ctxData}} {{/* block: admin-setting-content */}} diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl index 75e179c8fb5fa..c245a3bf62460 100644 --- a/templates/org/settings/layout_head.tmpl +++ b/templates/org/settings/layout_head.tmpl @@ -3,7 +3,7 @@ {{template "org/header" .ctxData}}
    {{template "org/settings/navbar" .ctxData}} -
    +
    {{template "base/alert" .ctxData}} {{/* block: org-setting-content */}} diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl index b3e2eee54da47..3117309831892 100644 --- a/templates/repo/settings/layout_head.tmpl +++ b/templates/repo/settings/layout_head.tmpl @@ -3,7 +3,7 @@ {{template "repo/header" .ctxData}}
    {{template "repo/settings/navbar" .ctxData}} -
    +
    {{template "base/alert" .ctxData}} {{/* block: repo-setting-content */}} diff --git a/templates/user/settings/layout_head.tmpl b/templates/user/settings/layout_head.tmpl index 0ec9982fa4464..26d1653948746 100644 --- a/templates/user/settings/layout_head.tmpl +++ b/templates/user/settings/layout_head.tmpl @@ -2,7 +2,7 @@
    {{template "user/settings/navbar" .ctxData}} -
    +
    {{template "base/alert" .ctxData}} {{/* block: user-setting-content */}}
    • ID {{.locale.Tr "admin.notices.type"}} {{.locale.Tr "admin.notices.desc"}}{{.locale.Tr "admin.users.created"}}{{.locale.Tr "admin.users.created"}} {{.locale.Tr "admin.notices.op"}}
    -
    - -
    -
    		{{.ID}} {{$.locale.Tr .TrStr}}{{.Description}}{{DateTime "short" .CreatedUnix}}{{svg "octicon-note" 16 "view-detail"}}{{.Description}}{{DateTime "short" .CreatedUnix}}{{svg "octicon-note" 16}}