Skip to content

CLIENT-1785: change asset info #1257

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

Merged
Jahsus merged 4 commits into from
May 23, 2019
Merged

CLIENT-1785: change asset info #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d49d49f
CLIENT-1785: change asset info
ekomarovskaya Apr 9, 2019
f19ecca
CLIENT-1785: change asset info
ekomarovskaya Apr 25, 2019
fa29e5a
Merge branch 'dev' of github.com:wavesplatform/WavesGUI into client-1…
ekomarovskaya Apr 25, 2019
983a5d6
CLIENT-1785: merge conflict
ekomarovskaya May 22, 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
22 changes: 20 additions & 2 deletions src/modules/ui/directives/transaction/transactions.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ w-transaction .transaction {
.transaction-info {
display: flex;
flex-direction: row;
width: 100%;
width: ~'calc(100% - 88px)';

.full-width {
width: 100%;
Expand All @@ -220,18 +220,31 @@ w-transaction .transaction {
.line {
height: 50%;
flex-basis: 50%;
box-sizing: border-box;
overflow: hidden;
color: @color-basic-700;

&:last-child {
padding-right: @padding-main-layout * 4.4;
text-align: right;

.top {
word-break: break-all;
}
}

.top {
word-break: break-all;
.spam-label {
display: none;
}

.flex {
flex: 0;

.ellipsis {
max-width: 120px;
}
}
}
.bottom {
color: @color-basic-500;
Expand Down Expand Up @@ -291,6 +304,11 @@ w-transaction .transaction {
}
}

.transaction-amounts {
max-width: 100%;
display: inline-block;
}

@media screen and (max-width: 960px) {
.leasing w-transaction .transaction {
.icon {
Expand Down
7 changes: 5 additions & 2 deletions src/modules/ui/directives/transaction/types/exchange/exchange.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<div class="line-wrapper">
<div class="line">
<div class="body-2 top fs-mobile">
<span>
<div class="body-2 top flex fs-mobile">
<span class="flex">
<span w-i18n="transaction.headers.{{::$ctrl.typeName}}"></span>
<span class="ellipsis">
{{$ctrl.getAssetName($ctrl.transaction.amount.asset)}}
</span>
<span>{{$ctrl.amountAssetName}}</span>
<span ng-if="$ctrl.isScamAmount"
class="spam-label"
Expand Down
Empty file added src/modules/ui/directives/transaction/types/transfer.html
View file
Open in desktop
Empty file.
12 changes: 6 additions & 6 deletions src/modules/utils/modals/sendAsset/send-header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
class="input-like big flex-row split-half">
<div class="flex-row">
<w-asset-logo class="marker-hide" size="24" asset-id="{{::$ctrl.state.assetId}}"></w-asset-logo>
<div class="asset__name">{{$ctrl.balance.asset.name}}</div>
<div class="asset__name ellipsis">{{$ctrl.balance.asset.name}}</div>
</div>
<div ng-click="$ctrl.activate()" class="flex-row asset__balance">
<w-balance money="$ctrl.balance"></w-balance>
<span class="mobile-ellipsis ellipsis">&nbsp;{{$ctrl.balance.asset.displayName}}</span>
<w-balance class="ellipsis asset__amount" money="$ctrl.balance"></w-balance>
<span class="mobile-ellipsis ellipsis asset__name">&nbsp;{{$ctrl.balance.asset.displayName}}</span>
</div>
</div>
<w-select class="big"
Expand All @@ -22,11 +22,11 @@
<div class="flex-row split-half">
<div class="flex-row">
<w-asset-logo class="marker-hide" size="24" asset-id="{{::option.asset.id}}"></w-asset-logo>
<div class="asset__name">{{::option.asset.name}}</div>
<div class="asset__name ellipsis">{{::option.asset.name}}</div>
</div>
<div class="asset__balance">
<w-balance money="option"></w-balance>
<span class="mobile-ellipsis ellipsis">&nbsp;{{::option.asset.displayName}}</span>
<w-balance class="ellipsis asset__amount" money="option"></w-balance>
<span class="mobile-ellipsis ellipsis asset__name">&nbsp;{{::option.asset.displayName}}</span>
</div>
</div>
</w-option>
Expand Down
38 changes: 21 additions & 17 deletions src/modules/utils/modals/sendAsset/send.modal.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ md-dialog.modal-send {

.asset__name {
margin-left: 10px;
max-width: 122px;
}

.flex-row {
Expand Down Expand Up @@ -225,31 +226,19 @@ md-dialog.modal-send {

&__balance {
font-size: 15px;
display: flex;
@media screen and (max-width: 540px) {
font-size: 13px;
}
}
}
}

.input-like {
position: relative;
padding: 0 20px;
border-radius: @border-radius;
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
overflow-x: hidden;
}
&__amount {
max-width: 100px;
}
}

w-select {
.title {
overflow-x: hidden;

span {
white-space: nowrap;
}
}

.expanded {
Expand All @@ -264,6 +253,17 @@ md-dialog.modal-send {
}
}

.input-like {
position: relative;
padding: 0 20px;
border-radius: @border-radius;
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
overflow-x: hidden;
}

.amount-wrap {
display: flex;
flex-direction: row;
Expand All @@ -282,6 +282,10 @@ md-dialog.modal-send {
w-balance {
vertical-align: top;
white-space: nowrap;

&.asset__amount {
max-width: 100px;
}
}

w-balance-input {
Expand Down