Diff
1diff --git a/cmd/soft/browse/browse.go b/cmd/soft/browse/browse.go
2index c13fe10abeda6dca8810354653c7e04da1b522cf..eebf28893885e9844dccd6787f03e613c67e8ffd 100644
3--- a/cmd/soft/browse/browse.go
4+++ b/cmd/soft/browse/browse.go
5@@ -230,7 +230,7 @@ func (m *model) View() string {
6 }
7
8 if m.showFooter {
9- view = lipgloss.JoinVertical(lipgloss.Top, view, m.footer.View())
10+ view = lipgloss.JoinVertical(lipgloss.Left, view, m.footer.View())
11 }
12
13 return m.common.Zone.Scan(style.Render(view))
14diff --git a/pkg/ssh/ui.go b/pkg/ssh/ui.go
15index 9f16f5591edc291c34612a1d640abfefdab39db2..31f6a259cc2e677ac6b90ca2667c5ffee105cde4 100644
16--- a/pkg/ssh/ui.go
17+++ b/pkg/ssh/ui.go
18@@ -285,10 +285,10 @@ func (ui *UI) View() string {
19 view = "Unknown state :/ this is a bug!"
20 }
21 if ui.activePage == selectionPage {
22- view = lipgloss.JoinVertical(lipgloss.Top, ui.header.View(), view)
23+ view = lipgloss.JoinVertical(lipgloss.Left, ui.header.View(), view)
24 }
25 if ui.showFooter {
26- view = lipgloss.JoinVertical(lipgloss.Top, view, ui.footer.View())
27+ view = lipgloss.JoinVertical(lipgloss.Left, view, ui.footer.View())
28 }
29 return ui.common.Zone.Scan(
30 ui.common.Styles.App.Render(view),
31diff --git a/pkg/ui/components/code/code.go b/pkg/ui/components/code/code.go
32index 7b0e3e9e72c1570eaaa266c8efe4feedef95f988..af7697260fc7d327f1791ded0ab84f69f8c86c72 100644
33--- a/pkg/ui/components/code/code.go
34+++ b/pkg/ui/components/code/code.go
35@@ -114,7 +114,7 @@ func (r *Code) Init() tea.Cmd {
36 for i, l := range lines {
37 lines[i] = common.TruncateString(l, sideNoteWidth)
38 }
39- content = lipgloss.JoinHorizontal(lipgloss.Left, strings.Join(lines, "\n"), content)
40+ content = lipgloss.JoinHorizontal(lipgloss.Top, strings.Join(lines, "\n"), content)
41 }
42
43 // Fix styles after hard wrapping
44diff --git a/pkg/ui/pages/repo/log.go b/pkg/ui/pages/repo/log.go
45index fd1850e1c5eaabe3c6c680992db95a7aaf432e56..8de8aa78d07c45ecc49529487d2729e089240813 100644
46--- a/pkg/ui/pages/repo/log.go
47+++ b/pkg/ui/pages/repo/log.go
48@@ -276,7 +276,7 @@ func (l *Log) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
49 case LogDiffMsg:
50 l.currentDiff = msg
51 l.vp.SetContent(
52- lipgloss.JoinVertical(lipgloss.Top,
53+ lipgloss.JoinVertical(lipgloss.Left,
54 l.renderCommit(l.selectedCommit),
55 renderSummary(msg, l.common.Styles, l.common.Width),
56 renderDiff(msg, l.common.Width),
57@@ -290,7 +290,7 @@ func (l *Log) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
58 l.SetSize(msg.Width, msg.Height)
59 if l.selectedCommit != nil && l.currentDiff != nil {
60 l.vp.SetContent(
61- lipgloss.JoinVertical(lipgloss.Top,
62+ lipgloss.JoinVertical(lipgloss.Left,
63 l.renderCommit(l.selectedCommit),
64 renderSummary(l.currentDiff, l.common.Styles, l.common.Width),
65 renderDiff(l.currentDiff, l.common.Width),
66diff --git a/pkg/ui/pages/repo/logitem.go b/pkg/ui/pages/repo/logitem.go
67index ec315ad76c2b77f141f18aa32b5c815c283de9cd..ecdc4f1878c46ad9bc3869b81c69978571b5e3b6 100644
68--- a/pkg/ui/pages/repo/logitem.go
69+++ b/pkg/ui/pages/repo/logitem.go
70@@ -134,7 +134,7 @@ func (d LogItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l
71 d.common.Zone.Mark(
72 i.ID(),
73 styles.Base.Render(
74- lipgloss.JoinVertical(lipgloss.Top,
75+ lipgloss.JoinVertical(lipgloss.Left,
76 truncate.String(fmt.Sprintf("%s%s",
77 title,
78 hash,
79diff --git a/pkg/ui/pages/repo/refsitem.go b/pkg/ui/pages/repo/refsitem.go
80index f96866d3da3c316e96289d70b36a41831d106ede..7d109de0c277251d6798b1a6aac8cfdfed082bc3 100644
81--- a/pkg/ui/pages/repo/refsitem.go
82+++ b/pkg/ui/pages/repo/refsitem.go
83@@ -195,7 +195,7 @@ func (d RefItemDelegate) Render(w io.Writer, m list.Model, index int, listItem l
84 d.common.Zone.Mark(
85 i.ID(),
86 st.Base.Render(
87- lipgloss.JoinHorizontal(lipgloss.Left,
88+ lipgloss.JoinHorizontal(lipgloss.Top,
89 truncate.String(selector+ref+desc+hash,
90 uint(m.Width()-horizontalFrameSize)),
91 ),
92diff --git a/pkg/ui/pages/repo/repo.go b/pkg/ui/pages/repo/repo.go
93index 97e1cf83c2e921c769b6a6e6a6e70e37be7c42fe..1f3263287de85373737261ae4672bae70ffbab24 100644
94--- a/pkg/ui/pages/repo/repo.go
95+++ b/pkg/ui/pages/repo/repo.go
96@@ -313,7 +313,7 @@ func (r *Repo) View() string {
97 "repo-main",
98 mainStyle.Render(main),
99 )
100- view := lipgloss.JoinVertical(lipgloss.Top,
101+ view := lipgloss.JoinVertical(lipgloss.Left,
102 r.headerView(),
103 r.tabs.View(),
104 main,
105@@ -334,7 +334,7 @@ func (r *Repo) headerView() string {
106 header = r.common.Styles.Repo.HeaderName.Render(header)
107 desc := strings.TrimSpace(r.selectedRepo.Description())
108 if desc != "" {
109- header = lipgloss.JoinVertical(lipgloss.Top,
110+ header = lipgloss.JoinVertical(lipgloss.Left,
111 header,
112 r.common.Styles.Repo.HeaderDesc.Render(desc),
113 )
114@@ -352,7 +352,7 @@ func (r *Repo) headerView() string {
115 urlStyle.Render(url),
116 )
117
118- header = lipgloss.JoinHorizontal(lipgloss.Left, header, url)
119+ header = lipgloss.JoinHorizontal(lipgloss.Top, header, url)
120
121 style := r.common.Styles.Repo.Header.Width(r.common.Width)
122 return style.Render(
123diff --git a/pkg/ui/pages/repo/stash.go b/pkg/ui/pages/repo/stash.go
124index 37f534a29b1afbac55f6400750a2bf6e902f1eed..667026b7baebc1556a3572049b6a4fb24b40e80a 100644
125--- a/pkg/ui/pages/repo/stash.go
126+++ b/pkg/ui/pages/repo/stash.go
127@@ -197,7 +197,7 @@ func (s *Stash) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
128 s.currentPatch = msg
129 if msg.Diff != nil {
130 title := s.common.Styles.Stash.Title.Render(s.list.SelectedItem().(StashItem).Title())
131- content := lipgloss.JoinVertical(lipgloss.Top,
132+ content := lipgloss.JoinVertical(lipgloss.Left,
133 title,
134 "",
135 renderSummary(msg.Diff, s.common.Styles, s.common.Width),