Merge branch 'main' into fix-css-helper

go-gitea · Aug 25, 2023 · dc2028c · dc2028c
2 parents b699500 + 636b6ea
commit dc2028c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl
@@ -20,7 +20,7 @@
 				</div>
 			{{end}}
 		</div>
-		<div class="diff-detail-actions gt-df gt-ac gt-gap-2 gt-fw">
+		<div class="diff-detail-actions">
 			{{if and .PageIsPullFiles $.SignedUserID (not .IsArchived) (not .DiffNotAvailable)}}
 				<div class="gt-df gt-ac gt-fc gt-whitespace-nowrap gt-mr-2">
 					<label for="viewed-files-summary" id="viewed-files-summary-label" data-text-changed-template="{{.locale.Tr "repo.pulls.viewed_files_label"}}">

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
@@ -1625,10 +1625,11 @@
 }
 
 .diff-detail-actions {
-  /* prevent font-size from increasing element height so that .diff-detail-box comes
-     out with height of 47px (one line) and 77px (two lines), which is important for
-     position: sticky */
-  height: 33px;
+  display: flex;
+  align-items: center;
+  gap: 0.25em;
+  flex-wrap: wrap;
+  justify-content: end;
 }
 
 .diff-detail-actions > *,
@@ -1642,12 +1643,7 @@
     padding-top: 0.25rem;
   }
   .repository .diff-detail-box .diff-detail-actions .ui.button:not(.btn-submit) {
-    padding-left: 0.5rem;
-    padding-right: 0.5rem;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    text-align: center;
+    padding: 0 0.5rem;
   }
 }
 

diff --git a/web_src/js/features/comp/ComboMarkdownEditor.js b/web_src/js/features/comp/ComboMarkdownEditor.js
@@ -135,6 +135,12 @@ class ComboMarkdownEditor {
     $panelPreviewer.attr('data-tab', `markdown-previewer-${elementIdCounter}`);
     elementIdCounter++;
 
+    $tabEditor[0].addEventListener('click', () => {
+      requestAnimationFrame(() => {
+        this.focus();
+      });
+    });
+
     $tabs.tab();
 
     this.previewUrl = $tabPreviewer.attr('data-preview-url');