From f56a16801c0a456b4fb16bf588d13484e1a7c198 Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 14 Apr 2023 13:55:54 +0800 Subject: [PATCH 01/10] use same styles for header --- templates/user/overview/header.tmpl | 134 ++++++++++++++-------------- web_src/css/repository.css | 18 ++++ 2 files changed, 84 insertions(+), 68 deletions(-) diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index b4f7d6f900911..80563e5d7e3fc 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -1,85 +1,83 @@ -
- - {{with .ContextUser}} -
-
-
-
- {{avatar $.Context . 100}} - {{.DisplayName}} - - {{if .Visibility.IsLimited}}
{{$.locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} - {{if .Visibility.IsPrivate}}
{{$.locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} - -
+ +{{with .ContextUser}} +
+
+
+
+ {{avatar $.Context . 100}} + {{.DisplayName}} + + {{if .Visibility.IsLimited}}
{{$.locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} + {{if .Visibility.IsPrivate}}
{{$.locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} +
- {{end}} +
+{{end}} -
-
- - {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} +
+
+ + {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} + + {{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}} + + {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + + {{end}} + {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} + + {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} - {{if and .IsProjectEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadProjects))}} - - {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} + {{end}} + {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} + + {{svg "octicon-code"}} {{.locale.Tr "user.code"}} - {{end}} - {{if and .IsPackageEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadPackages))}} - - {{svg "octicon-package"}} {{.locale.Tr "packages.title"}} + {{end}} + + {{if .ContextUser.IsOrganization}} + {{if .IsOrganizationMember}} + + {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} + {{if .NumMembers}} +
{{.NumMembers}}
+ {{end}} - {{end}} - {{if and .IsRepoIndexerEnabled (or .ContextUser.IsIndividual (and .ContextUser.IsOrganization .CanReadCode))}} - - {{svg "octicon-code"}} {{.locale.Tr "user.code"}} + + {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} + {{if .NumTeams}} +
{{.NumTeams}}
+ {{end}} {{end}} - {{if .ContextUser.IsOrganization}} - {{if .IsOrganizationMember}} - - {{svg "octicon-person"}} {{$.locale.Tr "org.members"}} - {{if .NumMembers}} -
{{.NumMembers}}
- {{end}} + {{if .IsOrganizationOwner}} +
+ + {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - - {{svg "octicon-people"}} {{$.locale.Tr "org.teams"}} - {{if .NumTeams}} -
{{.NumTeams}}
- {{end}} - - {{end}} - - {{if .IsOrganizationOwner}} -
- - {{svg "octicon-tools"}} {{.locale.Tr "repo.settings"}} - -
- {{end}} +
+ {{end}} + {{else}} + + {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + + {{if not .DisableStars}} + + {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} + {{if .Owner.NumStars}} +
{{.Owner.NumStars}}
+ {{end}} + {{else}} - - {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} + + {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} - {{if not .DisableStars}} - - {{svg "octicon-star"}} {{.locale.Tr "user.starred"}} - {{if .Owner.NumStars}} -
{{.Owner.NumStars}}
- {{end}} - - {{else}} - - {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} - - {{end}} {{end}} + {{end}} -
-
+ diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5c903856287e7..378e922b11ef6 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -2087,6 +2087,10 @@ white-space: nowrap; } +.repository.packages .ui.tabs.container { + margin-top: 0; +} + .repository.wiki.start .ui.segment { padding-top: 70px; padding-bottom: 100px; @@ -2439,6 +2443,19 @@ border-radius: 0; } +.repository .head .ui.header .text { + vertical-align: middle; + font-size: 1.6rem; + margin-left: 15px; +} + +.repository .ui.secondary.stackable.pointing.menu { + flex-wrap: wrap; + margin-top: 5px; + margin-bottom: 10px; + border-bottom: 2px solid rgba(34,36,38,.15); +} + @media (max-width: 767px) { .repository .repository-summary .segment.language-stats { display: none; @@ -3626,3 +3643,4 @@ td.blob-excerpt { .search-fullname { color: var(--color-text-light-2); } + From c046a974eecae280fd45087883c486fff7a4b7fa Mon Sep 17 00:00:00 2001 From: HesterG Date: Fri, 14 Apr 2023 14:31:52 +0800 Subject: [PATCH 02/10] update css --- templates/user/overview/header.tmpl | 1 - web_src/css/base.css | 13 +++++++++++++ web_src/css/organization.css | 12 ------------ web_src/css/repository.css | 16 +--------------- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 80563e5d7e3fc..7dfbe345639fc 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -80,4 +80,3 @@
- diff --git a/web_src/css/base.css b/web_src/css/base.css index c48a36c854764..5f01bacb6ff35 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2835,3 +2835,16 @@ table th[data-sortt-desc] .svg { .color-text-light-2 { color: var(--color-text-light-2); } + +.head .ui.header .text { + vertical-align: middle; + font-size: 1.6rem; + margin-left: 15px; +} + +.repository .ui.secondary.stackable.pointing.menu, +.organization .ui.secondary.stackable.pointing.menu { + flex-wrap: wrap; + margin-top: 5px; + margin-bottom: 10px; +} diff --git a/web_src/css/organization.css b/web_src/css/organization.css index 35eaa3ae22183..42a6dcc5eac86 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -40,12 +40,6 @@ } } -.organization .head .ui.header .text { - vertical-align: middle; - font-size: 1.6rem; - margin-left: 15px; -} - .organization .head .ui.header .org-visibility .label { margin-left: 5px; margin-top: 5px; @@ -55,12 +49,6 @@ margin-top: 5px; } -.organization .ui.secondary.stackable.pointing.menu { - flex-wrap: wrap; - margin-top: 5px; - margin-bottom: 10px; -} - .organization.new.org form { margin: auto; } diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 378e922b11ef6..58b56fe96e796 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -158,7 +158,7 @@ margin-bottom: 0; } -.repository .ui.tabs.container .ui.menu { +.repository .ui.tabs.container .ui.menu:not(.pointing) { border-bottom: 0; } @@ -2443,19 +2443,6 @@ border-radius: 0; } -.repository .head .ui.header .text { - vertical-align: middle; - font-size: 1.6rem; - margin-left: 15px; -} - -.repository .ui.secondary.stackable.pointing.menu { - flex-wrap: wrap; - margin-top: 5px; - margin-bottom: 10px; - border-bottom: 2px solid rgba(34,36,38,.15); -} - @media (max-width: 767px) { .repository .repository-summary .segment.language-stats { display: none; @@ -3643,4 +3630,3 @@ td.blob-excerpt { .search-fullname { color: var(--color-text-light-2); } - From b3a2edc8ca79a9d71fb877b7453045d59ee032d4 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 10:51:59 +0800 Subject: [PATCH 03/10] update css --- web_src/css/base.css | 11 +++++++++-- web_src/css/repository.css | 10 +--------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 5f01bacb6ff35..ef3ba90378113 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2836,15 +2836,22 @@ table th[data-sortt-desc] .svg { color: var(--color-text-light-2); } -.head .ui.header .text { +.repository .head .ui.header .text, +.organization .head .ui.header .text { vertical-align: middle; font-size: 1.6rem; margin-left: 15px; } -.repository .ui.secondary.stackable.pointing.menu, +.repository .ui.secondary.stackable.pointing.menu, .organization .ui.secondary.stackable.pointing.menu { flex-wrap: wrap; margin-top: 5px; margin-bottom: 10px; } + +.repository .ui.tabs.container, +.organization .ui.tabs.container { + margin-top: 14px; + margin-bottom: 0; +} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 58b56fe96e796..87c5a99362ebb 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -153,11 +153,7 @@ padding-left: 23px; } -.repository .ui.tabs.container { - margin-top: 14px; - margin-bottom: 0; -} - +/* For the pointing menu, respect its own border-bottom */ .repository .ui.tabs.container .ui.menu:not(.pointing) { border-bottom: 0; } @@ -2087,10 +2083,6 @@ white-space: nowrap; } -.repository.packages .ui.tabs.container { - margin-top: 0; -} - .repository.wiki.start .ui.segment { padding-top: 70px; padding-bottom: 100px; From 42db46bb268262e8629c495a115d9c147e1e57af Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 11:46:19 +0800 Subject: [PATCH 04/10] modify home --- templates/org/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 1bd017d11990e..7d498b46bdcac 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{avatar $.Context .Org 140 "org-avatar"}}
From e07d6b81478a75f3138eb8b8d8292ff21d0feabc Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 11:48:32 +0800 Subject: [PATCH 05/10] revert --- templates/org/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index 7d498b46bdcac..1bd017d11990e 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
{{avatar $.Context .Org 140 "org-avatar"}}
From 146f3a42bf56155e9b0c6388e2cc28b7c5bb46d5 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 13:09:54 +0800 Subject: [PATCH 06/10] update --- web_src/css/repository.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 87c5a99362ebb..5940a2bbe4d98 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -153,8 +153,9 @@ padding-left: 23px; } -/* For the pointing menu, respect its own border-bottom */ -.repository .ui.tabs.container .ui.menu:not(.pointing) { +/* For the secondary pointing menu, respect its own border-bottom */ +/* reference: https://semantic-ui.com/collections/menu.html#pointing */ +.repository .ui.tabs.container .ui.menu:not(.secondary.pointing) { border-bottom: 0; } From 729ad294cbec7a77623b2e3eab750ea7a20e8ee0 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 13:19:41 +0800 Subject: [PATCH 07/10] comment --- web_src/css/repository.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5940a2bbe4d98..f6431a24bde65 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -154,7 +154,7 @@ } /* For the secondary pointing menu, respect its own border-bottom */ -/* reference: https://semantic-ui.com/collections/menu.html#pointing */ +/* style reference: https://semantic-ui.com/collections/menu.html#pointing */ .repository .ui.tabs.container .ui.menu:not(.secondary.pointing) { border-bottom: 0; } From 0d1bcf1734bba084acd06adad1901988bde01fa9 Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 14:28:45 +0800 Subject: [PATCH 08/10] move shared css --- web_src/css/base.css | 19 ------------------- web_src/css/index.css | 1 + web_src/css/shared/repoorgshared.css | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 web_src/css/shared/repoorgshared.css diff --git a/web_src/css/base.css b/web_src/css/base.css index ef3ba90378113..1dc52237888a2 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2836,22 +2836,3 @@ table th[data-sortt-desc] .svg { color: var(--color-text-light-2); } -.repository .head .ui.header .text, -.organization .head .ui.header .text { - vertical-align: middle; - font-size: 1.6rem; - margin-left: 15px; -} - -.repository .ui.secondary.stackable.pointing.menu, -.organization .ui.secondary.stackable.pointing.menu { - flex-wrap: wrap; - margin-top: 5px; - margin-bottom: 10px; -} - -.repository .ui.tabs.container, -.organization .ui.tabs.container { - margin-top: 14px; - margin-bottom: 0; -} diff --git a/web_src/css/index.css b/web_src/css/index.css index e8d4e290d0840..c6729d502a592 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -2,6 +2,7 @@ @import "./animations.css"; @import "./shared/issuelist.css"; +@import "./shared/repoorgshared.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; diff --git a/web_src/css/shared/repoorgshared.css b/web_src/css/shared/repoorgshared.css new file mode 100644 index 0000000000000..ee9d94bafac62 --- /dev/null +++ b/web_src/css/shared/repoorgshared.css @@ -0,0 +1,19 @@ +.repository .head .ui.header .text, +.organization .head .ui.header .text { + vertical-align: middle; + font-size: 1.6rem; + margin-left: 15px; +} + +.repository .ui.secondary.stackable.pointing.menu, +.organization .ui.secondary.stackable.pointing.menu { + flex-wrap: wrap; + margin-top: 5px; + margin-bottom: 10px; +} + +.repository .ui.tabs.container, +.organization .ui.tabs.container { + margin-top: 14px; + margin-bottom: 0; +} From 323765021cb1cabf7ec18298997090b883b8c1ad Mon Sep 17 00:00:00 2001 From: HesterG Date: Mon, 17 Apr 2023 14:30:14 +0800 Subject: [PATCH 09/10] remove unnecessary --- web_src/css/base.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/base.css b/web_src/css/base.css index 1dc52237888a2..c48a36c854764 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2835,4 +2835,3 @@ table th[data-sortt-desc] .svg { .color-text-light-2 { color: var(--color-text-light-2); } - From b3d39e1c4106fa6b8d7b65a0533b58a31162b4a0 Mon Sep 17 00:00:00 2001 From: HesterG Date: Tue, 18 Apr 2023 08:55:57 +0800 Subject: [PATCH 10/10] rename --- web_src/css/index.css | 2 +- web_src/css/shared/{repoorgshared.css => repoorg.css} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename web_src/css/shared/{repoorgshared.css => repoorg.css} (100%) diff --git a/web_src/css/index.css b/web_src/css/index.css index c6729d502a592..253083033862c 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -2,7 +2,7 @@ @import "./animations.css"; @import "./shared/issuelist.css"; -@import "./shared/repoorgshared.css"; +@import "./shared/repoorg.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; diff --git a/web_src/css/shared/repoorgshared.css b/web_src/css/shared/repoorg.css similarity index 100% rename from web_src/css/shared/repoorgshared.css rename to web_src/css/shared/repoorg.css