Skip to content

Dexw 2203 user account type icon #1689

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-waves merged 4 commits into from
Oct 3, 2019
Merged

Dexw 2203 user account type icon #1689

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
2701eb9
DEXW-2203: fix ledger icon
Oct 1, 2019
c8108b4
DEXW-2203: fix mobile
Oct 1, 2019
e772377
DEXW-2203: fix scripted avatars
Oct 2, 2019
d65c90b
Merge branch 'dev' into dexw-2203-user-account-type-icon
Oct 2, 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
3 changes: 1 addition & 2 deletions src/modules/ui/directives/avatar/Avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
this.style = { width: `${this.size}px`, height: `${this.size}px` };

this.receive(user.changeScript, () => {
this.hasScript = user.hasScript();
$scope.$apply();
this.$onChanges();
});
}

Expand Down
18 changes: 18 additions & 0 deletions src/modules/ui/directives/avatar/less/avatar-active.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@import (reference) 'icons';
@import (reference) 'config';

.avatar_active {
.avatar {
&__img {
transform: scale(1.25);
box-shadow: 0 0 0 4px #fff, 0 4px 18px 0 rgba(30, 41, 73, 0.15);
}
}

&.avatar {
.avatar__wrap {
cursor: default;
opacity: 1;
}
}
}
33 changes: 0 additions & 33 deletions src/modules/ui/directives/avatar/less/avatar.active.less
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions src/modules/ui/directives/avatar/less/avatar.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,6 @@
}
}

&[type='ledger'] .avatar__wrap:not(.scripted)::after {
bottom: 8px;
left: calc(100% ~'- 23px');
transition: left 0.3s, bottom 0.3s;
}

&__wrapper { // .avatar__wrapper
display: flex;
align-items: center;
Expand All @@ -81,11 +75,4 @@
opacity: 1;
}
}
}

@media screen and (max-width: 480px) {
.avatar[type='ledger'] .avatar__wrap:not(.scripted)::after {
bottom: 13px;
left: calc(100% ~'- 28px');
}
}
37 changes: 37 additions & 0 deletions src/modules/ui/directives/avatar/less/avatars-list.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
@import (reference) 'icons';
@import (reference) 'config';

.avatars-list {
.avatar[type='ledger'] {
.avatar__wrap:not(.scripted)::after {
bottom: 8px;
left: calc(100% ~'- 23px');
transition: left 0.3s, bottom 0.3s;
}

&.avatar_active {
.avatar__wrap:not(.scripted)::after {
bottom: 3px;
left: calc(100% ~'- 18px');
}
}
}
}

@media screen and (max-width: 480px) {
.avatars-list {
.avatar[type='ledger'] {
.avatar__wrap:not(.scripted)::after {
bottom: 13px;
left: calc(100% ~'- 28px');
}

&.avatar_active {
.avatar__wrap:not(.scripted)::after {
bottom: 8px;
left: calc(100% ~'- 23px');
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/modules/ui/directives/mainHeader/templates/mobileHeader.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@

<div class="mobile-menu__user">
<div class="mobile-menu__avatar has-helper"> <!-- MOBILE -->
<w-avatar size="40" address="$ctrl.address"></w-avatar>
<w-avatar type="{{$ctrl.userType}}" size="40" address="$ctrl.address"></w-avatar>
</div>

<div class="mobile-menu__info mobile-user">
Expand Down