[Layout changes] [Prepare for release]

This commit is contained in:
Scott E. Graves
2018-10-04 00:49:49 -05:00
parent 712ad932be
commit 4aac967081
4 changed files with 31 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 0; margin: 0;
padding: 8px; padding: 10px;
box-sizing: border-box; box-sizing: border-box;
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;

View File

@@ -426,8 +426,9 @@ class App extends Component {
const doUpdate = (locationsLookup, versionLookup) => { const doUpdate = (locationsLookup, versionLookup) => {
const latestVersion = versionLookup[this.state.ReleaseTypes[this.state.Release]].length - 1; const latestVersion = versionLookup[this.state.ReleaseTypes[this.state.Release]].length - 1;
let version = this.state.Version; let version = this.state.Version;
if (version === -1) { if ((version === -1) || !versionLookup[this.state.ReleaseTypes[this.state.Release]][version]) {
version = latestVersion; version = latestVersion;
this.saveState(this.state.Release, version, this.state.Sia, this.state.Hyperspace);
} }
this.setState({ this.setState({
@@ -694,10 +695,10 @@ class App extends Component {
<UpgradeIcon <UpgradeIcon
available={this.state.UpgradeAvailable} available={this.state.UpgradeAvailable}
clicked={()=>this.setState({UpgradeDismissed: false})} clicked={()=>this.setState({UpgradeDismissed: false})}
col={dimensions => dimensions.columns - 7} col={dimensions => dimensions.columns - 6}
colSpan={6} colSpan={5}
row={0} row={1}
rowSpan={'remain'}/> rowSpan={remain=>remain - 2}/>
</Grid> </Grid>
</Box> </Box>
</div> </div>

View File

@@ -1,13 +1,13 @@
Object.defineProperty(exports, "__esModule", { Object.defineProperty(exports, "__esModule", {
value: true 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 = { exports.DATA_LOCATIONS = {
linux: '~/.local/repertory/ui', linux: '~/.local/repertory/ui',
darwin: '~/Library/Application Support/repertory/ui', darwin: '~/Library/Application Support/repertory/ui',
win32: '%LOCALAPPDATA%\\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 = 'check_installed';
exports.IPC_Check_Installed_Reply = 'check_installed_reply'; exports.IPC_Check_Installed_Reply = 'check_installed_reply';

View File

@@ -5,14 +5,14 @@
--control_background_hover: rgba(150, 150, 190, .3); --control_background_hover: rgba(150, 150, 190, .3);
--control_border: 1px solid rgba(70, 70, 70, 0.9); --control_border: 1px solid rgba(70, 70, 70, 0.9);
--control_box_shadow: 1px 1px 1px black; --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); --control_dark_transparent_background: rgba(15, 15, 15, 0.8);
--text_color: rgba(200, 205, 220, 0.8); --text_color: rgba(200, 205, 220, 0.7);
--text_color_hover: rgba(200, 205, 220, 0.8); --text_color_hover: rgba(200, 205, 220, 0.7);
--text_color_error: rgba(203, 120, 120, 0.8); --text_color_error: rgba(203, 120, 120, 0.8);
--heading_text_color: rgba(140, 169, 203, 0.8); --heading_text_color: rgba(166, 177, 219, 0.7);
--heading_other_text_color: rgba(200, 205, 220, 0.8); --heading_other_text_color: var(--heading_text_color);
--text_color_transition: color 0.3s; --text_color_transition: color 0.3s;
} }
@@ -69,3 +69,20 @@ p {
font-weight: normal; font-weight: normal;
color: var(--text_color); 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;
}