fixes
This commit is contained in:
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
import {Dimensions, StyleProp, StyleSheet, TextStyle} from 'react-native'
|
import {Dimensions, StyleProp, StyleSheet, TextStyle} from 'react-native'
|
||||||
import {Theme, TypographyVariant} from './ThemeContext'
|
import {Theme, TypographyVariant} from './ThemeContext'
|
||||||
import {isMobileWeb} from 'platform/detection'
|
import {isWeb} from 'platform/detection'
|
||||||
|
|
||||||
// 1 is lightest, 2 is light, 3 is mid, 4 is dark, 5 is darkest
|
// 1 is lightest, 2 is light, 3 is mid, 4 is dark, 5 is darkest
|
||||||
export const colors = {
|
export const colors = {
|
||||||
@@ -175,7 +175,7 @@ export const s = StyleSheet.create({
|
|||||||
// dimensions
|
// dimensions
|
||||||
w100pct: {width: '100%'},
|
w100pct: {width: '100%'},
|
||||||
h100pct: {height: '100%'},
|
h100pct: {height: '100%'},
|
||||||
hContentRegion: isMobileWeb ? {flex: 1} : {height: '100%'},
|
hContentRegion: isWeb ? {minHeight: '100%'} : {height: '100%'},
|
||||||
window: {
|
window: {
|
||||||
width: Dimensions.get('window').width,
|
width: Dimensions.get('window').width,
|
||||||
height: Dimensions.get('window').height,
|
height: Dimensions.get('window').height,
|
||||||
|
|||||||
@@ -210,18 +210,9 @@ function useHeaderOffset() {
|
|||||||
const {isDesktop, isTablet} = useWebMediaQueries()
|
const {isDesktop, isTablet} = useWebMediaQueries()
|
||||||
const {fontScale} = useWindowDimensions()
|
const {fontScale} = useWindowDimensions()
|
||||||
const {hasSession} = useSession()
|
const {hasSession} = useSession()
|
||||||
|
if (isDesktop || isTablet) {
|
||||||
if (isDesktop) {
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
if (isTablet) {
|
|
||||||
if (hasSession) {
|
|
||||||
return 50
|
|
||||||
} else {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasSession) {
|
if (hasSession) {
|
||||||
const navBarPad = 16
|
const navBarPad = 16
|
||||||
const navBarText = 21 * fontScale
|
const navBarText = 21 * fontScale
|
||||||
|
|||||||
@@ -135,7 +135,7 @@ function FeedsTabBarTablet(
|
|||||||
const styles = StyleSheet.create({
|
const styles = StyleSheet.create({
|
||||||
tabBar: {
|
tabBar: {
|
||||||
// @ts-ignore Web only
|
// @ts-ignore Web only
|
||||||
position: 'fixed',
|
position: 'sticky',
|
||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
// @ts-ignore Web only -prf
|
// @ts-ignore Web only -prf
|
||||||
left: 'calc(50% - 300px)',
|
left: 'calc(50% - 300px)',
|
||||||
|
|||||||
Reference in New Issue
Block a user