Merge branch 'main' into schedule

Author: appleboy

.npmrc

@@ -3,3 +3,4 @@ fund=false
 update-notifier=false
 package-lock=true
 save-exact=true
+lockfile-version=3

options/locale/locale_pt-PT.ini

@@ -1369,6 +1369,7 @@ issues.context.reference_issue=Criar uma nova questão referindo esta
 issues.context.edit=Editar
 issues.context.delete=Eliminar
 issues.no_content=Ainda não há conteúdo.
+issues.close=Encerrar questão
 issues.pull_merged_at=`integrou o cometimento <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> no ramo <b>%[3]s</b> %[4]s`
 issues.manually_pull_merged_at=`integrou o cometimento <a class="ui sha" href="%[1]s"><code>%[2]s</code></a> no ramo <b>%[3]s</b> manualmente %[4]s`
 issues.close_comment_issue=Comentar e fechar
@@ -1653,6 +1654,7 @@ pulls.update_branch_rebase=Modificar ramo mudando a base
 pulls.update_branch_success=A sincronização do ramo foi bem sucedida
 pulls.update_not_allowed=Não tem autorização para sincronizar o ramo
 pulls.outdated_with_base_branch=Este ramo é obsoleto em relação ao ramo base
+pulls.close=Encerrar pedido de integração
 pulls.closed_at=`fechou este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.reopened_at=`reabriu este pedido de integração <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.merge_instruction_hint=`Também pode ver as <a class="show-instruction">instruções para a linha de comandos</a>.`

package-lock.json

@@ -10,7 +10,7 @@
 					<a class="name" href="{{.Link}}">
 						{{if or $.PageIsExplore $.PageIsProfileStarList}}{{if .Owner}}{{.Owner.Name}} / {{end}}{{end}}{{.Name}}
 					</a>
-					<div class="labels gt-df gt-ac gt-fw">
+					<div class="labels gt-df gt-ac gt-fw gt-mr-3">
 						{{if .IsArchived}}
 							<span class="ui basic label">{{$.locale.Tr "repo.desc.archived"}}</span>
 						{{end}}

templates/explore/repo_list.tmpl

@@ -37,7 +37,7 @@
 
 					<div class="inline field">
 						<label>{{.locale.Tr "repo.fork_from"}}</label>
-						<a href="{{.ForkRepo.Link}}">{{.ForkRepo.FullName}}</a>
+						<a href="{{.ForkRepo.Link}}" class="gt-dib">{{.ForkRepo.FullName}}</a>
 					</div>
 					<div class="inline required field {{if .Err_RepoName}}error{{end}}">
 						<label for="repo_name">{{.locale.Tr "repo.repo_name"}}</label>

templates/repo/pulls/fork.tmpl

@@ -1173,10 +1173,8 @@ a.ui.card:hover,
   border-color: var(--color-secondary);
 }
 
-.ui.modal > .close.inside,
-.ui.fullscreen.modal > .close {
-  top: 11px; /* align modal close icon, for example admin notices */
-  color: var(--body-color);
+.ui.modal > .close.inside {
+  color: var(--color-text);
 }
 
 .ui.basic.table > tbody > tr {

web_src/css/base.css

@@ -17,8 +17,8 @@
   left: 0;
   transform: translateX(-70%);
   cursor: pointer;
+}
 
-  &:hover {
-    color: var(--color-primary);
-  }
+.code-line-button:hover {
+  color: var(--color-primary);
 }

web_src/css/code/linebutton.css

@@ -41,6 +41,11 @@
   margin-bottom: 0.5rem;
 }
 
