From ca32f7c551cd6c2ae09e4f74ecb2b1363940a2b2 Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Fri, 17 Jun 2022 17:45:40 +0200
Subject: [PATCH] Fixed padding of merge/rebase buttons when having conflicts

---
 src/main/kotlin/app/ui/UncommitedChanges.kt | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/app/ui/UncommitedChanges.kt b/src/main/kotlin/app/ui/UncommitedChanges.kt
index 9eae885..c73c10c 100644
--- a/src/main/kotlin/app/ui/UncommitedChanges.kt
+++ b/src/main/kotlin/app/ui/UncommitedChanges.kt
@@ -167,8 +167,6 @@ fun UncommitedChanges(
                 .height(192.dp)
                 .fillMaxWidth()
         ) {
-            // Don't show the message TextField when rebasing as it can't be edited
-
             TextField(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -297,7 +295,7 @@ fun MergeButtons(
         AbortButton(
             modifier = Modifier
                 .weight(1f)
-                .padding(start = 8.dp, end = 4.dp),
+                .padding(end = 4.dp),
             onClick = onAbort
         )
 
@@ -305,7 +303,7 @@ fun MergeButtons(
             text = "Merge",
             modifier = Modifier
                 .weight(1f)
-                .padding(start = 8.dp, end = 4.dp),
+                .padding(start = 4.dp),
             enabled = haveConflictsBeenSolved,
             onClick = onMerge,
         )
@@ -326,7 +324,7 @@ fun RebasingButtons(
         AbortButton(
             modifier = Modifier
                 .weight(1f)
-                .padding(start = 8.dp, end = 4.dp),
+                .padding(end = 4.dp),
             onClick = onAbort
         )
 
@@ -335,7 +333,7 @@ fun RebasingButtons(
                 text = "Continue",
                 modifier = Modifier
                     .weight(1f)
-                    .padding(start = 8.dp, end = 4.dp),
+                    .padding(start = 4.dp),
                 enabled = haveConflictsBeenSolved,
                 onClick = onContinue,
             )
@@ -344,7 +342,7 @@ fun RebasingButtons(
                 text = "Skip",
                 modifier = Modifier
                     .weight(1f)
-                    .padding(start = 8.dp, end = 4.dp),
+                    .padding(end = 4.dp),
                 onClick = onSkip,
             )
         }