Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

11.1.0 uiupdates #532

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

11.1.0 uiupdates #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3747a59
Style updates for Wallet to match new assets panel
ramijames Jul 12, 2019
e1ffb6f
Accounts in assets now on white, easier to parse
ramijames Jul 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions src/components/misc/Assets.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

<SearchAndFilter full-search="1" v-if="needsAccountSearchBar" v-on:terms="x => terms = x" />
<section class="accounts" :class="{'with-search':needsAccountSearchBar}" v-if="selectedToken">
<section class="box-title">Accounts</section>
<section class="account" v-for="account in filteredAccounts">
<figure class="name">{{account.sendable()}}</figure>
<figure class="network">{{account.network().name}}</figure>
Expand Down Expand Up @@ -140,10 +141,12 @@
}

.accounts {
padding:30px;
margin:$padding-med;
overflow:auto;

height:calc(100% - 180px);
height:calc(100% - 245px);
background:white;
border-radius: $radius-big;

&.with-search {
height:calc(100% - 180px - 70px);
Expand All @@ -152,22 +155,23 @@
.account {
display:flex;
flex-direction: column;
margin-bottom:$padding-small;
padding: $padding-small;
background: rgba(255,255,255,0.06);
border-radius: $radius-big;
border-bottom:1px solid rgba(0,0,0,0.12);

&:last-child {
border-bottom:0;
}

.name {
font-size: $large;
font-weight: bold;
color:white;
margin-bottom:2px;
}

.network {
font-size: $small;
color:rgba(255,255,255,.6);
color:rgba(0,0,0,.6);
margin-bottom:6px;
}

Expand All @@ -182,12 +186,10 @@
font-size: $medium;
font-weight: bold;
margin-bottom:2px;
color:white;
}

.fiat {
font-size: $medium;
color:white;
}
}

Expand Down
47 changes: 36 additions & 11 deletions src/components/misc/KeysAndAccountList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,23 +295,42 @@
}

.keypair-info {
display:flex;
align-items: center;
margin-bottom:10px;
position: relative;

.blockchain {
font-size: 36px;
background:$blue;
border:1px solid $darkblue;
color:$white;
border-radius:$radius;
border-radius:24px;
height:50px;
width:50px;
display:flex;
justify-content: center;
align-items: center;
margin-right:10px;
position: relative;
margin: 1rem auto;
position: relative;

&.token-eos-eos {

}

&.token-trx-trx {
background:linear-gradient(60deg, #304352 0%, lighten(#304352, 10%) 100%);
}

&.token-eos-eos {
background:linear-gradient(60deg, $blue 0%, lighten($blue, 10%) 100%);
}

&.token-eth-eth {
background:linear-gradient(60deg, #F15F79 0%, lighten(#F15F79, 10%) 100%);
}

&.token-btc-btc {
background:linear-gradient(60deg, #757519 0%, lighten(#757519, 10%) 100%);
}

.icon-spin4 {
font-size: 28px;
Expand All @@ -321,7 +340,7 @@
}

.info {
flex:1;
text-align: center;

.name {
font-size: $large;
Expand All @@ -343,7 +362,10 @@
.actions {
display:flex;
padding-right:10px;
position: relative;
position: absolute;
right: 0rem;
top: 0;
text-align: left;

.action-menu {
position:absolute;
Expand Down Expand Up @@ -407,11 +429,14 @@
}

.accounts-label {
margin-top:20px;
font-size: $tiny;
text-transform: uppercase;
color:$blue;
font-weight: bold;
font-weight:bold;
opacity: 0.44;
color: #141616;
background: rgba(53,97,120,0.06);
padding: 8px 10px;
margin: 20px -10px -10px;
text-transform:uppercase;
}

.no-accounts {
Expand Down
10 changes: 10 additions & 0 deletions src/styles/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,4 +530,14 @@ label {
}
}

.box-title {
font-size: $tiny;
font-weight:bold;
opacity: 0.44;
color: #141616;
background: rgba(53,97,120,0.06);
padding: 8px 10px;
text-transform:uppercase;
}