diff options
| -rw-r--r-- | internal/client/ui/auth/auth.go | 15 | ||||
| -rw-r--r-- | internal/client/ui/choicepopup/choicepopup.go | 4 | ||||
| -rw-r--r-- | test_ed25519akdakd | 8 |
3 files changed, 23 insertions, 4 deletions
diff --git a/internal/client/ui/auth/auth.go b/internal/client/ui/auth/auth.go index 2bfe5be..32fb232 100644 --- a/internal/client/ui/auth/auth.go +++ b/internal/client/ui/auth/auth.go @@ -65,9 +65,18 @@ ___] | |__] | \| | | \|`) return lipgloss.NewStyle().Background(colors.Background).Foreground(colors.White).PaddingLeft(1).Render(" ") } - popupStyle = func() lipgloss.Style { return lipgloss.NewStyle().Border(lipgloss.ThickBorder()) } - choiceSelectedStyle = func() lipgloss.Style { return lipgloss.NewStyle().Padding(0, 1).Margin(0, 1).Background(colors.Blue) } - choiceUnselectedStyle = func() lipgloss.Style { return lipgloss.NewStyle().Padding(0, 1).Margin(0, 1).Background(colors.Gray) } + popupStyle = func() lipgloss.Style { + return lipgloss.NewStyle(). + Background(colors.Background).Foreground(colors.White). + BorderBackground(colors.Background).BorderForeground(colors.White). + Border(lipgloss.ThickBorder()) + } + choiceSelectedStyle = func() lipgloss.Style { + return lipgloss.NewStyle().Padding(0, 1).Margin(0, 1).Background(colors.Blue).MarginBackground(colors.Background) + } + choiceUnselectedStyle = func() lipgloss.Style { + return lipgloss.NewStyle().Padding(0, 1).Margin(0, 1).Background(colors.Gray).MarginBackground(colors.Background) + } centerStyle = lipgloss.NewStyle().Width(authWidth).AlignHorizontal(lipgloss.Center) ) diff --git a/internal/client/ui/choicepopup/choicepopup.go b/internal/client/ui/choicepopup/choicepopup.go index b490693..3377f7a 100644 --- a/internal/client/ui/choicepopup/choicepopup.go +++ b/internal/client/ui/choicepopup/choicepopup.go @@ -60,7 +60,9 @@ func (m Model) View() string { paddingSize := m.Width - leftWidth - rightWidth assert.Assert(paddingSize >= 0, "there should be enough space for all choices", "remaining", paddingSize) - padding := strings.Repeat(" ", paddingSize) + padding := lipgloss.NewStyle(). + Background(m.Style.GetBackground()). + Render(strings.Repeat(" ", paddingSize)) choices := lipgloss.JoinHorizontal(lipgloss.Center, left, padding, right) styledChoices := m.ChoicesStyle.MaxWidth(m.Width).MaxHeight(m.Height).Render(choices) diff --git a/test_ed25519akdakd b/test_ed25519akdakd new file mode 100644 index 0000000..b5fbc25 --- /dev/null +++ b/test_ed25519akdakd @@ -0,0 +1,8 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtz +c2gtZWQyNTUxOQAAACCl5OzY84HiBN86Hkzq36o/VgM4lhJtdkx+3CFZ/mcKkgAA +AJCVyc7BlcnOwQAAAAtzc2gtZWQyNTUxOQAAACCl5OzY84HiBN86Hkzq36o/VgM4 +lhJtdkx+3CFZ/mcKkgAAAED+dSpyj/DtaBNJeU0jYkxPxRaM+SfIGc+4JjmWSbX0 +RaXk7NjzgeIE3zoeTOrfqj9WAziWEm12TH7cIVn+ZwqSAAAABmFka2FkawECAwQF +Bgc= +-----END OPENSSH PRIVATE KEY----- |