Skip to content

Commit

Permalink
Corrected colors of admin updater
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed Oct 8, 2023
1 parent b8abec2 commit 7a5371d
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
26 changes: 13 additions & 13 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"@esbuild-plugins/node-globals-polyfill": "^0.2.3",
"@fnando/sparkline": "^0.3.10",
"@honkhonk/vite-plugin-svgr": "^1.1.0",
"@iobroker/adapter-react-v5": "^4.5.5",
"@iobroker/adapter-react-v5": "^4.6.2",
"@iobroker/admin-component-easy-access": "^0.3.2",
"@iobroker/socket-client": "^2.3.9",
"@mui/icons-material": "^5.14.11",
"@mui/lab": "^5.0.0-alpha.146",
"@mui/material": "^5.14.11",
"@mui/styles": "^5.14.11",
"@mui/x-data-grid": "^6.15.0",
"@mui/x-date-pickers": "^6.15.0",
"@mui/icons-material": "^5.14.12",
"@mui/lab": "^5.0.0-alpha.147",
"@mui/material": "^5.14.12",
"@mui/styles": "^5.14.12",
"@mui/x-data-grid": "^6.16.1",
"@mui/x-date-pickers": "^6.16.1",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@react-leaflet/core": "^2.1.0",
"@sentry/browser": "^7.72.0",
"@sentry/integrations": "^7.72.0",
"@sentry/browser": "^7.73.0",
"@sentry/integrations": "^7.73.0",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "^14.0.0",
"@testing-library/user-event": "^14.5.1",
Expand All @@ -36,7 +36,7 @@
"date-fns": "^2.30.0",
"echarts": "^5.4.3",
"echarts-for-react": "^3.0.2",
"eslint": "^8.50.0",
"eslint": "^8.51.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-import-resolver-typescript": "^3.6.1",
"eslint-plugin-eqeqeq-fix": "^1.0.3",
Expand All @@ -48,7 +48,7 @@
"ipaddr.js": "^2.1.0",
"json5": "^2.2.3",
"leaflet": "^1.9.4",
"leaflet-geosearch": "^3.9.0",
"leaflet-geosearch": "^3.10.0",
"lodash": "^4.17.21",
"moment": "^2.29.4",
"ol": "^8.1.0",
Expand All @@ -65,7 +65,7 @@
"react-dom": "^18.2.0",
"react-dropzone": "^14.2.3",
"react-icons": "^4.11.0",
"react-inlinesvg": "^4.0.4",
"react-inlinesvg": "^4.0.5",
"react-leaflet": "^4.2.1",
"react-markdown": "^9.0.0",
"react-monaco-editor": "^0.54.0",
Expand Down Expand Up @@ -110,6 +110,6 @@
"devDependencies": {
"@types/crypto-js": "^4.1.2",
"i": "^0.3.7",
"npm": "^10.1.0"
"npm": "^10.2.0"
}
}
2 changes: 0 additions & 2 deletions src/src/dialogs/AdapterInfoDialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ class AdapterInfoDialog extends Component {
text={this.state.text}
language={I18n.getLanguage()}
theme={this.props.theme}
themeName={this.props.themeName}
themeType={this.props.themeType}
mobile={this.props.mobile}
editMode={false}
Expand Down Expand Up @@ -128,7 +127,6 @@ AdapterInfoDialog.propTypes = {
link: PropTypes.string,
t: PropTypes.func,
theme: PropTypes.object,
themeName: PropTypes.string,
themeType: PropTypes.string,
socket: PropTypes.object,
};
Expand Down
6 changes: 3 additions & 3 deletions src/src/dialogs/AdminUpdater.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ class AdminUpdater extends Component {
width: '100%',
height: '100%',
resize: 'none',
background: this.props.themeName === 'dark' ? '#000' : '#fff',
color: this.props.themeName === 'dark' ? '#EEE' : '#111',
background: this.props.themeType === 'dark' ? '#000' : '#fff',
color: this.props.themeType === 'dark' ? '#EEE' : '#111',
boxSizing: 'border-box',
fontFamily:
'Consolas,Monaco,Lucida Console,Liberation Mono,DejaVu Sans Mono,Bitstream Vera Sans Mono,Courier New, monospace',
Expand Down Expand Up @@ -231,7 +231,7 @@ AdminUpdater.propTypes = {
version: PropTypes.string.isRequired,
adminInstance: PropTypes.string.isRequired,
onUpdating: PropTypes.func.isRequired,
themeName: PropTypes.string,
themeType: PropTypes.string,
};

export default AdminUpdater;
2 changes: 1 addition & 1 deletion src/src/tabs/Adapters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,7 @@ class Adapters extends Component {

return <AdminUpdater
socket={this.props.socket}
themeType={this.props.themeType}
host={this.props.host}
onClose={reload =>
this.setState({ showUpdater: false }, () => reload && this.updateAll(true, false))}
Expand Down Expand Up @@ -1835,7 +1836,6 @@ class Adapters extends Component {
return <TabContainer className={this.props.classes.tabContainer}>
<AdapterInfoDialog
theme={this.props.theme}
themeName={this.props.themeName}
themeType={this.props.themeType}
adapter={this.state.dialogProp}
link={adapter.readme || ''}
Expand Down

0 comments on commit 7a5371d

Please sign in to comment.