diff --git a/src/config.js b/src/config.js index ac33534cb..c9f7a3ea4 100644 --- a/src/config.js +++ b/src/config.js @@ -73,9 +73,9 @@ export default { resizable: false, fullscreen: false, skipTaskbar: true, - width: 600, - height: 400, - backgroundColor: (settingsStore.get('lightTheme') ? '#FFFFFF' : '#000000'), + width: 325, + height: 450, + backgroundColor: '#000000', webPreferences: { nodeIntegration: true, webSecurity: false diff --git a/src/panes/Files.js b/src/panes/Files.js index 3e6e7092d..617415e16 100644 --- a/src/panes/Files.js +++ b/src/panes/Files.js @@ -132,6 +132,11 @@ class Files extends Component { return connectDropTarget(
+
+ + + +
@@ -141,15 +146,6 @@ class Files extends Component {
Drop to upload to IPFS
- -
- - -
- - -
-
) diff --git a/src/panes/Info.js b/src/panes/Info.js index 45e422295..14df97bc7 100644 --- a/src/panes/Info.js +++ b/src/panes/Info.js @@ -11,18 +11,10 @@ function copy (text) { return () => { clipboard.writeText(text) } } -function openNodeSettings () { - ipcRenderer.send('open-node-settings') -} - function openWebUI () { ipcRenderer.send('open-webui') } -function stopDaemon () { - ipcRenderer.send('stop-daemon') -} - export default function Info (props) { return ( @@ -68,26 +60,12 @@ export default function Info (props) { info={props.node.publicKey} onClick={copy(props.node.publicKey)} /> - - - -
) diff --git a/src/panes/Settings.js b/src/panes/Settings.js index 7e60a3ec7..2db376736 100644 --- a/src/panes/Settings.js +++ b/src/panes/Settings.js @@ -18,6 +18,14 @@ function quit () { ipcRenderer.send('quit-application') } +function openNodeSettings () { + ipcRenderer.send('open-node-settings') +} + +function stopDaemon () { + ipcRenderer.send('stop-daemon') +} + const options = [ { title: 'Launch on startup', @@ -50,10 +58,6 @@ const options = [ Restarting your node is required. ) - }, - { - title: 'Light theme', - setting: 'lightTheme' } ] @@ -83,6 +87,20 @@ export default function Settings (props) { button={false} onClick={quit} info='Click to quit the application.' /> + + + + ) diff --git a/src/screens/menubar.js b/src/screens/menubar.js index 76c8422d5..16ac593af 100644 --- a/src/screens/menubar.js +++ b/src/screens/menubar.js @@ -8,11 +8,11 @@ import PaneContainer from '../components/PaneContainer' import MenuOption from '../components/MenuOption' import Menu from '../components/Menu' -import Peers from '../panes/Peers' +/* import Peers from '../panes/Peers' +import Pinned from '../panes/Pinned' */ import Loader from '../panes/Loader' import Start from '../panes/Start' import Files from '../panes/Files' -import Pinned from '../panes/Pinned' import Info from '../panes/Info' import Settings from '../panes/Settings' @@ -25,7 +25,7 @@ const RUNNING = 'running' const panes = [ { id: 'info', - title: 'Info', + title: 'Home', icon: 'ipfs' }, { @@ -33,7 +33,7 @@ const panes = [ title: 'Files', icon: 'files' }, - { + /* { id: 'pinned', title: 'Pin', icon: 'pin' @@ -42,7 +42,7 @@ const panes = [ id: 'peers', title: 'Peers', icon: 'pulse' - }, + }, */ { id: 'settings', title: 'Settings', @@ -171,13 +171,13 @@ class Menubar extends Component { root={this.state.files.root} /> case 'settings': return - case 'peers': + /* case 'peers': var location = 'Unknown' if (this.state.stats.node) { location = this.state.stats.node.location } - return + return */ case 'info': return ( ) - case 'pinned': + /* case 'pinned': return ( - ) + ) */ default: return ( @@ -222,13 +222,8 @@ class Menubar extends Component { } render () { - let className = '' - if (this.state.settings.lightTheme) { - className = 'light' - } - return ( - + {this._getMenu()} {this._getRouteScreen()} diff --git a/src/styles/app.less b/src/styles/app.less index 2bd9e771b..61a22669f 100644 --- a/src/styles/app.less +++ b/src/styles/app.less @@ -27,9 +27,6 @@ @import './screens/welcome.less'; #menubar .pane { - width: calc(~"100vw - 4em"); - - .footer { - width: calc(~"100vw - 4.5em"); - } + width: 100%; + height: calc(~"100vh - 4em"); } diff --git a/src/styles/common.less b/src/styles/common.less index c8ba15d3c..75ebd22a0 100644 --- a/src/styles/common.less +++ b/src/styles/common.less @@ -17,11 +17,6 @@ border-radius: 0.5em; } -.light ::-webkit-scrollbar-thumb:window-inactive, -.light ::-webkit-scrollbar-thumb { - background: rgba(0, 0, 0, 0.3); -} - .directory-input { cursor: pointer; @@ -82,7 +77,3 @@ width: 250px; text-align: center; } - -.light .notice { - color: #212121 -} diff --git a/src/styles/components/Block.less b/src/styles/components/Block.less index 6a7561568..59b0f387b 100644 --- a/src/styles/components/Block.less +++ b/src/styles/components/Block.less @@ -84,22 +84,6 @@ padding-left: 1em; } -.light .block>div { - border-color: rgba(0,0,0,0.1); -} - -.light .block:hover { - background: #fbfbfb; -} - -.light .block .info { - color: rgba(0,0,0,0.5); -} - -.light .block .button-overlay { - background: linear-gradient(to left,#fbfbfb 0%,#fbfbfb 50%,transparent 100%); -} - .block input[type="text"] { border: 0; outline: 0; diff --git a/src/styles/components/Button.less b/src/styles/components/Button.less index e882c2327..a8e351541 100644 --- a/src/styles/components/Button.less +++ b/src/styles/components/Button.less @@ -10,7 +10,3 @@ .input.button span { font-size: 14px; } - -.light .input.button:hover { - background: rgba(0,0,0,0.3); -} diff --git a/src/styles/components/CheckboxBlock.less b/src/styles/components/CheckboxBlock.less index 4989ed5ca..125cd8198 100644 --- a/src/styles/components/CheckboxBlock.less +++ b/src/styles/components/CheckboxBlock.less @@ -36,7 +36,3 @@ left: 50%; transform: translate(-50%, -50%); } - -.light .block.checkbox .checkbox { - background: #eee; -} \ No newline at end of file diff --git a/src/styles/components/FileBlock.less b/src/styles/components/FileBlock.less index 74ffe679a..cbd896a39 100644 --- a/src/styles/components/FileBlock.less +++ b/src/styles/components/FileBlock.less @@ -23,7 +23,3 @@ margin-right: 0.35em; color: rgba(255, 255, 255, 0.5) } - -.light .block.file .icon { - color: rgba(0, 0, 0, 0.5) -} diff --git a/src/styles/components/Footer.less b/src/styles/components/Footer.less index 8abecf277..a1da57ba8 100644 --- a/src/styles/components/Footer.less +++ b/src/styles/components/Footer.less @@ -4,7 +4,7 @@ display: flex; background: linear-gradient(to top, #000000 0%, #000000 45%, transparent 100%); position: fixed; - bottom: 0; + bottom: 4em; right: 0.5em; padding-top: 3em; box-sizing: border-box; @@ -24,7 +24,3 @@ font-size: 14px; margin-top: -0.5em; } - -.light .footer { - background: linear-gradient(to top, #fff 0%, #fff 45%, transparent 100%); -} diff --git a/src/styles/components/Header.less b/src/styles/components/Header.less index 206d74315..c254fba48 100644 --- a/src/styles/components/Header.less +++ b/src/styles/components/Header.less @@ -30,7 +30,3 @@ background-color: #FFEB3B; animation: loading 2s linear infinite; } - -.light .header .title { - color: rgba(0, 0, 0, 0.5); -} diff --git a/src/styles/components/IconButton.less b/src/styles/components/IconButton.less index 04f4bbf52..3e82380af 100644 --- a/src/styles/components/IconButton.less +++ b/src/styles/components/IconButton.less @@ -14,12 +14,3 @@ .button-icon:hover { opacity: 0.7 !important } - -.light .button-icon { - color: rgba(0, 0, 0, 0.5); -} - -.light .button-icon.active, -.light .button-icon:hover { - color: rgba(0, 0, 0, 0.8); -} diff --git a/src/styles/components/Input.less b/src/styles/components/Input.less index 3269715c0..32e916a3e 100644 --- a/src/styles/components/Input.less +++ b/src/styles/components/Input.less @@ -18,7 +18,3 @@ padding: 0.5em 1em; color: inherit; } - -.light .input { - background: rgba(0, 0, 0, 0.2); -} diff --git a/src/styles/components/Key.less b/src/styles/components/Key.less index 5836befff..f6cfa2022 100644 --- a/src/styles/components/Key.less +++ b/src/styles/components/Key.less @@ -4,7 +4,3 @@ border-radius: 0.2em; padding: 0 0.2em; } - -.light .key { - background: #eee; -} diff --git a/src/styles/components/Menu.less b/src/styles/components/Menu.less index d7fccd9e8..bcaba20d4 100644 --- a/src/styles/components/Menu.less +++ b/src/styles/components/Menu.less @@ -1,10 +1,6 @@ .menu { display: flex; background: #292929; - flex-direction: column; - height: 100%; -} - -.light .menu { - background: #eee; + width: 100%; + height: 4em; } diff --git a/src/styles/components/MenuOption.less b/src/styles/components/MenuOption.less index cedf57247..5f24a783a 100644 --- a/src/styles/components/MenuOption.less +++ b/src/styles/components/MenuOption.less @@ -8,7 +8,7 @@ color: rgba(255, 255, 255, 0.4); cursor: pointer; transition: .2s ease all; - width: 4em; + width: 33%; height: 4em; } @@ -17,7 +17,6 @@ } .menu-option.active { - background: #000; color: #fff; } @@ -29,16 +28,3 @@ .menu-option:last-child { margin-top: auto; } - -.light .menu-option { - color: #212121; -} - -.light .menu-option:hover { - background: rgba(0, 0, 0, 0.1); -} - -.light .menu-option.active { - background: #000; - color: #fff; -} diff --git a/src/styles/components/Pane.less b/src/styles/components/Pane.less index 3745d815f..125f41987 100644 --- a/src/styles/components/Pane.less +++ b/src/styles/components/Pane.less @@ -38,7 +38,3 @@ opacity: 0.2; pointer-events: none; } - -.light .pane { - background: #fff; -} diff --git a/src/styles/components/PaneContainer.less b/src/styles/components/PaneContainer.less index 90861629f..2995d039c 100644 --- a/src/styles/components/PaneContainer.less +++ b/src/styles/components/PaneContainer.less @@ -19,13 +19,9 @@ .panes { font-family: 'Inter UI', sans-serif; display: flex; + flex-direction: column; overflow: hidden; user-select: none; color: #FFF; background: #000000; } - -.panes.light { - color: #212121; - background: #fff; -} diff --git a/src/styles/panes/Info.less b/src/styles/panes/Info.less index 77ab0749b..186b623a4 100644 --- a/src/styles/panes/Info.less +++ b/src/styles/panes/Info.less @@ -20,12 +20,3 @@ width: 1.15em; } } - -.light .info { - .sharing { - p:last-of-type { - font-size: @medium-font; - color: rgba(0, 0, 0, 0.5); - } - } -} \ No newline at end of file diff --git a/src/styles/panes/Loader.less b/src/styles/panes/Loader.less index f541bfa58..09d045299 100644 --- a/src/styles/panes/Loader.less +++ b/src/styles/panes/Loader.less @@ -26,10 +26,6 @@ animation-delay: -1.0s; } -.light .double-bounce1, -.light .double-bounce2 { - background-color: #dddddd; -} @-webkit-keyframes sk-bounce { 0%,