From c0e1aac8f0d1e34f0515f6f18a17da35aa621031 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 8 Sep 2023 14:31:42 +0800 Subject: [PATCH 01/10] fix --- templates/repo/sub_menu.tmpl | 68 ++++++++--------- web_src/css/repo.css | 106 ++++++--------------------- web_src/js/features/common-global.js | 10 +-- web_src/js/features/repo-common.js | 12 +-- web_src/js/features/repo-legacy.js | 2 - 5 files changed, 59 insertions(+), 139 deletions(-) diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index da5f37fa05765..044d5637d9bba 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -1,48 +1,44 @@ {{if and (not .HideRepoInfo) (not .IsBlame)}} -
+
-
- {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}} -
- {{svg "octicon-history"}} {{.locale.PrettyNumber .CommitsCount}} {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}} -
-
- {{svg "octicon-git-branch"}} {{.locale.PrettyNumber .BranchesCount}} {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}} -
- {{if $.Permission.CanRead $.UnitTypeCode}} -
- {{svg "octicon-tag"}} {{.locale.PrettyNumber .NumTags}} {{.locale.TrN .NumTags "repo.tag" "repo.tags"}} -
- {{end}} -
- {{$fileSizeFormatted := FileSize .Repository.Size}}{{/* the formatted string is always "{val} {unit}" */}} - {{$fileSizeFields := StringUtils.Split $fileSizeFormatted " "}} - {{svg "octicon-database"}} {{.locale.PrettyNumber (index $fileSizeFields 0)}} {{index $fileSizeFields 1}} -
+ {{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo)}} + + {{svg "octicon-history"}} {{.locale.PrettyNumber .CommitsCount}} {{.locale.TrN .CommitsCount "repo.commit" "repo.commits"}} + + + {{svg "octicon-git-branch"}} {{.locale.PrettyNumber .BranchesCount}} {{.locale.TrN .BranchesCount "repo.branch" "repo.branches"}} + + {{if $.Permission.CanRead $.UnitTypeCode}} + + {{svg "octicon-tag"}} {{.locale.PrettyNumber .NumTags}} {{.locale.TrN .NumTags "repo.tag" "repo.tags"}} + {{end}} -
+ + {{$fileSizeFormatted := FileSize .Repository.Size}}{{/* the formatted string is always "{val} {unit}" */}} + {{$fileSizeFields := StringUtils.Split $fileSizeFormatted " "}} + {{svg "octicon-database"}} {{.locale.PrettyNumber (index $fileSizeFields 0)}} {{index $fileSizeFields 1}} + + {{end}}
{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}}
-
- {{range .LanguageStats}} -
- - - {{if eq .Language "other"}} - {{$.locale.Tr "repo.language_other"}} - {{else}} - {{.Language}} - {{end}} - - {{.Percentage}}% -
- {{end}} + {{range .LanguageStats}} +
+ + + {{if eq .Language "other"}} + {{$.locale.Tr "repo.language_other"}} + {{else}} + {{.Language}} + {{end}} + + {{.Percentage}}%
+ {{end}}
- + {{range .LanguageStats}} -
 
