1
0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-27 23:28:38 +02:00

Desktop: UI update (#3586)

This commit is contained in:
Laurent
2020-09-15 14:01:07 +01:00
committed by GitHub
parent bdedf69439
commit 056285deda
138 changed files with 4620 additions and 2308 deletions

View File

@ -1,6 +1,6 @@
import * as React from 'react';
import { View, Text, ScrollView } from 'react-native';
import useSyncTargetUpgrade from 'lib/services/synchronizer/gui/useSyncTargetUpgrade';
const { View, Text, ScrollView } = require('react-native');
const { connect } = require('react-redux');
const { themeStyle } = require('lib/components/global-style.js');
@ -10,7 +10,7 @@ const { _ } = require('lib/locale.js');
function UpgradeSyncTargetScreen(props:any) {
const upgradeResult = useSyncTargetUpgrade();
const theme = themeStyle(props.theme);
const theme = themeStyle(props.themeId);
const lineStyle = { ...theme.normalText, marginBottom: 20 };
const stackTraceStyle = { ...theme.normalText, flexWrap: 'nowrap', fontSize: theme.fontSize * 0.5, color: theme.colorFaded };
@ -67,6 +67,6 @@ function UpgradeSyncTargetScreen(props:any) {
export default connect((state:any) => {
return {
theme: state.settings.theme,
themeId: state.settings.theme,
};
})(UpgradeSyncTargetScreen);