Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gitrelay/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ struct ContentView: View {
private var sidebarColumn: some View {
MainSidebarView(selection: $sidebarSelection)
.gitRelaySidebarColumnWidth(ideal: appVM.windowLayout.sidebarWidth)
.frame(maxHeight: .infinity, alignment: .topLeading)
.gitRelayChrome(.sidebar)
.background {
GeometryReader { proxy in
Color.clear
Expand Down
9 changes: 8 additions & 1 deletion gitrelay/Views/Repositories/RepoPairTableView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,20 @@ struct RepoPairTableView: View {
}
.padding(.horizontal, DesignTokens.Spacing.sm)
.frame(width: 260, height: DesignTokens.Size.searchFieldMinHeight)
.background(DesignTokens.Surface.searchFieldFill)
.background(DesignTokens.Surface.suggestionFill)
.clipShape(
RoundedRectangle(
cornerRadius: DesignTokens.CornerRadius.control,
style: .continuous
)
)
.overlay {
RoundedRectangle(
cornerRadius: DesignTokens.CornerRadius.control,
style: .continuous
)
.strokeBorder(DesignTokens.Surface.separator, lineWidth: 1)
}
}

private var addButton: some View {
Expand Down
3 changes: 3 additions & 0 deletions gitrelay/Views/Sidebar/MainSidebarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ struct MainSidebarView: View {
}
}
.listStyle(.sidebar)
.scrollContentBackground(.hidden)
.frame(maxWidth: .infinity, maxHeight: .infinity)

SidebarFooterView(
summary: appVM.sidebarFooterSummary,
onTogglePause: { appVM.toggleScheduledSyncPause() }
)
}
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
}

/// `List` selection is optional; the pane always has a destination, so a nil
Expand Down
Loading