+
{{end}} {{end}} diff --git a/web_src/css/repo.css b/web_src/css/repo.css index a03ec9f0601ee..c7b460a75718f 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -1,9 +1,6 @@ .repository .data-table .line-num, .repository .diff-file-box .file-body.file-code .lines-num, -.repository .diff-file-box .code-diff tbody tr .lines-type-marker, -.repository .repository-summary .segment.language-stats { - -webkit-touch-callout: none; - -webkit-user-select: none; +.repository .diff-file-box .code-diff tbody tr .lines-type-marker { user-select: none; } @@ -1943,47 +1940,6 @@ border-bottom: 1px solid var(--color-warning-border); } -.repository .ui.segment.sub-menu { - padding: 7px; - line-height: 0; -} - -.repository .ui.segment.sub-menu .list { - width: 100%; - display: flex; - align-items: stretch; -} - -.repository .ui.segment.sub-menu .list .item { - width: 100%; - color: var(--color-text); - display: flex; - align-items: center; - justify-content: center; -} - -.repository .ui.segment.sub-menu .list .item:first-of-type { - border-radius: var(--border-radius) 0 0 var(--border-radius); - padding-left: 0.25rem; -} - -.repository .ui.segment.sub-menu .list .item:last-of-type { - border-radius: 0 var(--border-radius) var(--border-radius) 0; - padding-right: 0.25rem; -} - -.repository .ui.segment.sub-menu .list .item a { - color: var(--color-text); -} - -.repository .ui.segment.sub-menu .list .item a:hover { - color: var(--color-primary-light-2); -} - -.repository .ui.segment.sub-menu .list .item.active { - background: var(--color-secondary); -} - .repository .segment.reactions.dropdown .menu, .repository .select-reaction.dropdown .menu { right: 0 !important; @@ -2081,26 +2037,35 @@ } .repository .repository-summary { - box-shadow: none !important; + box-shadow: none; } -.repository .repository-summary .segment.language-stats-details, -.repository .repository-summary .segment.repository-summary { - border-top: none; - background: none; +.repository .repository-summary .segment.sub-menu { + border: none; + padding: 0; + display: flex; + align-items: center; } -.repository .repository-summary .segment.language-stats-details .item { - white-space: nowrap; +.repository .repository-summary .sub-menu .item { + flex: 1; + height: 30px; + line-height: var(--line-height-default); + display: flex; + align-items: center; + justify-content: center; + gap: 0.5em; +} + +.repository .repository-summary .sub-menu .item.active { + background: var(--color-secondary); } .repository .repository-summary .segment.language-stats { - padding: 0; - height: 11px; display: flex; + padding: 0; + height: 10px; white-space: nowrap; - width: 100%; - border-radius: 0; } @media (max-width: 767.98px) { @@ -2109,23 +2074,6 @@ } } -.repository .repository-summary .segment.language-stats .bar { - white-space: nowrap; - border: 0; - padding: 0; - margin: 0; - height: 100%; -} - -.repository .repository-menu { - padding: 0 !important; -} - -.repository .repository-menu .item { - padding-top: 9px !important; - padding-bottom: 9px !important; -} - #cite-repo-modal #citation-panel { width: 500px; } @@ -2924,18 +2872,6 @@ tbody.commit-list { height: 100%; } -/* prevent page shaking on language bar click */ -.repository-summary-language-stats { - height: 48px; - overflow: hidden; -} - -@media (max-width: 767.98px) { - .repository-summary-language-stats { - height: auto; - } -} - .ui.form .right .ui.button { margin-left: 0.25em; margin-right: 0; diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 03169e681587e..b30e21d0c0847 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -388,9 +388,9 @@ export function initGlobalButtons() { e.preventDefault(); }); - $('.show-panel.button').on('click', function (e) { - // a '.show-panel.button' can show a panel, by `data-panel="selector"` - // if the button is a "toggle" button, it toggles the panel + $('.show-panel').on('click', function (e) { + // a '.show-panel' element can show a panel, by `data-panel="selector"` + // if it has "toggle" class, it toggles the panel e.preventDefault(); const sel = $(this).attr('data-panel'); if (this.classList.contains('toggle')) { @@ -400,8 +400,8 @@ export function initGlobalButtons() { } }); - $('.hide-panel.button').on('click', function (e) { - // a `.hide-panel.button` can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"` + $('.hide-panel').on('click', function (e) { + // a `.hide-panel` element can hide a panel, by `data-panel="selector"` or `data-panel-closest="selector"` e.preventDefault(); let sel = $(this).attr('data-panel'); if (sel) { diff --git a/web_src/js/features/repo-common.js b/web_src/js/features/repo-common.js index 755f2a0653264..3573e4d50beab 100644 --- a/web_src/js/features/repo-common.js +++ b/web_src/js/features/repo-common.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import {hideElem, showElem, toggleElem} from '../utils/dom.js'; +import {hideElem, showElem} from '../utils/dom.js'; const {csrfToken} = window.config; @@ -91,13 +91,3 @@ export function initRepoCommonFilterSearchDropdown(selector) { message: {noResults: $dropdown.attr('data-no-results')}, }); } - -export function initRepoCommonLanguageStats() { - // Language stats - if ($('.language-stats').length > 0) { - $('.language-stats').on('click', (e) => { - e.preventDefault(); - toggleElem($('.language-stats-details, .repository-menu')); - }); - } -} diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js index 51edf0bd12047..0aacc6ee85e83 100644 --- a/web_src/js/features/repo-legacy.js +++ b/web_src/js/features/repo-legacy.js @@ -11,7 +11,6 @@ import {htmlEscape} from 'escape-goat'; import {initRepoBranchTagSelector} from '../components/RepoBranchTagSelector.vue'; import { initRepoCloneLink, initRepoCommonBranchOrTagDropdown, initRepoCommonFilterSearchDropdown, - initRepoCommonLanguageStats, } from './repo-common.js'; import {initCitationFileCopyContent} from './citation.js'; import {initCompLabelEdit} from './comp/LabelEdit.js'; @@ -525,7 +524,6 @@ export function initRepository() { initRepoCloneLink(); initCitationFileCopyContent(); - initRepoCommonLanguageStats(); initRepoSettingBranches(); // Issues From 66456f048fe74afa2f1e9913e38716f62b91d41e Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 14:42:26 +0200 Subject: [PATCH 02/10] fix border-radius --- web_src/css/repo.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index c7b460a75718f..b475b5502fbd2 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2066,6 +2066,8 @@ padding: 0; height: 10px; white-space: nowrap; + border-radius: 0 0 3px 3px !important; + overflow: hidden; } @media (max-width: 767.98px) { From 2b27c3300d2d92e7352e5dc5f8d4e17cd6580bd2 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 14:43:52 +0200 Subject: [PATCH 03/10] fine-tune --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index b475b5502fbd2..3106d932f8118 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2066,7 +2066,7 @@ padding: 0; height: 10px; white-space: nowrap; - border-radius: 0 0 3px 3px !important; + border-radius: 0 0 3.25px 3.25px !important; overflow: hidden; } From 03d250f2068ad7a3ba3a8367c40313fb09e0a05b Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 14:45:46 +0200 Subject: [PATCH 04/10] revert to 3px --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 3106d932f8118..b475b5502fbd2 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2066,7 +2066,7 @@ padding: 0; height: 10px; white-space: nowrap; - border-radius: 0 0 3.25px 3.25px !important; + border-radius: 0 0 3px 3px !important; overflow: hidden; } From 25f917cccfcd349ea70e29fe1609827427fbfdff Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 14:47:59 +0200 Subject: [PATCH 05/10] show language bar on mobile too --- web_src/css/repo.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index b475b5502fbd2..fa89c920b0ce4 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2070,12 +2070,6 @@ overflow: hidden; } -@media (max-width: 767.98px) { - .repository .repository-summary .segment.language-stats { - display: none; - } -} - #cite-repo-modal #citation-panel { width: 500px; } From 1b4f330cd27e3b7e57e68b4b8673ba07532b5aab Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 14:52:26 +0200 Subject: [PATCH 06/10] reduce gap to help mobile space --- web_src/css/repo.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index fa89c920b0ce4..f16bac1b27f50 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2054,7 +2054,7 @@ display: flex; align-items: center; justify-content: center; - gap: 0.5em; + gap: 0.25em; } .repository .repository-summary .sub-menu .item.active { From 8fc82f5422a6340f6fba262adb1b5845d713042c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 8 Sep 2023 21:02:23 +0800 Subject: [PATCH 07/10] make the UI look better for narrow (mobile) view --- web_src/css/repo.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index f16bac1b27f50..0693840c31e08 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2042,9 +2042,10 @@ .repository .repository-summary .segment.sub-menu { border: none; - padding: 0; display: flex; align-items: center; + padding: 0 0.5em; /* make the UI look better for narrow (mobile) view */ + overflow: hidden; } .repository .repository-summary .sub-menu .item { @@ -2055,6 +2056,7 @@ align-items: center; justify-content: center; gap: 0.25em; + padding: 0 0.25em; } .repository .repository-summary .sub-menu .item.active { From 2a45ee805c49c5a937c937fa28030e83614f8af5 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 8 Sep 2023 18:17:08 +0800 Subject: [PATCH 08/10] Check newly added node type before "attachDirAuto" (#26972) --- web_src/js/modules/dirauto.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/modules/dirauto.js b/web_src/js/modules/dirauto.js index 91f71a5b853db..c917bf8cff2f1 100644 --- a/web_src/js/modules/dirauto.js +++ b/web_src/js/modules/dirauto.js @@ -19,7 +19,7 @@ export function initDirAuto() { for (let i = 0; i < len; i++) { const addedNode = mutation.addedNodes[i]; if (addedNode.nodeType !== Node.ELEMENT_NODE && addedNode.nodeType !== Node.DOCUMENT_FRAGMENT_NODE) continue; - attachDirAuto(addedNode); + if (addedNode.nodeName === 'INPUT' || addedNode.nodeName === 'TEXTAREA') attachDirAuto(addedNode); const children = addedNode.querySelectorAll('input, textarea'); const len = children.length; for (let childIdx = 0; childIdx < len; childIdx++) { From aac686ccc1611837e577830e69020521fdcbd6bb Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 8 Sep 2023 18:32:26 +0800 Subject: [PATCH 09/10] Add v1.20.4 changelog (#26974) frontport from #26966 --------- Co-authored-by: techknowlogick --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b4f17b658673..8ef677b88cac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,34 @@ This changelog goes through all the changes that have been made in each release without substantial changes to our git log; to see the highlights of what has been added to each release, please refer to the [blog](https://blog.gitea.com). +## [1.20.4](https://github.com/go-gitea/gitea/releases/tag/v1.20.4) - 2023-09-08 + +* SECURITY + * Check blocklist for emails when adding them to account (#26812) (#26831) +* ENHANCEMENTS + * Add `branch_filter` to hooks API endpoints (#26599) (#26632) + * Fix incorrect "tabindex" attributes (#26733) (#26734) + * Use line-height: normal by default (#26635) (#26708) + * Fix unable to display individual-level project (#26198) (#26636) +* BUGFIXES + * Fix wrong review requested number (#26784) (#26880) + * Avoid double-unescaping of form value (#26853) (#26863) + * Redirect from `{repo}/issues/new` to `{repo}/issues/new/choose` when blank issues are disabled (#26813) (#26847) + * Sync tags when adopting repos (#26816) (#26834) + * Fix verifyCommits error when push a new branch (#26664) (#26810) + * Include the GITHUB_TOKEN/GITEA_TOKEN secret for fork pull requests (#26759) (#26806) + * Fix some slice append usages (#26778) (#26798) + * Add fix incorrect can_create_org_repo for org owner team (#26683) (#26791) + * Fix bug for ctx usage (#26763) + * Make issue template field template access correct template data (#26698) (#26709) + * Use correct minio error (#26634) (#26639) + * Ignore the trailing slashes when comparing oauth2 redirect_uri (#26597) (#26618) + * Set errwriter for urfave/cli v1 (#26616) + * Fix reopen logic for agit flow pull request (#26399) (#26613) + * Fix context filter has no effect in dashboard (#26695) (#26811) + * Fix being unable to use a repo that prohibits accepting PRs as a PR source. (#26785) (#26790) + * Fix Page Not Found error (#26768) + ## [1.20.3](https://github.com/go-gitea/gitea/releases/tag/v1.20.3) - 2023-08-20 * BREAKING From 86ff17995481d5f8e7eaed58b5381bee8d8e4db1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 8 Sep 2023 15:10:53 +0200 Subject: [PATCH 10/10] hide size on mobile --- templates/repo/sub_menu.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl index 044d5637d9bba..3a1400575c6fc 100644 --- a/templates/repo/sub_menu.tmpl +++ b/templates/repo/sub_menu.tmpl @@ -13,7 +13,7 @@ {{svg "octicon-tag"}} {{.locale.PrettyNumber .NumTags}} {{.locale.TrN .NumTags "repo.tag" "repo.tags"}} {{end}} - + {{$fileSizeFormatted := FileSize .Repository.Size}}{{/* the formatted string is always "{val} {unit}" */}} {{$fileSizeFields := StringUtils.Split $fileSizeFormatted " "}} {{svg "octicon-database"}} {{.locale.PrettyNumber (index $fileSizeFields 0)}} {{index $fileSizeFields 1}}