Fix conflict-marker spacing (#4128)

refined-github · Apr 2, 2021 · 1225061 · 1225061
1 parent 787336c
commit 1225061
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/source/features/align-issue-labels.css b/source/features/align-issue-labels.css
@@ -8,9 +8,8 @@
 	order: 1;
 }
 
-.rgh-align-issue-labels .js-issue-row .h4, /* Title */
 .rgh-align-issue-labels .js-issue-row .d-inline-block.mr-1 { /* Build status */
-	padding-right: 4px; /* Space before the build status */
+	margin-left: 4px;
 }
 
 .rgh-align-issue-labels .js-issue-row .mt-1.text-small.text-gray, /* GHE */

diff --git a/source/features/conflict-marker.tsx b/source/features/conflict-marker.tsx
@@ -54,7 +54,7 @@ async function init(): Promise<false | void> {
 		if (data[pr.key].pullRequest.mergeable === 'CONFLICTING') {
 			pr.link.after(
 				<a
-					className="rgh-conflict-marker tooltipped tooltipped-e m-0 text-gray color-text-secondary mr-1"
+					className="rgh-conflict-marker tooltipped tooltipped-e text-gray color-text-secondary ml-2"
 					aria-label="This PR has conflicts that must be resolved"
 					href={`${pr.link.pathname}#partial-pull-merging`}
 				>