From ee3e07daa73a986360b383ec63de2a0c251298f0 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 04:40:45 +0100 Subject: [PATCH 01/11] Repo file list enhancements --- templates/repo/view_list.tmpl | 6 ++-- web_src/css/repo/home-file-list.css | 53 ++++++++++++++++++++++++----- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 0fdb45e574c8e..4b8f4634f98a6 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -5,9 +5,9 @@
{{if and .LatestCommit .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}
{{if .HasParentPath}} -
- {{svg "octicon-reply"}} .. -
+ + {{svg "octicon-file-directory-fill"}} .. + {{end}} {{range $item := .Files}}
diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index ecb26fa6629a4..4fa31abf011ef 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -1,12 +1,23 @@ #repo-files-table { width: 100%; display: grid; - grid-template-columns: auto 1fr auto; + grid-template-columns: 2fr 3fr auto; border: 1px solid var(--color-light-border); + background: var(--color-box-body); border-radius: var(--border-radius); margin: 10px 0; /* match the "clone-panel-popup" margin to avoid "visual double-border" */ } +@media (max-width: 767.98px) { + #repo-files-table { + grid-template-columns: 1fr 1fr auto; + } +} + +#repo-files-table .repo-file-cell.name .svg { + margin-right: 2px; +} + #repo-files-table .svg.octicon-file-directory-fill, #repo-files-table .svg.octicon-file-submodule { color: var(--color-primary); @@ -22,18 +33,38 @@ display: contents; } -#repo-files-table .repo-file-item:hover > .repo-file-cell { +#repo-files-table .repo-file-item:hover > .repo-file-cell, +#repo-files-table .parent-link:hover { background: var(--color-hover); } #repo-files-table .repo-file-line, #repo-files-table .repo-file-cell { - border-top: 1px solid var(--color-light-border); - padding: 6px 10px; + border-top: .5px solid var(--color-light-border); + border-bottom: .5px solid var(--color-light-border); + padding: 8px 10px; } #repo-files-table .repo-file-line:first-child { border-top: none; + border-radius: var(--border-radius) var(--border-radius) 0 0; +} + +#repo-files-table .repo-file-item:last-child .repo-file-line, +#repo-files-table .repo-file-item:last-child .repo-file-cell { + border-bottom: none; +} + +#repo-files-table .repo-file-item:last-child { + border-bottom: none; +} + +#repo-files-table .repo-file-item:last-child .repo-file-cell:first-child { + border-bottom-left-radius: calc(var(--border-radius) - 1px); +} + +#repo-files-table .repo-file-item:last-child .repo-file-cell:last-child { + border-bottom-right-radius: calc(var(--border-radius) - 1px); } #repo-files-table .repo-file-line { @@ -49,12 +80,17 @@ } #repo-files-table .repo-file-cell.name { - max-width: 300px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } +@media (max-width: 767.98px) { + #repo-files-table .repo-file-cell.name { + max-width: 35vw; + } +} + #repo-files-table .repo-file-cell.message { white-space: nowrap; overflow: hidden; @@ -68,8 +104,7 @@ color: var(--color-text-light-1); } -@media (max-width: 767.98px) { - #repo-files-table .repo-file-cell.name { - max-width: 150px; - } +#repo-files-table .parent-link { + width: 100%; + text-decoration-line: none; } From ee140711e83da13373f8303e5ad2c0074cac378f Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 05:35:12 +0100 Subject: [PATCH 02/11] remove duplicate rule --- web_src/css/repo/home-file-list.css | 1 - 1 file changed, 1 deletion(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 4fa31abf011ef..f6c4345fb7bfc 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -72,7 +72,6 @@ display: flex; align-items: center; gap: 0.5em; - padding: 6px 10px; } #repo-files-table .repo-file-last-commit { From 71215561a95e7973a71a9206a61ae966f0ad144b Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 06:02:24 +0100 Subject: [PATCH 03/11] use silenced --- templates/repo/view_list.tmpl | 2 +- web_src/css/repo/home-file-list.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index 4b8f4634f98a6..2d555e4c2e9ec 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -5,7 +5,7 @@
{{if and .LatestCommit .LatestCommit.Committer}}{{DateUtils.TimeSince .LatestCommit.Committer.When}}{{end}}
{{if .HasParentPath}} - + {{svg "octicon-file-directory-fill"}} .. {{end}} diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index f6c4345fb7bfc..0d904cea82d4e 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -105,5 +105,4 @@ #repo-files-table .parent-link { width: 100%; - text-decoration-line: none; } From a7bfd56517aa8e3baea495a1c72ab7ef326dc287 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 06:03:27 +0100 Subject: [PATCH 04/11] remove dead rule --- web_src/css/repo/home-file-list.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 0d904cea82d4e..f290996e5aff7 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -55,10 +55,6 @@ border-bottom: none; } -#repo-files-table .repo-file-item:last-child { - border-bottom: none; -} - #repo-files-table .repo-file-item:last-child .repo-file-cell:first-child { border-bottom-left-radius: calc(var(--border-radius) - 1px); } From 9ce75c028a01c07b52cce0554b66a8a5dbf76d93 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 06:50:11 +0100 Subject: [PATCH 05/11] use auto on mobile --- web_src/css/repo/home-file-list.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index f290996e5aff7..04797b4c4b725 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -10,7 +10,7 @@ @media (max-width: 767.98px) { #repo-files-table { - grid-template-columns: 1fr 1fr auto; + grid-template-columns: auto 1fr auto; } } From dd273d08ca7f2d5129b1416c0be975667dc0994f Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 14 Dec 2024 06:52:49 +0100 Subject: [PATCH 06/11] remove unnecessary rule --- web_src/css/repo/home-file-list.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 04797b4c4b725..6166ae22060c7 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -98,7 +98,3 @@ white-space: nowrap; color: var(--color-text-light-1); } - -#repo-files-table .parent-link { - width: 100%; -} From 8ee99c96c9bab842d23a4119d2e0d1669587263b Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2024 03:33:30 +0100 Subject: [PATCH 07/11] add --color-hover-opaque --- web_src/css/repo/home-file-list.css | 2 +- web_src/css/themes/theme-gitea-dark.css | 1 + web_src/css/themes/theme-gitea-light.css | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 6166ae22060c7..399db11e7f9ec 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -35,7 +35,7 @@ #repo-files-table .repo-file-item:hover > .repo-file-cell, #repo-files-table .parent-link:hover { - background: var(--color-hover); + background: var(--color-hover-opaque); } #repo-files-table .repo-file-line, diff --git a/web_src/css/themes/theme-gitea-dark.css b/web_src/css/themes/theme-gitea-dark.css index 85de7e210a01d..9bc7747697651 100644 --- a/web_src/css/themes/theme-gitea-dark.css +++ b/web_src/css/themes/theme-gitea-dark.css @@ -203,6 +203,7 @@ --color-light-mimic-enabled: rgba(0, 0, 0, calc(40 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #e8f3ff28; --color-hover: #e8f3ff19; + --color-hover-opaque: #21252a; /* TODO: color-mix(in srgb, var(--color-body), var(--color-hover)); */ --color-active: #e8f3ff24; --color-menu: #171a1e; --color-card: #171a1e; diff --git a/web_src/css/themes/theme-gitea-light.css b/web_src/css/themes/theme-gitea-light.css index 0bdfd076d69fb..d7f9debf90069 100644 --- a/web_src/css/themes/theme-gitea-light.css +++ b/web_src/css/themes/theme-gitea-light.css @@ -203,6 +203,7 @@ --color-light-mimic-enabled: rgba(0, 0, 0, calc(6 / 255 * 222 / 255 / var(--opacity-disabled))); --color-light-border: #0000171d; --color-hover: #00001708; + --color-hover-opaque: #f1f3f5; /* TODO: color-mix(in srgb, var(--color-body), var(--color-hover)); */ --color-active: #00001714; --color-menu: #f8f9fb; --color-card: #f8f9fb; From ee02c71231522d6a50ebac2dfd719cdbf8b01e49 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2024 03:34:44 +0100 Subject: [PATCH 08/11] remove border-bottom --- web_src/css/repo/home-file-list.css | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 399db11e7f9ec..c3a445811869d 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -40,8 +40,7 @@ #repo-files-table .repo-file-line, #repo-files-table .repo-file-cell { - border-top: .5px solid var(--color-light-border); - border-bottom: .5px solid var(--color-light-border); + border-top: 1px solid var(--color-light-border); padding: 8px 10px; } @@ -50,11 +49,6 @@ border-radius: var(--border-radius) var(--border-radius) 0 0; } -#repo-files-table .repo-file-item:last-child .repo-file-line, -#repo-files-table .repo-file-item:last-child .repo-file-cell { - border-bottom: none; -} - #repo-files-table .repo-file-item:last-child .repo-file-cell:first-child { border-bottom-left-radius: calc(var(--border-radius) - 1px); } From 1bdfbba747a0617f8c94c4966fce32ae282c717c Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2024 03:52:04 +0100 Subject: [PATCH 09/11] tweak borders --- web_src/css/repo/home-file-list.css | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index c3a445811869d..126bb58b8907a 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -2,7 +2,7 @@ width: 100%; display: grid; grid-template-columns: 2fr 3fr auto; - border: 1px solid var(--color-light-border); + border: 1px solid var(--color-secondary); background: var(--color-box-body); border-radius: var(--border-radius); margin: 10px 0; /* match the "clone-panel-popup" margin to avoid "visual double-border" */ @@ -40,7 +40,7 @@ #repo-files-table .repo-file-line, #repo-files-table .repo-file-cell { - border-top: 1px solid var(--color-light-border); + border-top: 1px solid var(--color-secondary-light-1); padding: 8px 10px; } @@ -49,6 +49,10 @@ border-radius: var(--border-radius) var(--border-radius) 0 0; } +#repo-files-table .repo-file-item:nth-child(2) .repo-file-cell { + border-top-color: var(--color-secondary); +} + #repo-files-table .repo-file-item:last-child .repo-file-cell:first-child { border-bottom-left-radius: calc(var(--border-radius) - 1px); } From cc3c2d510a6cc9c13bdabbc630d3bb545e9e076b Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2024 04:42:07 +0100 Subject: [PATCH 10/11] fix selector --- web_src/css/repo/home-file-list.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 126bb58b8907a..53633db7ced15 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -49,7 +49,8 @@ border-radius: var(--border-radius) var(--border-radius) 0 0; } -#repo-files-table .repo-file-item:nth-child(2) .repo-file-cell { +#repo-files-table .repo-file-last-commit + .repo-file-line, +#repo-files-table .repo-file-last-commit + .repo-file-item .repo-file-cell { border-top-color: var(--color-secondary); } From dc821e32c2a94f865b59708a3b1eca0c51ff7739 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sun, 15 Dec 2024 04:44:26 +0100 Subject: [PATCH 11/11] use same color --- web_src/css/repo/home-file-list.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/web_src/css/repo/home-file-list.css b/web_src/css/repo/home-file-list.css index 53633db7ced15..19ba1f2bcbeb8 100644 --- a/web_src/css/repo/home-file-list.css +++ b/web_src/css/repo/home-file-list.css @@ -40,7 +40,7 @@ #repo-files-table .repo-file-line, #repo-files-table .repo-file-cell { - border-top: 1px solid var(--color-secondary-light-1); + border-top: 1px solid var(--color-secondary); padding: 8px 10px; } @@ -49,11 +49,6 @@ border-radius: var(--border-radius) var(--border-radius) 0 0; } -#repo-files-table .repo-file-last-commit + .repo-file-line, -#repo-files-table .repo-file-last-commit + .repo-file-item .repo-file-cell { - border-top-color: var(--color-secondary); -} - #repo-files-table .repo-file-item:last-child .repo-file-cell:first-child { border-bottom-left-radius: calc(var(--border-radius) - 1px); }