git.iko.soy/crush
on main help sign in
fix: address double vertical margins between sections
f27f546Andrey Nering
internal/ui/dialog/oauth.go+8−3
compare with main
unifiedsplit
@@ -240,7 +240,7 @@ func (m *OAuth) innerDialogContent() string {
240
240
241 case OAuthStateDisplay:
241 case OAuthStateDisplay:
242 instructions := lipgloss.NewStyle().
242 instructions := lipgloss.NewStyle().
243− Margin(1).
243+ Margin(0, 1).
244 Width(m.width - 2).
244 Width(m.width - 2).
245 Render(
245 Render(
246 whiteStyle.Render("Press ") +
246 whiteStyle.Render("Press ") +
@@ -253,7 +253,7 @@ func (m *OAuth) innerDialogContent() string {
253 Height(7).
253 Height(7).
254 Align(lipgloss.Center, lipgloss.Center).
254 Align(lipgloss.Center, lipgloss.Center).
255 Background(t.BgBaseLighter).
255 Background(t.BgBaseLighter).
256− Margin(1).
256+ Margin(0, 1).
257 Render(
257 Render(
258 lipgloss.NewStyle().
258 lipgloss.NewStyle().
259 Bold(true).
259 Bold(true).
@@ -268,7 +268,7 @@ func (m *OAuth) innerDialogContent() string {
268 Render("Browser not opening? Refer to\n" + link)
268 Render("Browser not opening? Refer to\n" + link)
269
269
270 waiting := lipgloss.NewStyle().
270 waiting := lipgloss.NewStyle().
271− Margin(1, 1).
271+ Margin(0, 1).
272 Width(m.width - 2).
272 Width(m.width - 2).
273 Render(
273 Render(
274 greenStyle.Render(m.spinner.View()) + mutedStyle.Render("Verifying..."),
274 greenStyle.Render(m.spinner.View()) + mutedStyle.Render("Verifying..."),
@@ -276,10 +276,15 @@ func (m *OAuth) innerDialogContent() string {
276
276
277 return lipgloss.JoinVertical(
277 return lipgloss.JoinVertical(
278 lipgloss.Left,
278 lipgloss.Left,
279+ "",
279 instructions,
280 instructions,
281+ "",
280 codeBox,
282 codeBox,
283+ "",
281 url,
284 url,
285+ "",
282 waiting,
286 waiting,
287+ "",
283 )
288 )
284
289
285 case OAuthStateSuccess:
290 case OAuthStateSuccess: