diff --git a/templates/devtest/flex-list.tmpl b/templates/devtest/flex-list.tmpl
index cbc263213..80cd22440 100644
--- a/templates/devtest/flex-list.tmpl
+++ b/templates/devtest/flex-list.tmpl
@@ -2,7 +2,8 @@
<link rel="stylesheet" href="{{AssetUrlPrefix}}/css/devtest.css?v={{AssetVersion}}">
<div class="page-content devtest">
<div class="ui container">
- <h1 class="gt-border-secondary-bottom">Flex List (standalone)</h1>
+ <h1>Flex List (standalone)</h1>
+ <div class="divider"></div>
<div class="flex-list">
<div class="flex-item">
<div class="flex-item-leading">
@@ -85,7 +86,7 @@
</div>
</div>
- <div class="divider gt-my-0"></div>
+ <div class="divider"></div>
<h1>Flex List (with "ui segment")</h1>
<div class="ui attached segment">
@@ -101,6 +102,14 @@
<div class="flex-item">item 2</div>
</div>
</div>
+
+ <h1>If parent provides the padding/margin space:</h1>
+ <div class="gt-border-secondary gt-py-4">
+ <div class="flex-list flex-space-fitted">
+ <div class="flex-item">item 1 (no padding top)</div>
+ <div class="flex-item">item 2 (no padding bottom)</div>
+ </div>
+ </div>
</div>
</div>
{{template "base/footer" .}}
diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl
index 7cc11b073..afa360fd9 100644
--- a/templates/package/shared/list.tmpl
+++ b/templates/package/shared/list.tmpl
@@ -12,8 +12,9 @@
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
</div>
</form>
-<div class="{{if .PackageDescriptors}}flex-list{{end}} gt-pt-4">
+<div>
{{range .PackageDescriptors}}
+ <div class="flex-list">
<div class="flex-item">
<div class="flex-item-main">
<div class="flex-item-title">
@@ -34,6 +35,7 @@
</div>
</div>
</div>
+ </div>
{{else}}
{{if not .HasPackages}}
<div class="empty center">
@@ -46,7 +48,7 @@
<p>{{.locale.Tr "packages.empty.documentation" "https://docs.gitea.com/usage/packages/overview/" | Safe}}</p>
</div>
{{else}}
- <p>{{.locale.Tr "packages.filter.no_result"}}</p>
+ <p class="gt-py-4">{{.locale.Tr "packages.filter.no_result"}}</p>
{{end}}
{{end}}
{{template "base/paginate" .}}
diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl
index 897f4d716..e8043b9ab 100644
--- a/templates/package/shared/versionlist.tmpl
+++ b/templates/package/shared/versionlist.tmpl
@@ -18,8 +18,9 @@
<button class="ui primary button">{{.locale.Tr "explore.search"}}</button>
</div>
</form>
-<div class="{{if .PackageDescriptors}}flex-list{{end}} gt-pt-4">
+<div>
{{range .PackageDescriptors}}
+ <div class="flex-list">
<div class="flex-item">
<div class="flex-item-main">
<a class="flex-item-title" href="{{.FullWebLink}}">{{.Version.LowerVersion}}</a>
@@ -28,8 +29,9 @@
</div>
</div>
</div>
+ </div>
{{else}}
- <p>{{.locale.Tr "packages.filter.no_result"}}</p>
+ <p class="gt-py-4">{{.locale.Tr "packages.filter.no_result"}}</p>
{{end}}
{{template "base/paginate" .}}
</div>
diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl
index 1a45733b7..d8e27fab5 100644
--- a/templates/repo/actions/runs_list.tmpl
+++ b/templates/repo/actions/runs_list.tmpl
@@ -1,4 +1,4 @@
-<div class="flex-list gt-m-0">
+<div class="flex-list">
{{if eq (len .Runs) 0}}
<div class="empty center">
{{svg "octicon-no-entry" 48}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 10e79f6b8..a9e540bc6 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -11,7 +11,7 @@
</div>
</h4>
<div class="ui attached segment">
- <div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
+ <div class="{{if not .HasError}}gt-hidden{{end}}" id="add-deploy-key-panel">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="field">
diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl
index 72cf1dd6c..2cd0fb92a 100644
--- a/templates/shared/issuelist.tmpl
+++ b/templates/shared/issuelist.tmpl
@@ -1,4 +1,4 @@
-<div id="issue-list" class="flex-list gt-pt-4">
+<div id="issue-list" class="flex-list">
{{$approvalCounts := .ApprovalCounts}}
{{range .Issues}}
<div class="flex-item flex-item-baseline">
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 6bfd8b12b..bf6976347 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -116,7 +116,7 @@
<div class="flex-item-body">{{TimeSince .GetCreate $.locale}}</div>
</div>
<div class="flex-item-trailing">
- {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32}}
+ {{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32 "text grey gt-mr-2"}}
</div>
</div>
{{end}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 396d9ebcd..2b81a2349 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -17,9 +17,7 @@
</div>
{{end}}
{{template "user/heatmap" .}}
- <div class="feeds">
- {{template "user/dashboard/feeds" .}}
- </div>
+ {{template "user/dashboard/feeds" .}}
{{else if eq .TabName "stars"}}
<div class="stars">
{{template "explore/repo_search" .}}
diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl
index 5ab96eb63..e7a66de23 100644
--- a/templates/user/settings/keys_gpg.tmpl
+++ b/templates/user/settings/keys_gpg.tmpl
@@ -5,7 +5,7 @@
</div>
</h4>
<div class="ui attached segment">
- <div class="{{if not .HasGPGError}}gt-hidden{{end}} gt-mb-4" id="add-gpg-key-panel">
+ <div class="{{if not .HasGPGError}}gt-hidden{{end}}" id="add-gpg-key-panel">
<form class="ui form{{if .HasGPGError}} error{{end}}" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<input type="hidden" name="title" value="none">
diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl
index 0d2916d30..30c4133b6 100644
--- a/templates/user/settings/keys_ssh.tmpl
+++ b/templates/user/settings/keys_ssh.tmpl
@@ -7,7 +7,7 @@
</div>
</h4>
<div class="ui attached segment">
- <div class="{{if not .HasSSHError}}gt-hidden{{end}} gt-mb-4" id="add-ssh-key-panel">
+ <div class="{{if not .HasSSHError}}gt-hidden{{end}}" id="add-ssh-key-panel">
<form class="ui form" action="{{.Link}}" method="post">
{{.CsrfTokenHtml}}
<div class="field {{if .Err_Title}}error{{end}}">
diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css
index 6dcf73e2a..0168ee0bd 100644
--- a/web_src/css/dashboard.css
+++ b/web_src/css/dashboard.css
@@ -95,10 +95,3 @@
position: static;
}
}
-
-.feeds code {
- padding: 2px 4px;
- border-radius: var(--border-radius);
- background-color: var(--color-markup-code-block);
- word-break: break-all;
-}
diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css
index 1489983cf..27f9bc2d6 100644
--- a/web_src/css/shared/flex-list.css
+++ b/web_src/css/shared/flex-list.css
@@ -91,11 +91,23 @@
border-top: 1px solid var(--color-secondary);
}
-/* Fomantic UI segment has default "padding: 1em", so here it removes the padding-top and padding-bottom accordingly */
+/* Fomantic UI segment has default "padding: 1em", so here it removes the padding-top and padding-bottom accordingly.
+Developers could also use "flex-space-fitted" class to remove the first item's padding-top and the last item's padding-bottom */
+.flex-list.flex-space-fitted > .flex-item:first-child,
.ui.segment > .flex-list:first-child > .flex-item:first-child {
padding-top: 0;
}
+.flex-list.flex-space-fitted > .flex-item:last-child,
.ui.segment > .flex-list:last-child > .flex-item:last-child {
padding-bottom: 0;
}
+
+/* If there is a divider besides the flex-list, some padding/margin are not needs */
+.divider + .flex-list > .flex-item:first-child {
+ padding-top: 0;
+}
+
+.flex-list + .divider {
+ margin-top: 0;
+}