diff --git a/src/App.css b/src/App.css index 990a2b2..93e8859 100644 --- a/src/App.css +++ b/src/App.css @@ -2,7 +2,7 @@ display: flex; flex-direction: column; margin: 0; - padding: 8px; + padding: 10px; box-sizing: border-box; height: 100vh; width: 100vw; diff --git a/src/App.js b/src/App.js index b196019..286adac 100644 --- a/src/App.js +++ b/src/App.js @@ -426,8 +426,9 @@ class App extends Component { const doUpdate = (locationsLookup, versionLookup) => { const latestVersion = versionLookup[this.state.ReleaseTypes[this.state.Release]].length - 1; let version = this.state.Version; - if (version === -1) { + if ((version === -1) || !versionLookup[this.state.ReleaseTypes[this.state.Release]][version]) { version = latestVersion; + this.saveState(this.state.Release, version, this.state.Sia, this.state.Hyperspace); } this.setState({ @@ -694,10 +695,10 @@ class App extends Component { this.setState({UpgradeDismissed: false})} - col={dimensions => dimensions.columns - 7} - colSpan={6} - row={0} - rowSpan={'remain'}/> + col={dimensions => dimensions.columns - 6} + colSpan={5} + row={1} + rowSpan={remain=>remain - 2}/> diff --git a/src/constants.js b/src/constants.js index 0726858..06b1a92 100644 --- a/src/constants.js +++ b/src/constants.js @@ -1,13 +1,13 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory/raw/1.0.0-alpha.2_branch/releases.json'; +exports.RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory/raw/master/releases.json'; exports.DATA_LOCATIONS = { linux: '~/.local/repertory/ui', darwin: '~/Library/Application Support/repertory/ui', win32: '%LOCALAPPDATA%\\repertory\\ui' }; -exports.UI_RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory-ui/raw/1.0.1_branch/releases.json'; +exports.UI_RELEASES_URL = 'https://bitbucket.org/blockstorage/repertory-ui/raw/master/releases.json'; exports.IPC_Check_Installed = 'check_installed'; exports.IPC_Check_Installed_Reply = 'check_installed_reply'; diff --git a/src/index.css b/src/index.css index 630e5f6..0b69062 100644 --- a/src/index.css +++ b/src/index.css @@ -5,14 +5,14 @@ --control_background_hover: rgba(150, 150, 190, .3); --control_border: 1px solid rgba(70, 70, 70, 0.9); --control_box_shadow: 1px 1px 1px black; - --control_transparent_background: rgba(60, 60, 70, 0.4); + --control_transparent_background: rgba(40, 40, 55, 0.45); --control_dark_transparent_background: rgba(15, 15, 15, 0.8); - --text_color: rgba(200, 205, 220, 0.8); - --text_color_hover: rgba(200, 205, 220, 0.8); + --text_color: rgba(200, 205, 220, 0.7); + --text_color_hover: rgba(200, 205, 220, 0.7); --text_color_error: rgba(203, 120, 120, 0.8); - --heading_text_color: rgba(140, 169, 203, 0.8); - --heading_other_text_color: rgba(200, 205, 220, 0.8); + --heading_text_color: rgba(166, 177, 219, 0.7); + --heading_other_text_color: var(--heading_text_color); --text_color_transition: color 0.3s; } @@ -69,3 +69,20 @@ p { font-weight: normal; color: var(--text_color); } + +.scrollable-content { + overflow-x: hidden; + overflow-y: scroll; +} + +.scrollable-content, ::-webkit-scrollbar { + width: 10px; +} + +.scrollable-content, ::-webkit-scrollbar * { + background: transparent; +} + +.scrollable-content, ::-webkit-scrollbar-thumb { + background: rgba(90, 90, 90, 0.6) !important; +}