Merge branch 'main' into bug_fix

Author: 6543

templates/repo/graph/commits.tmpl

@@ -33,14 +33,8 @@
 						{{range $commit.Refs}}
 							{{$refGroup := .RefGroup}}
 							{{if eq $refGroup "pull"}}
-								{{if $.HidePRRefs}}
-									{{if (containGeneric $.SelectedBranches .Name) }}
-										<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/issues/{{.ShortName|PathEscape}}">
-											{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
-										</a>
-									{{end}}
-								{{else}}
-									<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/issues/{{.ShortName|PathEscape}}">
+								{{if or (not $.HidePRRefs) (containGeneric $.SelectedBranches .Name)}}
+									<a class="ui labelled icon button basic tiny" href="{{$.RepoLink}}/pulls/{{.ShortName|PathEscape}}">
 										{{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}}
 									</a>
 								{{end}}

templates/shared/issuelist.tmpl

@@ -2,7 +2,7 @@
 	{{ $approvalCounts := .ApprovalCounts}}
 	{{range .Issues}}
 		<li class="item df py-3">
-			<div class="issue-item-left df py-1">
+			<div class="issue-item-left df">
 				{{if $.CanWriteIssuesOrPulls}}
 					<div class="ui checkbox issue-checkbox">
 						<input type="checkbox" data-issue-id={{.ID}}></input>

web_src/less/_base.less

@@ -112,6 +112,7 @@
   --color-placeholder-text: #aaa;
   --color-editor-line-highlight: var(--color-primary-light-6);
   --color-project-board-bg: var(--color-secondary-light-4);
+  --color-caret: var(--color-text-dark);
   /* backgrounds */
   --checkbox-mask-checked: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="-1 -1 18 18" width="16" height="16"><path fill-rule="evenodd" d="M13.78 4.22a.75.75 0 010 1.06l-7.25 7.25a.75.75 0 01-1.06 0L2.22 9.28a.75.75 0 011.06-1.06L6 10.94l6.72-6.72a.75.75 0 011.06 0z"></path></svg>');
   --checkbox-mask-indeterminate: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M2 7.75A.75.75 0 012.75 7h10a.75.75 0 010 1.5h-10A.75.75 0 012 7.75z"></path></svg>');
@@ -161,15 +162,12 @@ table {
   border-collapse: collapse;
 }
 
-/* firefox scroll bars */
-
 * {
   scrollbar-width: thin;
   scrollbar-color: var(--color-primary) transparent;
+  caret-color: var(--color-caret);
 }
 
-/* webkit scrollbars */
-
 ::-webkit-scrollbar {
   width: 10px;
 }
@@ -188,6 +186,10 @@ table {
   background: transparent;
 }
 
+.CodeMirror-cursor {
+  border-color: var(--color-caret) !important;
+}
+
 ::selection,
 .CodeMirror-selected {
   background: var(--color-primary-light-1) !important;

web_src/less/_editor.less

@@ -4,10 +4,6 @@
   border-color: var(--color-secondary);
   font: 14px var(--fonts-monospace);
 
-  .CodeMirror-cursor {
-    border-left: 1px solid var(--color-input-text);
-  }
-
   &.cm-s-default {
     border-radius: 3px;
     padding: 0 !important;

web_src/less/shared/issuelist.less

@@ -13,6 +13,7 @@
 
     .issue-item-icon svg {
       margin-right: .75rem;
+      margin-top: 1px;
     }
 
     .issue-item-icons-right > * + * {
@@ -29,10 +30,11 @@
       font-size: 16px;
       min-width: 0;
       font-weight: 600;
+    }
 
-      > * {
-        vertical-align: middle;
-      }
+    .labels-list {
+      position: relative;
+      top: -1.5px;
     }
 
     .issue-item-bottom-row {

web_src/less/themes/theme-arc-green.less

@@ -108,6 +108,7 @@
   --color-placeholder-text: #6a737d;
   --color-editor-line-highlight: var(--color-primary-light-5);
   --color-project-board-bg: var(--color-secondary-light-2);
+  --color-caret: var(--color-text); /* should ideally be --color-text-dark, see #15651 */
 }
 
 ::-webkit-calendar-picker-indicator {