diff --git a/Ice/Settings/SettingsPanes/AboutSettingsPane.swift b/Ice/Settings/SettingsPanes/AboutSettingsPane.swift index aaef929c..a5d32da1 100644 --- a/Ice/Settings/SettingsPanes/AboutSettingsPane.swift +++ b/Ice/Settings/SettingsPanes/AboutSettingsPane.swift @@ -28,29 +28,33 @@ struct AboutSettingsPane: View { URL(string: "https://github.com/sponsors/jordanbaird")! } + private var minFrameDimension: CGFloat { + min(frame.width, frame.height) + } + var body: some View { HStack { if let nsImage = NSImage(named: NSImage.applicationIconName) { Image(nsImage: nsImage) .resizable() .aspectRatio(contentMode: .fit) - .frame(width: frame.height / 2) + .frame(width: minFrameDimension / 1.5) } VStack(alignment: .leading) { Text("Ice") - .font(.system(size: 64)) + .font(.system(size: minFrameDimension / 7)) .foregroundStyle(.primary) HStack(spacing: 4) { Text("Version") Text(Constants.appVersion) } - .font(.system(size: 16)) + .font(.system(size: minFrameDimension / 30)) .foregroundStyle(.secondary) Text(Constants.copyright) - .font(.system(size: 14)) + .font(.system(size: minFrameDimension / 40)) .foregroundStyle(.tertiary) } .fontWeight(.medium) diff --git a/Ice/Settings/SettingsPanes/MenuBarItemsSettingsPane.swift b/Ice/Settings/SettingsPanes/MenuBarItemsSettingsPane.swift index 7e0d46a2..3f559d7e 100644 --- a/Ice/Settings/SettingsPanes/MenuBarItemsSettingsPane.swift +++ b/Ice/Settings/SettingsPanes/MenuBarItemsSettingsPane.swift @@ -35,7 +35,7 @@ struct MenuBarItemsSettingsPane: View { @ViewBuilder private var layoutBars: some View { - VStack(spacing: 10) { + VStack(spacing: 30) { ForEach(MenuBarSection.Name.allCases, id: \.self) { section in layoutBar(for: section) } @@ -56,9 +56,9 @@ struct MenuBarItemsSettingsPane: View { section.isEnabled { VStack(alignment: .leading, spacing: 2) { - Text(section.name.menuString) + Text(section.name.menuString + " Menu Bar Items") .font(.system(size: 15)) - .padding(.leading, 5) + .padding(.leading, 2.5) LayoutBar(section: section) .environmentObject(appState.imageCache) } diff --git a/Ice/Settings/SettingsView.swift b/Ice/Settings/SettingsView.swift index cb1ccc66..2c1d304a 100644 --- a/Ice/Settings/SettingsView.swift +++ b/Ice/Settings/SettingsView.swift @@ -29,13 +29,13 @@ struct SettingsView: View { Image(.iceCubeStroke) .resizable() .aspectRatio(contentMode: .fit) - .frame(width: 28, height: 28) + .frame(width: 30, height: 30) Text("Ice") - .font(.system(size: 28, weight: .medium)) + .font(.system(size: 30, weight: .medium)) } .foregroundStyle(.primary) - .padding(.bottom, 8) + .padding(.vertical, 8) } .collapsible(false) } @@ -73,7 +73,7 @@ struct SettingsView: View { icon(for: identifier).view .foregroundStyle(.primary) } - .frame(height: 30) + .frame(height: 32) } private func icon(for identifier: SettingsNavigationIdentifier) -> IconResource {