Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Label formatting across devices match better

Browse Source
This commit is contained in:
Jackson Harper
2023-07-12 12:35:09 +08:00
parent 120fc6ea12
commit dacb4ee354
5 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/Omnivore/app/src/main/assets/bundle.js
View File

File diff suppressed because one or more lines are too long

13
apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift
View File

@ -438,10 +438,6 @@ struct AnimatingCellHeight: AnimatableModifier {
.background(Color.isDarkMode ? Color(hex: "#2A2A2A") : Color.systemBackground)
.frame(height: 190)
if Color.isDarkMode {
Color(hex: "#3D3D3D").frame(maxWidth: .infinity, maxHeight: 0.5)
}
if !Color.isDarkMode {
VStack {
LinearGradient(gradient: Gradient(colors: [.black.opacity(0.06), .systemGray6]),
@ -452,6 +448,13 @@ struct AnimatingCellHeight: AnimatableModifier {
}
.background(Color.systemGray6)
.frame(maxWidth: .infinity)
} else {
VStack {
Color(hex: "#3D3D3D").frame(maxWidth: .infinity, maxHeight: 0.5)
Spacer()
}
.background(Color.systemBackground)
.frame(maxWidth: .infinity)
}
}
}
@ -479,7 +482,7 @@ struct AnimatingCellHeight: AnimatableModifier {
featureCard
.listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0))
.listRowSeparator(.hidden, edges: .all)
.modifier(AnimatingCellHeight(height: 190 + (Color.isDarkMode ? 1 : 13)))
.modifier(AnimatingCellHeight(height: 190 + (Color.isDarkMode ? 13 : 13)))
}
ForEach(viewModel.items) { item in

2
apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift
View File

@ -36,7 +36,7 @@ public struct LibraryItemCard: View {
labels
}
}
.padding(.bottom, 0)
.padding(.bottom, 5)
.draggableItem(item: item)
}

2
apple/OmnivoreKit/Sources/Views/Resources/bundle.js
View File

File diff suppressed because one or more lines are too long

4
packages/web/components/elements/LabelChip.tsx
View File

@ -17,7 +17,7 @@ export function LabelChip(props: LabelChipProps): JSX.Element {
const isDark = isDarkTheme()
const selectedBorder = isDark ? '#FFEA9F' : 'black'
const unSelectedBorder = isDark ? '#6A6968' : '#D9D9D9'
const unSelectedBorder = isDark ? '#2A2A2A' : '#D9D9D9'
return (
<SpanBox
@ -27,7 +27,7 @@ export function LabelChip(props: LabelChipProps): JSX.Element {
fontSize: '11px',
fontWeight: '500',
fontFamily: '$inter',
padding: '1px 7px',
padding: '3px 8px',
whiteSpace: 'nowrap',
cursor: 'pointer',
backgroundClip: 'padding-box',