+.ui.repository.list .repo-title .labels {
+  word-break: normal;
+  flex-shrink: 0;
+}
+
 .ui.repository.branches .info {
   font-size: 12px;
   color: var(--color-text-light);

web_src/css/explore.css

@@ -479,7 +479,8 @@ textarea:focus,
 
 .repository.new.repo form .selection.dropdown,
 .repository.new.migrate form .selection.dropdown,
-.repository.new.fork form .selection.dropdown {
+.repository.new.fork form .selection.dropdown,
+.repository.new.fork form .field a {
   vertical-align: middle;
   width: 50% !important;
 }
@@ -491,6 +492,7 @@ textarea:focus,
   .repository.new.repo form input,
   .repository.new.migrate form input,
   .repository.new.fork form input,
+  .repository.new.fork form .field a,
   .repository.new.repo form .selection.dropdown,
   .repository.new.migrate form .selection.dropdown,
   .repository.new.fork form .selection.dropdown {
@@ -500,8 +502,7 @@ textarea:focus,
   .repository.new.migrate form .field button,
   .repository.new.fork form .field button,
   .repository.new.repo form .field a,
-  .repository.new.migrate form .field a,
-  .repository.new.fork form .field a {
+  .repository.new.migrate form .field a {
     margin-bottom: 1em;
     width: 100%;
   }

web_src/css/form.css

@@ -214,6 +214,10 @@
   font-size: 1.2em;
 }
 
+.repository.file.list .repo-path {
+  word-break: break-word;
+}
+
 .repository.file.list .repo-path .section,
 .repository.file.list .repo-path .divider {
   display: inline;
@@ -1611,12 +1615,14 @@
   padding: 7px 0;
   background: var(--color-body);
   line-height: 30px;
+  height: 47px; /* match .ui.attached.header.diff-file-header.sticky-2nd-row */
 }
 
 @media (max-width: 991px) {
   .repository .diff-detail-box {
     flex-direction: column;
     align-items: flex-start;
+    height: 77px; /* match .ui.attached.header.diff-file-header.sticky-2nd-row */
   }
 }
 
@@ -1630,7 +1636,7 @@
   position: sticky;
   top: 0;
   z-index: 8;
-  border-bottom: 1px solid var(--color-secondary);
+  border-bottom: none;
   padding-left: 2px;
   padding-right: 2px;
   margin-left: -1px;
@@ -3318,10 +3324,16 @@ td.blob-excerpt {
 
 .ui.attached.header.diff-file-header.sticky-2nd-row {
   position: sticky;
-  top: 77px;
+  top: 47px; /* match .repository .diff-detail-box */
   z-index: 7;
 }
 
+@media (max-width: 991px) {
+  .ui.attached.header.diff-file-header.sticky-2nd-row {
+    top: 77px; /* match .repository .diff-detail-box */
+  }
+}
+
 @media (max-width: 480px) {
   .ui.attached.header.diff-file-header.sticky-2nd-row {
     position: static;

web_src/css/repository.css

@@ -67,6 +67,11 @@
   margin-top: 25px;
 }
 
+.user.profile .ui.repository.list .repo-title .labels {
+  word-break: normal;
+  flex-shrink: 0;
+}
+
 .user.profile #loading-heatmap {
   margin-bottom: 1em;
 }

web_src/css/user.css

@@ -516,20 +516,22 @@ export function initRepoPullRequestReview() {
   const $panel = $reviewBtn.parent().find('.review-box-panel');
   const $closeBtn = $panel.find('.close');
 
-  const tippy = createTippy($reviewBtn[0], {
-    content: $panel[0],
-    placement: 'bottom',
-    trigger: 'click',
-    role: 'menu',
-    maxWidth: 'none',
-    interactive: true,
-    hideOnClick: true,
-  });
+  if ($reviewBtn.length && $panel.length) {
+    const tippy = createTippy($reviewBtn[0], {
+      content: $panel[0],
+      placement: 'bottom',
+      trigger: 'click',
+      role: 'menu',
+      maxWidth: 'none',
+      interactive: true,
+      hideOnClick: true,
+    });
 
-  $closeBtn.on('click', (e) => {
-    e.preventDefault();
-    tippy.hide();
-  });
+    $closeBtn.on('click', (e) => {
+      e.preventDefault();
+      tippy.hide();
+    });
+  }
 
   $(document).on('click', 'a.add-code-comment', async function (e) {
     if ($(e.target).hasClass('btn-add-single')) return; // https://github.com/go-gitea/gitea/issues/4745