Update status styling

This commit is contained in:
Jaco Greeff 2017-09-19 14:28:33 +02:00
parent 2eac4f6606
commit 413da805b5
6 changed files with 32 additions and 13 deletions

View File

@ -137,6 +137,10 @@ export default class Store {
} }
@action rejectMessage = (source, { id, from, method, token }) => { @action rejectMessage = (source, { id, from, method, token }) => {
if (!source) {
return;
}
source.postMessage({ source.postMessage({
error: `Method ${method} not allowed`, error: `Method ${method} not allowed`,
id, id,
@ -198,6 +202,10 @@ export default class Store {
_methodCallbackPost = (id, from, source, token) => { _methodCallbackPost = (id, from, source, token) => {
return (error, result) => { return (error, result) => {
if (!source) {
return;
}
source.postMessage({ source.postMessage({
error: error error: error
? error.message ? error.message

View File

@ -125,7 +125,7 @@ $modalZ: 10001;
.cornercolor { .cornercolor {
align-items: center; align-items: center;
display: flex; display: flex;
padding: 0.5em 1em; padding: 0 1em;
} }
.link { .link {

View File

@ -237,7 +237,6 @@ class ParityBar extends Component {
icon={ icon={
<IdentityIcon <IdentityIcon
address={ this.accountStore.defaultAccount } address={ this.accountStore.defaultAccount }
button
center center
inline inline
/> />

View File

@ -21,7 +21,7 @@ $borderColor: rgba(0, 0, 0, 0.15);
.requests { .requests {
align-items: flex-end; align-items: flex-end;
bottom: 2em; bottom: 2.75em;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: fixed; position: fixed;
@ -37,23 +37,32 @@ $borderColor: rgba(0, 0, 0, 0.15);
.request { .request {
animation-fill-mode: forwards; animation-fill-mode: forwards;
animation-timing-function: cubic-bezier(0.7, 0, 0.3, 1); animation-timing-function: cubic-bezier(0.7, 0, 0.3, 1);
background-color: rgba($baseColor, $baseColor, $baseColor, $baseOpacity); background: white;
background: linear-gradient(white, #fcfcfc);
border: 4px solid $borderColor; border: 4px solid $borderColor;
cursor: pointer; cursor: pointer;
margin-top: 0.25em; margin-top: 0.25em;
opacity: 1; opacity: 1;
width: 100%; width: 100%;
&:hover {
background: white;
}
&.hide { &.hide {
animation-duration: 0.5s; animation-duration: 0.5s;
animation-name: fadeout; animation-name: fadeout;
} }
.progress {
margin: 0 0.25em 0.5em;
}
.status { .status {
padding: 0.5em; padding: 0.75em;
&.error { &.error {
background-color: rgba(200, 40, 40, 0.95); background: rgba(200, 40, 40, 0.95);
color: white; color: white;
} }
} }
@ -64,10 +73,6 @@ $borderColor: rgba(0, 0, 0, 0.15);
padding: 1em 1em 0.5em; padding: 1em 1em 0.5em;
} }
&:hover .container {
background-color: rgba($baseColor, $baseColor, $baseColor, 1);
}
p { p {
margin: 0; margin: 0;
} }

View File

@ -110,6 +110,7 @@ class Requests extends Component {
? null ? null
: ( : (
<Progress <Progress
className={ styles.progress }
max={ 6 } max={ 6 }
isDeterminate={ state.type !== WAITING_STATE } isDeterminate={ state.type !== WAITING_STATE }
value={ value={

View File

@ -208,10 +208,16 @@ module.exports = {
? dapp.id ? dapp.id
: Api.util.sha3(dapp.url); : Api.util.sha3(dapp.url);
return ['index.html', 'dist.css', 'dist.css.map', 'dist.js', 'dist.js.map'].map((file) => ({ return [
from: path.join(dir, file), 'index.html', 'dist.css', 'dist.css.map', 'dist.js', 'dist.js.map'
]
.map((file) => path.join(dir, file))
.filter((from) => fs.existsSync(from))
.map((from) => ({
from,
to: `dapps/${destination}/` to: `dapps/${destination}/`
})).concat({ }))
.concat({
from: path.join(dir, 'dist'), from: path.join(dir, 'dist'),
to: `dapps/${destination}/dist/` to: `dapps/${destination}/dist/`
}); });