development/github-desktop
development/github-desktop
1
0
Fork 0
mirror of https://github.com/desktop/desktop synced 2024-10-31 11:07:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix styling

Browse source
This commit is contained in:
Sergio Padrino 2023-09-11 13:51:46 +02:00
parent b8c0e59521
commit 44bfc3c1d8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/styles/ui/dialogs/_conflicts.scss
View file

@ -53,8 +53,8 @@ dialog#conflicts-dialog {
.column-left {
display: flex;
flex-flow: column nowrap;
flex-grow: 1;
align-items: start;
max-width: 50%;
padding-right: var(--spacing);
.path-text-component {
@ -76,11 +76,16 @@ dialog#conflicts-dialog {
}
}
.undo-button {
align-self: center;
margin-right: var(--spacing-half);
}
.green-circle:last-child {
margin-left: auto;
margin-top: var(--spacing);
flex-shrink: 0;
flex: 0 1 auto;
align-self: center;
}
}