Bring in styling queues from original Gavcoin (#2936)

* Bring in styling queues from original

* NewTranch background colour update
This commit is contained in:
Jaco Greeff 2016-10-28 16:46:11 +02:00 committed by Gav Wood
parent 0f0334275e
commit 6abd08f5b2
10 changed files with 61 additions and 11 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

View File

@ -22,7 +22,7 @@
.account { .account {
margin: 0.5em !important; margin: 0.5em !important;
background: rgb(50, 100, 150) !important; background: #430 !important;
display: inline-block !important; display: inline-block !important;
} }

View File

@ -73,6 +73,7 @@ export default class ActionBuyIn extends Component {
if (complete) { if (complete) {
return ( return (
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Done' label='Done'
primary primary
onTouchTap={ this.props.onClose } /> onTouchTap={ this.props.onClose } />
@ -84,10 +85,12 @@ export default class ActionBuyIn extends Component {
return ([ return ([
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Cancel' label='Cancel'
primary primary
onTouchTap={ this.props.onClose } />, onTouchTap={ this.props.onClose } />,
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Buy' label='Buy'
primary primary
disabled={ hasError || sending } disabled={ hasError || sending }

View File

@ -72,6 +72,7 @@ export default class ActionRefund extends Component {
if (this.state.complete) { if (this.state.complete) {
return ( return (
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Done' label='Done'
primary primary
onTouchTap={ this.props.onClose } /> onTouchTap={ this.props.onClose } />
@ -82,10 +83,12 @@ export default class ActionRefund extends Component {
return ([ return ([
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Cancel' label='Cancel'
primary primary
onTouchTap={ this.props.onClose } />, onTouchTap={ this.props.onClose } />,
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Refund' label='Refund'
primary primary
disabled={ hasError || this.state.sending } disabled={ hasError || this.state.sending }

View File

@ -75,6 +75,7 @@ export default class ActionTransfer extends Component {
if (complete) { if (complete) {
return ( return (
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Done' label='Done'
primary primary
onTouchTap={ this.props.onClose } /> onTouchTap={ this.props.onClose } />
@ -85,10 +86,12 @@ export default class ActionTransfer extends Component {
return ([ return ([
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Cancel' label='Cancel'
primary primary
onTouchTap={ this.props.onClose } />, onTouchTap={ this.props.onClose } />,
<FlatButton <FlatButton
className={ styles.dlgbtn }
label='Transfer' label='Transfer'
primary primary
disabled={ hasError || sending } disabled={ hasError || sending }

View File

@ -16,7 +16,7 @@
*/ */
.actions { .actions {
text-align: center; text-align: center;
padding: 2em 2em 0 2em; padding: 2em 0 0 0;
width: 100%; width: 100%;
} }
@ -25,20 +25,31 @@
} }
.button button { .button button {
background-color: rgba(50, 100, 150, 1) !important; background-color: #430 !important;
height: 56px !important; height: 56px !important;
padding: 0 10px !important; padding: 0 10px !important;
} }
.button button[disabled] { .button button[disabled] {
background-color: rgba(50, 50, 50, 0.25) !important; opacity: 0.25;
}
.dlgbtn {
}
.dlgbtn span {
color: #430 !important;
}
.dlgbtn[disabled] {
opacity: 0.25;
} }
.dialog { .dialog {
} }
.dialog h3 { .dialog h3 {
color: rgba(50, 100, 150, 1) !important; color: #430 !important;
text-transform: uppercase; text-transform: uppercase;
} }

View File

@ -0,0 +1,21 @@
/* Copyright 2015, 2016 Ethcore (UK) Ltd.
/* This file is part of Parity.
/*
/* Parity is free software: you can redistribute it and/or modify
/* it under the terms of the GNU General Public License as published by
/* the Free Software Foundation, either version 3 of the License, or
/* (at your option) any later version.
/*
/* Parity is distributed in the hope that it will be useful,
/* but WITHOUT ANY WARRANTY; without even the implied warranty of
/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
/* GNU General Public License for more details.
/*
/* You should have received a copy of the GNU General Public License
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.body {
background-size: cover;
background-repeat: no-repeat;
}

View File

@ -32,6 +32,13 @@ import Events from '../Events';
import Loading from '../Loading'; import Loading from '../Loading';
import Status from '../Status'; import Status from '../Status';
import styles from './application.css';
import bgimage from '../../../../assets/images/dapps/gavcoin-bg.jpg';
const bgstyle = {
backgroundImage: `url(${bgimage})`
};
const DIVISOR = 10 ** 6; const DIVISOR = 10 ** 6;
export default class Application extends Component { export default class Application extends Component {
@ -70,7 +77,7 @@ export default class Application extends Component {
} }
return ( return (
<div> <div className={ styles.body } style={ bgstyle }>
{ this.renderModals() } { this.renderModals() }
<Status <Status
address={ address } address={ address }

View File

@ -90,5 +90,5 @@
} }
.newtranch { .newtranch {
background: rgba(50, 250, 50, 0.1); background: rgba(255, 175, 0, 0.125); /*rgba(68, 51, 0, 0.15);*/
} }

View File

@ -15,8 +15,8 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>. /* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/ */
.status { .status {
background: rgba(25, 75, 125, 1); background: rgba(255, 175, 0, 0.25);
color: rgba(255, 255, 255, 1); color: #430;
padding: 4em 0 2em 0; padding: 4em 0 2em 0;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@ -38,14 +38,16 @@
.byline { .byline {
font-size: 1.25em; font-size: 1.25em;
color: rgba(255, 255, 255, 0.7); color: #430;
opacity: 0.75;
} }
.heading { .heading {
text-transform: uppercase; text-transform: uppercase;
letter-spacing: 0.25em; letter-spacing: 0.25em;
font-size: 1.5em; font-size: 1.5em;
color: rgba(255, 255, 255, 0.7); color: #430;
opacity: 0.75;
} }
.hero { .hero {