From ca2a5b0fd01756ba00c575b8132f4dbe2f92eb4e Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 6 Apr 2020 15:21:18 -0500 Subject: [PATCH] [Password layout changes] [Package upgrades] --- package.json | 32 +++++++++---------- .../MountItems/MountItem/MountItem.js | 4 +-- src/containers/UI/Password/Password.css | 1 + src/containers/UI/Password/Password.js | 2 +- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f19ae95..7924216 100644 --- a/package.json +++ b/package.json @@ -5,39 +5,39 @@ "author": "scott.e.graves@protonmail.com", "description": "GUI for Repertory - Repertory allows you to mount Sia, Skynet, Goobox S3 and/or ScPrime storage solutions via FUSE on Linux/OS X or via WinFSP on Windows.", "dependencies": { - "@fortawesome/fontawesome-svg-core": "^1.2.27", - "@fortawesome/free-solid-svg-icons": "^5.12.1", - "@fortawesome/react-fontawesome": "^0.1.8", - "@reduxjs/toolkit": "^1.2.4", + "@fortawesome/fontawesome-svg-core": "^1.2.28", + "@fortawesome/free-solid-svg-icons": "^5.13.0", + "@fortawesome/react-fontawesome": "^0.1.9", + "@reduxjs/toolkit": "^1.3.4", "auto-launch": "^5.0.5", "axios": "^0.19.2", "devtron": "^1.4.0", "electron-debug": "^3.0.1", - "electron-log": "^4.0.6", + "electron-log": "^4.1.1", "focus-trap-react": "^6.0.0", "font-awesome": "^4.7.0", "node-schedule": "^1.3.2", "randomstring": "^1.1.5", - "react": "^16.12.0", - "react-dom": "^16.12.0", + "react": "^16.13.1", + "react-dom": "^16.13.1", "react-loader-spinner": "^3.1.5", - "react-redux": "^7.1.3", - "react-scripts": "3.3.1", - "react-tooltip": "^4.0.3", + "react-redux": "^7.2.0", + "react-scripts": "3.4.1", + "react-tooltip": "^4.1.5", "redux": "^4.0.5", "redux-thunk": "^2.3.0", - "unzipper": "^0.10.8", + "unzipper": "^0.10.10", "winreg": "^1.2.4" }, "devDependencies": { - "cross-env": "^7.0.0", - "electron": "^5.0.13", - "electron-builder": "^20.44.4", + "cross-env": "^7.0.2", + "electron": "5.0.13", + "electron-builder": "20.44.4", "extract-text-webpack-plugin": "^3.0.2", "fibers": "^4.0.2", "node-sass": "^4.13.1", - "sass": "^1.25.0", - "typescript": "^3.7.5", + "sass": "^1.26.3", + "typescript": "^3.8.3", "webpack-browser-plugin": "^1.0.20" }, "scripts": { diff --git a/src/containers/MountItems/MountItem/MountItem.js b/src/containers/MountItems/MountItem/MountItem.js index 0a66983..01821f1 100644 --- a/src/containers/MountItems/MountItem/MountItem.js +++ b/src/containers/MountItems/MountItem/MountItem.js @@ -187,7 +187,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => { col={configButton ? 24 : 18} onClick={props.MState.AllowMount ? () => props.displaySkynetExport() : e => {e.preventDefault();}} rowSpan={5} - style={{...pointer}}> + style={{...pointer, fontWeight: 'normal'}}> Export ) : null} @@ -196,7 +196,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(props => { col={configButton ? 24 + 13 : 18 + 13} onClick={props.MState.AllowMount ? () => props.displaySkynetImport() : e => {e.preventDefault();}} rowSpan={5} - style={{...pointer}}> + style={{...pointer, fontWeight: 'normal'}}> Import ) : null} diff --git a/src/containers/UI/Password/Password.css b/src/containers/UI/Password/Password.css index 6409b49..a23712e 100644 --- a/src/containers/UI/Password/Password.css +++ b/src/containers/UI/Password/Password.css @@ -30,4 +30,5 @@ input.PasswordInput { .PasswordLink { margin-right: var(--default_spacing); cursor: pointer; + font-weight: normal; } diff --git a/src/containers/UI/Password/Password.js b/src/containers/UI/Password/Password.js index 6287064..3ea172e 100644 --- a/src/containers/UI/Password/Password.js +++ b/src/containers/UI/Password/Password.js @@ -48,7 +48,7 @@ export default class extends Component { this.props.changed(this.state.password); this.setState({ ...this.state, - button_text: 'clear', + button_text: this.state.password && this.state.password.length > 0 ? 'clear' : 'set', password2: '', }); } else {