diff --git a/package.json b/package.json index 9c29dba..7c740d5 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,8 @@ "font-awesome": "^4.7.0", "node-schedule": "^1.3.2", "randomstring": "^1.1.5", - "react": "^16.9.0", - "react-dom": "^16.9.0", + "react": "^16.10.0", + "react-dom": "^16.10.0", "react-loader-spinner": "^2.3.0", "react-redux": "^7.1.1", "react-scripts": "2.1.8", diff --git a/public/electron.js b/public/electron.js index 7d63e37..7c27f5d 100644 --- a/public/electron.js +++ b/public/electron.js @@ -77,9 +77,9 @@ const createWindow = () => { } // Create the browser window. - const height = (process.env.ELECTRON_START_URL || (os.platform() === 'darwin') ? 294 : 274) + 30 - ((os.platform() === 'win32') ? 0 : 20); + const height = (process.env.ELECTRON_START_URL || (os.platform() === 'darwin') ? 284 : 274) + ((os.platform() === 'win32') ? 30 : -20); mainWindow = new BrowserWindow({ - width: 468 + ((os.platform() === 'win32') ? 0 : (os.platform() === 'darwin') ? 150 : 160), + width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160), height: height, fullscreen: false, resizable: false, diff --git a/src/components/MountItem/MountItem.js b/src/components/MountItem/MountItem.js index 480ff72..7beb852 100644 --- a/src/components/MountItem/MountItem.js +++ b/src/components/MountItem/MountItem.js @@ -72,7 +72,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => { selected={props.MState.DriveLetters.indexOf(props.PState.MountLocation)}/>; } else { - inputColumnSpan = 58; + inputColumnSpan = 64; inputControls = []; let key = 0; inputControls.push(( diff --git a/src/containers/MountItems/MountItems.css b/src/containers/MountItems/MountItems.css index f09dd95..049c28b 100644 --- a/src/containers/MountItems/MountItems.css +++ b/src/containers/MountItems/MountItems.css @@ -1,4 +1,13 @@ .MountItems { + padding: 0; + margin: 0; + height: 121px; + width: 100%; + box-sizing: border-box; + overflow: hidden; +} + +.MountItemsRemote { padding: 0; margin: 0; height: 161px; diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js index 7cfbff5..5e63e72 100644 --- a/src/containers/MountItems/MountItems.js +++ b/src/containers/MountItems/MountItems.js @@ -331,7 +331,7 @@ class MountItems extends IPCContainer { } return ( -
+
{retryDisplay} {items}
);