diff --git a/public/electron.js b/public/electron.js index 95013f2..9f945e9 100644 --- a/public/electron.js +++ b/public/electron.js @@ -35,7 +35,7 @@ const SystemIPC = require('../src/renderer/ipc/SystemIPC'); const UpgradeIPC = require('../src/renderer/ipc/UpgradeIPC'); const dimensions = { - height: ((os.platform() === 'darwin') ? 294 : 274) + ((os.platform() === 'win32') ? 30 : -20), + height: ((os.platform() === 'darwin') ? 316 : 296) + ((os.platform() === 'win32') ? 30 : -20), width: 428 + ((os.platform() === 'win32') ? 40 : (os.platform() === 'darwin') ? 150 : 160), }; diff --git a/src/App.css b/src/App.css index 895aeba..7a911af 100644 --- a/src/App.css +++ b/src/App.css @@ -1,18 +1,14 @@ .App { - display: flex; - flex-direction: column; margin: 0; - padding: 10px; + padding: 8px; box-sizing: border-box; height: 100vh; width: 100vw; - background-image: url('./assets/images/background.jpg'); + background-image: url('./assets/images/background2.jpg'); background-size: cover; } .AppContainer { - display: flex; - flex-direction: column; width: 100%; height: 100%; box-sizing: border-box; @@ -25,6 +21,5 @@ } .AppContent { - flex: 1; box-sizing: border-box; } \ No newline at end of file diff --git a/src/App.js b/src/App.js index 260e46d..5e1df02 100644 --- a/src/App.js +++ b/src/App.js @@ -133,24 +133,30 @@ class App extends IPCContainer { let mainContent = []; if (this.props.DisplaySelectAppPlatform || !this.props.AppReady) { - mainContent = + mainContent = ( + + + ); } else { let key = 0; mainContent.push(( -
+ -
+ )); - + mainContent.push(
); if (allowMount) { mainContent.push(( + + )); } } @@ -179,9 +185,7 @@ class App extends IPCContainer {
- - {mainContent} - + {mainContent}
{selectAppPlatformDisplay} diff --git a/src/assets/images/background2.jpg b/src/assets/images/background2.jpg new file mode 100644 index 0000000..c900303 Binary files /dev/null and b/src/assets/images/background2.jpg differ diff --git a/src/containers/MountItems/MountItems.js b/src/containers/MountItems/MountItems.js index ad56158..97eca1f 100644 --- a/src/containers/MountItems/MountItems.js +++ b/src/containers/MountItems/MountItems.js @@ -311,8 +311,6 @@ class MountItems extends IPCContainer { let headerItems = []; if (this.props.remoteSupported) { headerItems.push(); - headerItems.push(
) } let items = []; @@ -327,7 +325,7 @@ class MountItems extends IPCContainer { provider={provider}/> )); items.push(
) + style={{paddingTop: '8px'}} />) } if (this.props.remoteSupported) { @@ -343,7 +341,7 @@ class MountItems extends IPCContainer { remote/> )); items.push(
) + style={{paddingTop: '8px'}}/>) } if (this.props.RemoteMounts.length > 0) { items.splice(items.length - 1, 1); @@ -353,12 +351,13 @@ class MountItems extends IPCContainer { } return ( -
+
{retryDisplay} - {headerItems}
{items}
+
+ {headerItems}
); } } diff --git a/src/index.css b/src/index.css index 434cd36..b5bace5 100644 --- a/src/index.css +++ b/src/index.css @@ -1,17 +1,17 @@ :root { --border_radius: 4px; - --control_background: rgba(125, 145, 200, .15); - --control_background_hover: rgba(125, 145, 200, .30); - --control_border: 1px solid rgba(70, 70, 70, 0.9); - --control_box_shadow: 1px 1px 1px black; - --control_transparent_background: rgba(30, 30, 50, 0.3); - --control_dark_transparent_background: rgba(10, 10, 20, 0.8); + --control_background: rgba(105, 105, 150, .2); + --control_background_hover: rgba(105, 105, 150, .3); + --control_border: 1px solid rgba(80, 80, 90, 0.9); + --control_box_shadow: 2px 2px 2px black; + --control_transparent_background: rgba(10, 10, 16, 0.5); + --control_dark_transparent_background: rgba(10, 10, 16, 0.7); - --text_color: rgba(200, 205, 225, 0.8); - --text_color_hover: rgba(200, 205, 225, 0.9); - --text_color_error: rgba(203, 120, 120, 0.8); - --heading_text_color: rgba(146, 175, 220, 0.7); + --text_color: rgba(200, 200, 240, 0.6); + --text_color_hover: rgba(200, 200, 225, 0.6); + --text_color_error: rgba(203, 120, 120, 0.6); + --heading_text_color: rgba(132, 160, 230, 0.60); --heading_other_text_color: var(--heading_text_color); --text_color_transition: color 0.3s;