Merge branch 'dominik/ntp-search-bar' into dominik/ntp-search-bar-shi…

…p-review
duckduckgo · Oct 21, 2024 · b9bd82c · b9bd82c
2 parents d70c72b + f0f60a5
commit b9bd82c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/DuckDuckGo/HomePage/View/FavoritesView.swift b/DuckDuckGo/HomePage/View/FavoritesView.swift
@@ -34,15 +34,15 @@ struct Favorites: View {
     var body: some View {
 
         if #available(macOS 12.0, *) {
-            LazyVStack(spacing: 4) {
+            LazyVStack(spacing: 0) {
                 FavoritesGrid(isHovering: $isHovering)
             }
             .frame(maxWidth: .infinity)
             .onHover { isHovering in
                 self.isHovering = isHovering
             }
         } else {
-            VStack(spacing: 4) {
+            VStack(spacing: 0) {
                 FavoritesGrid(isHovering: $isHovering)
             }
             .frame(maxWidth: .infinity)

diff --git a/DuckDuckGo/HomePage/View/HomePageView.swift b/DuckDuckGo/HomePage/View/HomePageView.swift
@@ -368,7 +368,7 @@ fileprivate extension HomePage.Views.RootView {
                     .visibility(model.isRecentActivityVisible ? .visible : .gone)
             }
             .padding(.vertical, Const.itemSpacing)
-            .frame(height: totalHeight(with: geometry))
+            .frame(width: Self.targetWidth, height: totalHeight(with: geometry))
             .offset(y: -centeredViewVerticalOffset(with: geometry))
 
             VStack(spacing: 0) {
@@ -379,7 +379,7 @@ fileprivate extension HomePage.Views.RootView {
             }
             .frame(width: Self.targetWidth)
         }
-        .frame(width: Self.targetWidth, height: max(geometry.size.height, totalHeight(with: geometry)))
+        .frame(height: max(geometry.size.height, totalHeight(with: geometry)))
         .frame(maxWidth: .infinity)
         .onPreferenceChange(RemoteMessageHeightPreferenceKey.self) { value in
             remoteMessageHeight = value
@@ -423,7 +423,7 @@ fileprivate extension HomePage.Views.RootView {
             height += Const.itemSpacing + continueSetUpCardsTopPadding
         }
         if model.isFavoriteVisible {
-            height += 126 + Const.itemSpacing
+            height += 122 + Const.itemSpacing
         }
         if model.isRecentActivityVisible {
             height += 90 + Const.itemSpacing

diff --git a/DuckDuckGo/HomePage/View/MoreOrLessView.swift b/DuckDuckGo/HomePage/View/MoreOrLessView.swift
@@ -44,6 +44,7 @@ extension HomePage.Views {
                         .foregroundColor((.homePageMoreOrLessText))
                 }.frame(maxWidth: .infinity)
             }
+            .padding(.horizontal, 2)
             .padding(.top, 8)
             .font(.system(size: 11))
             .link {

diff --git a/DuckDuckGo/HomePage/View/RecentlyVisitedView.swift b/DuckDuckGo/HomePage/View/RecentlyVisitedView.swift
@@ -61,6 +61,7 @@ struct RecentlyVisited: View {
             }
             .padding(.vertical, 24)
         }
+        .padding(.horizontal, 2)
         .padding(.bottom, 24)
 
     }