From 8f5a63134b84403324b4082d9be97b34199ae803 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 22:44:32 +0200 Subject: [PATCH 01/13] RSS icon fixes --- templates/org/home.tmpl | 10 +++++----- templates/repo/header.tmpl | 2 +- templates/repo/release/list.tmpl | 2 +- templates/repo/sub_menu_release_tag.tmpl | 2 +- templates/repo/tag/list.tmpl | 2 +- web_src/css/index.css | 6 ++++++ web_src/css/organization.css | 5 ----- web_src/css/shared/rss.css | 14 ++++++++++++++ web_src/js/components/RepoBranchTagSelector.vue | 2 +- 9 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 web_src/css/shared/rss.css diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl index afd7d61ca9f8e..936091665cd22 100644 --- a/templates/org/home.tmpl +++ b/templates/org/home.tmpl @@ -3,15 +3,15 @@
{{avatar $.Context .Org 140 "org-avatar"}}
-
+
{{.Org.DisplayName}} - {{if .EnableFeed}} - {{svg "octicon-rss" 36}} - {{end}} - + {{if .Org.Visibility.IsLimited}}
{{.locale.Tr "org.settings.visibility.limited_shortname"}}
{{end}} {{if .Org.Visibility.IsPrivate}}
{{.locale.Tr "org.settings.visibility.private_shortname"}}
{{end}} + {{if .EnableFeed}} + {{svg "octicon-rss" 24}} + {{end}}
{{if $.RenderedDescription}}
{{$.RenderedDescription|Str2html}}
{{end}}
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index b36d1d8f6ac39..9588fb65272dd 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -14,7 +14,7 @@
/
{{.Name}} {{if $.EnableFeed}} - {{svg "octicon-rss" 18}} + {{svg "octicon-rss" 18}} {{end}}
{{if .IsTemplate}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index be0976c1af465..05c4c4b0eae1c 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,7 +1,7 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "base/alert" .}} {{template "repo/sub_menu_release_tag" .}} diff --git a/templates/repo/sub_menu_release_tag.tmpl b/templates/repo/sub_menu_release_tag.tmpl index c700893ee6702..b1c0b63e52d54 100644 --- a/templates/repo/sub_menu_release_tag.tmpl +++ b/templates/repo/sub_menu_release_tag.tmpl @@ -10,7 +10,7 @@ {{if .EnableFeed}} - {{svg "octicon-rss" 18}} + {{svg "octicon-rss" 18}} {{end}} {{else if $canReadCode}} {{template "repo/sub_menu" .}} diff --git a/templates/repo/tag/list.tmpl b/templates/repo/tag/list.tmpl index 6f9e1e8d7aed6..f3a5d69eb3ab9 100644 --- a/templates/repo/tag/list.tmpl +++ b/templates/repo/tag/list.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}} -
+
{{template "base/alert" .}} {{template "repo/sub_menu_release_tag" .}} diff --git a/web_src/css/index.css b/web_src/css/index.css index 6fb92f2ecb21c..983a5d514e2a1 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -1,16 +1,22 @@ @import "./animations.css"; + @import "./shared/issuelist.css"; @import "./shared/repoorg.css"; +@import "./shared/rss.css"; + @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @import "./features/heatmap.css"; @import "./features/imagediff.css"; @import "./features/codeeditor.css"; @import "./features/projects.css"; + @import "./modules/tippy.css"; @import "./modules/modal.css"; @import "./modules/breadcrumb.css"; + @import "./code/linebutton.css"; + @import "./markup/content.css"; @import "./markup/codecopy.css"; @import "./markup/asciicast.css"; diff --git a/web_src/css/organization.css b/web_src/css/organization.css index 25d4940fe53e6..1b10ba157e3d5 100644 --- a/web_src/css/organization.css +++ b/web_src/css/organization.css @@ -112,11 +112,6 @@ margin-bottom: 0; } -.organization.profile #org-info .ui.header .org-visibility .label { - margin-left: 5px; - margin-top: 2px; -} - .organization.profile #org-info .desc { font-size: 16px; margin-bottom: 10px; diff --git a/web_src/css/shared/rss.css b/web_src/css/shared/rss.css new file mode 100644 index 0000000000000..270b2820ef393 --- /dev/null +++ b/web_src/css/shared/rss.css @@ -0,0 +1,14 @@ +.rss-icon { + display: inline-flex; + margin-left: .5rem; + color: var(--color-text-light-1); +} + +.releases-page .rss-icon { + position: relative; + top: 6px; +} + +.organization .rss-icon { + margin-left: 0; +} diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue index 38a375aa85da0..346b193040bef 100644 --- a/web_src/js/components/RepoBranchTagSelector.vue +++ b/web_src/js/components/RepoBranchTagSelector.vue @@ -39,7 +39,7 @@
{{ item.name }} - +
From 032cb7f002a24ce18b99b2976674f27d9f7456b2 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 22:59:58 +0200 Subject: [PATCH 02/13] move to features --- web_src/css/{shared => features}/rss.css | 0 web_src/css/index.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename web_src/css/{shared => features}/rss.css (100%) diff --git a/web_src/css/shared/rss.css b/web_src/css/features/rss.css similarity index 100% rename from web_src/css/shared/rss.css rename to web_src/css/features/rss.css diff --git a/web_src/css/index.css b/web_src/css/index.css index 983a5d514e2a1..beb400f149e9e 100644 --- a/web_src/css/index.css +++ b/web_src/css/index.css @@ -2,7 +2,6 @@ @import "./shared/issuelist.css"; @import "./shared/repoorg.css"; -@import "./shared/rss.css"; @import "./features/dropzone.css"; @import "./features/gitgraph.css"; @@ -10,6 +9,7 @@ @import "./features/imagediff.css"; @import "./features/codeeditor.css"; @import "./features/projects.css"; +@import "./features/rss.css"; @import "./modules/tippy.css"; @import "./modules/modal.css"; From d74a638be1139ed9ed1972daf7e2c9c62de81f0b Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 23:13:48 +0200 Subject: [PATCH 03/13] adjust selector --- web_src/css/features/rss.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/features/rss.css b/web_src/css/features/rss.css index 270b2820ef393..03d0589f2003b 100644 --- a/web_src/css/features/rss.css +++ b/web_src/css/features/rss.css @@ -9,6 +9,6 @@ top: 6px; } -.organization .rss-icon { +.organization.profile .rss-icon { margin-left: 0; } From 6d5d402235787fed96c8cb7f4899fffe45835d4b Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 8 May 2023 00:39:30 +0200 Subject: [PATCH 04/13] move sub_menu_release_tag to release_tag_header and add a div for it --- templates/repo/release/list.tmpl | 11 ++-------- templates/repo/release_tag_header.tmpl | 27 ++++++++++++++++++++++++ templates/repo/sub_menu_release_tag.tmpl | 17 --------------- templates/repo/tag/list.tmpl | 12 +++-------- web_src/css/base.css | 10 +++++++++ web_src/css/features/rss.css | 14 ------------ web_src/css/index.css | 1 - 7 files changed, 42 insertions(+), 50 deletions(-) create mode 100644 templates/repo/release_tag_header.tmpl delete mode 100644 templates/repo/sub_menu_release_tag.tmpl delete mode 100644 web_src/css/features/rss.css diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 05c4c4b0eae1c..053269ba0329a 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,16 +1,9 @@ {{template "base/head" .}}
{{template "repo/header" .}} -
+
{{template "base/alert" .}} - {{template "repo/sub_menu_release_tag" .}} - - {{if .CanCreateRelease}} - - {{.locale.Tr "repo.release.new_release"}} - - {{end}} - + {{template "repo/release_tag_header" .}}