Make status always visible
This commit is contained in:
parent
51674f2cc4
commit
7e1cb97c7e
@ -15,6 +15,9 @@
|
|||||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
.application {
|
||||||
|
}
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
|
@ -60,6 +60,7 @@ class Application extends Component {
|
|||||||
upgradeStore = UpgradeStore.get(this.context.api);
|
upgradeStore = UpgradeStore.get(this.context.api);
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
const { blockNumber } = this.props;
|
||||||
const [root] = (window.location.hash || '').replace('#/', '').split('/');
|
const [root] = (window.location.hash || '').replace('#/', '').split('/');
|
||||||
const isMinimized = root !== '';
|
const isMinimized = root !== '';
|
||||||
const { pinMatrixRequest } = this.hwstore;
|
const { pinMatrixRequest } = this.hwstore;
|
||||||
@ -76,7 +77,7 @@ class Application extends Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div className={ styles.application }>
|
||||||
{
|
{
|
||||||
isMinimized
|
isMinimized
|
||||||
? this.renderMinimized()
|
? this.renderMinimized()
|
||||||
@ -101,12 +102,17 @@ class Application extends Component {
|
|||||||
}
|
}
|
||||||
<Requests />
|
<Requests />
|
||||||
<ParityBar dapp={ isMinimized } />
|
<ParityBar dapp={ isMinimized } />
|
||||||
|
{
|
||||||
|
blockNumber
|
||||||
|
? <Status upgradeStore={ this.upgradeStore } />
|
||||||
|
: null
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
renderApp () {
|
renderApp () {
|
||||||
const { blockNumber, children } = this.props;
|
const { children } = this.props;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={ styles.container }>
|
<div className={ styles.container }>
|
||||||
@ -118,11 +124,6 @@ class Application extends Component {
|
|||||||
<Snackbar />
|
<Snackbar />
|
||||||
<UpgradeParity upgradeStore={ this.upgradeStore } />
|
<UpgradeParity upgradeStore={ this.upgradeStore } />
|
||||||
<Errors />
|
<Errors />
|
||||||
{
|
|
||||||
blockNumber
|
|
||||||
? <Status upgradeStore={ this.upgradeStore } />
|
|
||||||
: null
|
|
||||||
}
|
|
||||||
<div className={ styles.content }>
|
<div className={ styles.content }>
|
||||||
{ children }
|
{ children }
|
||||||
</div>
|
</div>
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
/* You should have received a copy of the GNU General Public License
|
/* You should have received a copy of the GNU General Public License
|
||||||
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
.frame {
|
.frame {
|
||||||
background: white;
|
background: white;
|
||||||
border: 0;
|
border: 0;
|
||||||
|
@ -31,7 +31,6 @@ import ContainerTitle from '@parity/ui/Container/Title';
|
|||||||
import IdentityIcon from '@parity/ui/IdentityIcon';
|
import IdentityIcon from '@parity/ui/IdentityIcon';
|
||||||
import GradientBg from '@parity/ui/GradientBg';
|
import GradientBg from '@parity/ui/GradientBg';
|
||||||
import SelectionList from '@parity/ui/SectionList';
|
import SelectionList from '@parity/ui/SectionList';
|
||||||
import StatusIndicator from '@parity/ui/StatusIndicator';
|
|
||||||
import { CancelIcon, FingerprintIcon } from '@parity/ui/Icons';
|
import { CancelIcon, FingerprintIcon } from '@parity/ui/Icons';
|
||||||
|
|
||||||
import imagesEthcoreBlock from '@parity/shared/assets/images/parity-logo-white-no-text.svg';
|
import imagesEthcoreBlock from '@parity/shared/assets/images/parity-logo-white-no-text.svg';
|
||||||
@ -43,7 +42,7 @@ import AccountStore from './accountStore';
|
|||||||
import styles from './parityBar.css';
|
import styles from './parityBar.css';
|
||||||
|
|
||||||
const LS_STORE_KEY = '_parity::parityBar';
|
const LS_STORE_KEY = '_parity::parityBar';
|
||||||
const DEFAULT_POSITION = { right: '1em', bottom: 0 };
|
const DEFAULT_POSITION = { right: '1em', bottom: '2.5em' };
|
||||||
const DISPLAY_ACCOUNTS = 'accounts';
|
const DISPLAY_ACCOUNTS = 'accounts';
|
||||||
const DISPLAY_SIGNER = 'signer';
|
const DISPLAY_SIGNER = 'signer';
|
||||||
|
|
||||||
@ -184,7 +183,7 @@ class ParityBar extends Component {
|
|||||||
if (position.top !== undefined) {
|
if (position.top !== undefined) {
|
||||||
parityBgStyle.top = 0;
|
parityBgStyle.top = 0;
|
||||||
} else {
|
} else {
|
||||||
parityBgStyle.bottom = 0;
|
parityBgStyle.bottom = '2.5em';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set at left or right of the screen
|
// Set at left or right of the screen
|
||||||
@ -228,10 +227,6 @@ class ParityBar extends Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<GradientBg className={ styles.cornercolor }>
|
<GradientBg className={ styles.cornercolor }>
|
||||||
<StatusIndicator
|
|
||||||
id='paritybar.health'
|
|
||||||
tooltipPlacement='right'
|
|
||||||
/>
|
|
||||||
<Button
|
<Button
|
||||||
className={ styles.iconButton }
|
className={ styles.iconButton }
|
||||||
icon={
|
icon={
|
||||||
|
Loading…
Reference in New Issue
Block a user