Skip to content

Commit

Permalink
Improve sidebar toolbar design
Browse files Browse the repository at this point in the history
  • Loading branch information
david-swift committed Jul 17, 2023
1 parent 429ed84 commit e850c11
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/lukepistrol/SwiftLintPlugin", from: "0.2.2"),
.package(url: "https://github.com/david-swift/ColibriComponents-macOS", from: "0.1.8")
.package(url: "https://github.com/david-swift/ColibriComponents-macOS", from: "0.1.9")
],
targets: [
.target(
Expand Down
3 changes: 3 additions & 0 deletions Sources/SettingsKit/Model/Data/SettingsTab.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public struct SettingsTab: Identifiable, View {
private var sidebar: some View {
VStack {
sidebarList
.overlay(alignment: .bottom) {
Divider()
}
if !sidebarActions.isEmpty {
sidebarActions
.padding(.bottom, .actionsPadding)
Expand Down
2 changes: 1 addition & 1 deletion Sources/SettingsKit/Model/Extensions/CGFloat.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extension CGFloat {
/// The height of a custom toolbar.
internal static var customToolbarHeight: Self { 40 }
/// The padding of the actions in the sidebar.
internal static var actionsPadding: Self { 10 }
internal static var actionsPadding: Self { 15 }

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,26 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/david-swift/ColibriComponents-macOS",
"state" : {
"revision" : "decdef77939275f710df3e3fc02f5dfdd219c5fb",
"version" : "0.1.8"
"revision" : "79d40222f1d219a1417b9e03a0f08f1b61fa467a",
"version" : "0.1.9"
}
},
{
"identity" : "sfsafesymbols",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SFSafeSymbols/SFSafeSymbols",
"state" : {
"revision" : "2bcd249b49178247e6b52bac7d67d6e338a40cee",
"version" : "4.1.0"
"revision" : "7cca2d60925876b5953a2cf7341cd80fbeac983c",
"version" : "4.1.1"
}
},
{
"identity" : "swiftlintplugin",
"kind" : "remoteSourceControl",
"location" : "https://github.com/lukepistrol/SwiftLintPlugin",
"state" : {
"revision" : "f69b412a765396d44dc9f4788a5b79919c1ca9e3",
"version" : "0.2.2"
"revision" : "b1090ecd269dddd96bda0df24ca3f1aa78f33578",
"version" : "0.52.4"
}
}
],
Expand Down

0 comments on commit e850c11

Please sign in to comment.