luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed padding of merge/rebase buttons when having conflicts

Browse source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-17 17:45:40 +02:00
parent 86a7f85e74
commit ca32f7c551
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/kotlin/app/ui/UncommitedChanges.kt
View file

@ -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,
)
}