mirror of
https://github.com/streetwriters/notesnook.git
synced 2025-12-23 15:09:33 +01:00
fix ui of merge editor in dark mode
This commit is contained in:
@@ -317,7 +317,7 @@ const MergeEditor = () => {
|
|||||||
visible={true}>
|
visible={true}>
|
||||||
<SafeAreaView
|
<SafeAreaView
|
||||||
style={{
|
style={{
|
||||||
backgroundColor: colors.nav,
|
backgroundColor: colors.bg,
|
||||||
paddingTop: insets.top,
|
paddingTop: insets.top,
|
||||||
}}>
|
}}>
|
||||||
<KeepAwake />
|
<KeepAwake />
|
||||||
@@ -371,6 +371,7 @@ const MergeEditor = () => {
|
|||||||
}}
|
}}
|
||||||
onPress={close}
|
onPress={close}
|
||||||
size={SIZE.xxl}
|
size={SIZE.xxl}
|
||||||
|
color={colors.pri}
|
||||||
name="arrow-left"
|
name="arrow-left"
|
||||||
/>
|
/>
|
||||||
<TouchableOpacity
|
<TouchableOpacity
|
||||||
@@ -411,6 +412,7 @@ const MergeEditor = () => {
|
|||||||
<Icon
|
<Icon
|
||||||
size={SIZE.lg}
|
size={SIZE.lg}
|
||||||
name={primary ? 'chevron-up' : 'chevron-down'}
|
name={primary ? 'chevron-up' : 'chevron-down'}
|
||||||
|
color={colors.pri}
|
||||||
/>
|
/>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -463,6 +465,7 @@ const MergeEditor = () => {
|
|||||||
<Animated.View
|
<Animated.View
|
||||||
style={{
|
style={{
|
||||||
height: firstWebViewHeight,
|
height: firstWebViewHeight,
|
||||||
|
backgroundColor:colors.bg
|
||||||
}}>
|
}}>
|
||||||
<WebView
|
<WebView
|
||||||
onLoad={onPrimaryWebViewLoad}
|
onLoad={onPrimaryWebViewLoad}
|
||||||
@@ -470,6 +473,7 @@ const MergeEditor = () => {
|
|||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: '100%',
|
height: '100%',
|
||||||
|
backgroundColor:'transparent'
|
||||||
}}
|
}}
|
||||||
injectedJavaScript={Platform.OS === 'ios' ? injectedJS : null}
|
injectedJavaScript={Platform.OS === 'ios' ? injectedJS : null}
|
||||||
onShouldStartLoadWithRequest={_onShouldStartLoadWithRequest}
|
onShouldStartLoadWithRequest={_onShouldStartLoadWithRequest}
|
||||||
@@ -552,6 +556,7 @@ const MergeEditor = () => {
|
|||||||
<Icon
|
<Icon
|
||||||
size={SIZE.lg}
|
size={SIZE.lg}
|
||||||
name={secondary ? 'chevron-up' : 'chevron-down'}
|
name={secondary ? 'chevron-up' : 'chevron-down'}
|
||||||
|
color={colors.pri}
|
||||||
/>
|
/>
|
||||||
</TouchableOpacity>
|
</TouchableOpacity>
|
||||||
</View>
|
</View>
|
||||||
@@ -611,6 +616,7 @@ const MergeEditor = () => {
|
|||||||
style={{
|
style={{
|
||||||
width: '100%',
|
width: '100%',
|
||||||
height: '100%',
|
height: '100%',
|
||||||
|
backgroundColor:'transparent'
|
||||||
}}
|
}}
|
||||||
injectedJavaScript={Platform.OS === 'ios' ? injectedJS : null}
|
injectedJavaScript={Platform.OS === 'ios' ? injectedJS : null}
|
||||||
onShouldStartLoadWithRequest={_onShouldStartLoadWithRequest}
|
onShouldStartLoadWithRequest={_onShouldStartLoadWithRequest}
|
||||||
|
|||||||
Reference in New Issue
Block a user