Change summary
ui/styles/styles.go | 12 +++++++-----
ui/ui.go | 14 ++++----------
2 files changed, 11 insertions(+), 15 deletions(-)
Detailed changes
@@ -12,8 +12,8 @@ type Styles struct {
ActiveBorderColor lipgloss.Color
InactiveBorderColor lipgloss.Color
- App lipgloss.Style
- Header lipgloss.Style
+ App lipgloss.Style
+ ServerName lipgloss.Style
Menu lipgloss.Style
MenuCursor lipgloss.Style
@@ -135,11 +135,13 @@ func DefaultStyles() *Styles {
s.App = lipgloss.NewStyle().
Margin(1, 2)
- s.Header = lipgloss.NewStyle().
- Align(lipgloss.Left).
+ s.ServerName = lipgloss.NewStyle().
Height(1).
- PaddingLeft(1).
+ MarginLeft(1).
MarginBottom(1).
+ Padding(0, 1).
+ Background(lipgloss.Color("57")).
+ Foreground(lipgloss.Color("229")).
Bold(true)
s.Menu = lipgloss.NewStyle().
@@ -73,8 +73,8 @@ func (ui *UI) getMargins() (wm, hm int) {
style := ui.common.Styles.App.Copy()
switch ui.activePage {
case selectionPage:
- hm += ui.common.Styles.Header.GetHeight() +
- ui.common.Styles.Header.GetVerticalFrameSize()
+ hm += ui.common.Styles.ServerName.GetHeight() +
+ ui.common.Styles.ServerName.GetVerticalFrameSize()
case repoPage:
}
wm += style.GetHorizontalFrameSize()
@@ -261,16 +261,10 @@ func (ui *UI) View() string {
view = "Unknown state :/ this is a bug!"
}
if ui.activePage == selectionPage {
- view = lipgloss.JoinVertical(lipgloss.Bottom,
- ui.header.View(),
- view,
- )
+ view = lipgloss.JoinVertical(lipgloss.Left, ui.header.View(), view)
}
if ui.showFooter {
- view = lipgloss.JoinVertical(lipgloss.Bottom,
- view,
- ui.footer.View(),
- )
+ view = lipgloss.JoinVertical(lipgloss.Left, view, ui.footer.View())
}
return style.Render(view)
}