Adjust tx overlay colours (#5353)

* Adjust tx overlay colours

* Adjust sizes to be consistent

* Formatting
This commit is contained in:
Jaco Greeff 2017-03-31 23:32:03 +02:00 committed by Gav Wood
parent 8b0f9759ec
commit 73dc52980e
2 changed files with 28 additions and 19 deletions

View File

@ -15,8 +15,9 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
$baseColor: 255;
$baseColor: 18;
$baseOpacity: 0.95;
$borderColor: rgba($baseColor, $baseColor, $baseColor, 0.25);
.requests {
align-items: flex-end;
@ -25,6 +26,7 @@ $baseOpacity: 0.95;
flex-direction: column;
position: fixed;
right: 0.175em;
width: 24em;
z-index: 750;
* {
@ -36,10 +38,11 @@ $baseOpacity: 0.95;
animation-fill-mode: forwards;
animation-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
background-color: rgba($baseColor, $baseColor, $baseColor, $baseOpacity);
color: black;
border: 4px solid $borderColor;
cursor: pointer;
margin-top: 0.5em;
margin-top: 0.25em;
opacity: 1;
width: 100%;
&.hide {
animation-duration: 0.5s;
@ -58,11 +61,7 @@ $baseOpacity: 0.95;
.container {
display: flex;
flex-direction: row;
padding: 1em;
* {
color: black !important;
}
padding: 1em 1em 0.5em 1em;
}
&:hover .container {

View File

@ -46,7 +46,11 @@ class Requests extends Component {
return (
<div className={ styles.requests }>
{ Object.values(requests).map((request) => this.renderRequest(request, extras[request.requestId])) }
{
Object
.values(requests)
.map((request) => this.renderRequest(request, extras[request.requestId]))
}
</div>
);
}
@ -94,17 +98,20 @@ class Requests extends Component {
</div>
{
state.type === ERROR_STATE
? null
: (
<LinearProgress
max={ 6 }
mode={ state.type === WAITING_STATE ? 'indeterminate' : 'determinate' }
value={ state.type === DONE_STATE ? request.blockHeight.toNumber() : 6 }
/>
)
? null
: (
<LinearProgress
max={ 6 }
mode={ state.type === WAITING_STATE ? 'indeterminate' : 'determinate' }
value={ state.type === DONE_STATE ? request.blockHeight.toNumber() : 6 }
/>
)
}
<div className={ styles.container }>
<div className={ styles.identity } title={ transaction.from }>
<div
className={ styles.identity }
title={ transaction.from }
>
<IdentityIcon
address={ transaction.from }
inline
@ -230,4 +237,7 @@ function mapDispatchToProps (dispatch) {
}, dispatch);
}
export default connect(mapStateToProps, mapDispatchToProps)(Requests);
export default connect(
mapStateToProps,
mapDispatchToProps
)(Requests);