From 300cae68002843c3f5c38dd88d266f32e207512e Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 17 Dec 2022 17:01:54 -0800 Subject: [PATCH] Revert "ui: Add more padding everywhere." This reverts commit 36107a2752a11ada655a1a358aba1da729c08429. --- damus/ContentView.swift | 1 - damus/Views/EventView.swift | 3 +-- damus/Views/PostButton.swift | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/damus/ContentView.swift b/damus/ContentView.swift index 70e62283..4d33c741 100644 --- a/damus/ContentView.swift +++ b/damus/ContentView.swift @@ -180,7 +180,6 @@ struct ContentView: View { if let damus = self.damus_state { NavigationView { MainContent(damus: damus) - .padding([.leading, .trailing]) .toolbar { ToolbarItem(placement: .navigationBarLeading) { let profile_model = ProfileModel(pubkey: damus_state!.pubkey, damus: damus_state!) diff --git a/damus/Views/EventView.swift b/damus/Views/EventView.swift index a00795e1..e16eaf14 100644 --- a/damus/Views/EventView.swift +++ b/damus/Views/EventView.swift @@ -94,10 +94,8 @@ struct EventView: View { .buttonStyle(PlainButtonStyle()) TextEvent(inner_ev, pubkey: inner_ev.pubkey) } - .padding([.top], 2) } else { TextEvent(event, pubkey: pubkey) - .padding([.top], 6) } } } @@ -148,6 +146,7 @@ struct EventView: View { .background(event_validity_color(event.validity)) .id(event.id) .frame(maxWidth: .infinity, minHeight: PFP_SIZE) + .padding([.bottom], 4) .event_context_menu(event, privkey: damus.keypair.privkey) } } diff --git a/damus/Views/PostButton.swift b/damus/Views/PostButton.swift index 92ca033d..866faa30 100644 --- a/damus/Views/PostButton.swift +++ b/damus/Views/PostButton.swift @@ -18,7 +18,7 @@ func PostButton(action: @escaping () -> ()) -> some View { }) .background(Color.blue) .cornerRadius(38.5) - .padding(.bottom) + .padding() .shadow(color: Color.black.opacity(0.3), radius: 3, x: 3,