Skip to content

Dexw 1936 bem select #1627

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 11 commits into from
Oct 13, 2019
Merged

Dexw 1936 bem select #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f6300b1
DEXW-1936: bem select
Sep 6, 2019
a8709a8
Merge branch 'dev' into dexw-1936-bem-select
Sep 9, 2019
1689381
DEXW-1936: bem select
Sep 9, 2019
c1fe9dd
DEXW-1936: bem select
Sep 9, 2019
6818173
DEXW-1936: some changes
Sep 9, 2019
19bb445
DEXW-1936: fix
ekomarovskaya Sep 25, 2019
74d9ee3
DEXW-1936: merge
ekomarovskaya Sep 26, 2019
7d267fe
Merge remote-tracking branch 'origin/dev' into dexw-1936-bem-select
Oct 9, 2019
6eac4d9
Merge branch 'dev' into dexw-1936-bem-select
Oct 10, 2019
42983b4
DEXW-1936: fix select in transaction
Oct 10, 2019
7c33dde
Merge branch 'dexw-1936-bem-select' of github.com:wavesplatform/Waves…
Oct 10, 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
2 changes: 1 addition & 1 deletion src/modules/app/less/app.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ fieldset {
padding: 0;

&.disabled {
w-select, span.link, w-qr-code-read, w-import-file, a.link-clear {
.select, span.link, w-qr-code-read, w-import-file, a.link-clear {
pointer-events: none;
}
}
Expand Down
1 change: 0 additions & 1 deletion src/modules/app/services/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

const { equals } = require('ramda');
const { isValidAddress } = require('@waves/signature-adapter');
const ds = require('data-service');

/**
* @param {Storage} storage
Expand Down
10 changes: 9 additions & 1 deletion src/modules/desktop/less/electron.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ body.desktop:not(.web) {
}
}

w-select .select .title {
&-copyright {
white-space: nowrap;
.footnote-1();
color: @color-basic-500;
margin-left: 15px;
margin-bottom: 0;
}

.select .select__wrap .select__title {
background: transparent;

&:after {
Expand Down
4 changes: 2 additions & 2 deletions src/modules/dex/directives/createOrder/createOrder.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@

<div class="expiration__item expiration__item-fee" ng-if="$ctrl.feeList.length">
<span class="expiration__label" w-i18n="directives.createOrder.matcherFee"></span>
<w-select class="expiration__select select__no-user-select" ng-model="$ctrl.fee" up-direction="true">
<w-select class="select select_create-order expiration__select select__no-user-select" ng-model="$ctrl.fee" up-direction="true">
<w-option ng-repeat="fee in $ctrl.feeList track by fee.asset.displayName" value="fee">
{{fee.toFormat()}} {{(fee.asset.ticker || fee.asset.displayName)}}
</w-option>
Expand All @@ -241,7 +241,7 @@

<div class="expiration__item expiration__item-acting">
<div class="expiration__label" w-i18n="directives.createOrder.expiration"></div>
<w-select class="expiration__select select__no-user-select" ng-model="$ctrl.expiration" up-direction="true">
<w-select class="select select_create-order expiration__select select__no-user-select" ng-model="$ctrl.expiration" up-direction="true">
<w-option ng-repeat="option in $ctrl.expirationValues track by option.name"
value="::option.name"
w-app-class>
Expand Down
53 changes: 10 additions & 43 deletions src/modules/dex/directives/createOrder/expiration.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,50 +33,17 @@
margin-left: 5px;
}

.select {
position: static;

.title {
padding: 2px 15px 2px 5px;
border: 1px solid transparent;
w-option {
.option {
display: block;
text-align: right;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
padding: 2px 12px;
line-height: 20px;
font-size: @font-size-caption-2;

&::after {
right: 0;
background-image: @select-arrow-icon;
background-repeat: no-repeat;
background-size: 90%;
}
}

.select-list {
box-shadow: @dropdown-shadow;
border: 0;
border-radius: 4px;
padding: 5px 0;
width: auto;

w-option {
.option {
display: block;
text-align: right;
overflow: hidden;
width: 100%;
text-overflow: ellipsis;
padding: 2px 12px;
line-height: 20px;
font-size: @font-size-caption-2;
color: @color-basic-900;
}
}
}

&.expanded {
.title {
&:after {
background-image: @select-arrow-active-icon;
}
}
color: @color-basic-900;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/modules/dex/directives/dexWatchlist/DexWatchlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<w-select ng-model="$ctrl.dropDownId"
ng-class="{'active': $ctrl.isActiveSelect}"
class="select__no-user-select">
class="select select_watch-list select__no-user-select">
<w-option ng-repeat="option in $ctrl.dropDown track by option.id"
value="::option.id">
{{::option.name}}
Expand Down
88 changes: 2 additions & 86 deletions src/modules/dex/directives/dexWatchlist/DexWatchlist.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,42 +83,7 @@
display: none;
}

w-select {
position: relative;
z-index: 6;

.select-list {
max-height: 155px;
overflow: auto;
border-color: @color-basic-100;
color: @color-basic-700;
}

.title {
background: @color-white;
font-size: @font-size-caption-2;
color: @color-basic-700;
font-family: @font-roboto-medium;
height: 39px;
padding-right: 30px;
border: 1px solid transparent;

&::after {
right: 13px;
transform: translateY(0);
top: 13px;
background-size: 80%;
background-repeat: no-repeat;
background-position: center left;
}
}

.select &.expanded {
.title {
border: 1px solid #000;
}
}

.select {
w-option {
font-size: @font-size-caption-2;
color: @color-basic-700;
Expand All @@ -130,55 +95,6 @@
color: @color-basic-700;
}
}

&.active {
border-radius: 0;
border: 0 none;

.title {
border-left: 1px solid @color-basic-100;
border-right: 1px solid @color-basic-100;
border-radius: 0;

&::before {
content: '';
display: block;
width: calc(100% ~'- 2px');
height: 2px;
background: @color-white;
position: absolute;
z-index: 1;
bottom: -2px;
left: 1px;
}
}

&::after {
content: '';
display: block;
width: 100%;
height: 2px;
background: @color-submit-400;
position: absolute;
z-index: 1;
top: 0;
left: 0;
}

.select-list {
border-radius: 0;
}
}

&:not(.active) {
.expanded {
.title {
border: 1px solid @color-basic-100;
border-bottom: 0 none;
}
}
}

}
}

Expand Down Expand Up @@ -285,7 +201,7 @@
}

.wrapper {
.titles-wrap .select a.title {
.titles-wrap .select__wrap a.select__title {
font-size: 13px;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/modules/dex/less/dex.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ body.dex-demo {
.titles-wrap {
height: 42px;

.select {
.select-list {
.select__wrap {
.select__list {
height: 42px;
font-size: 13px;
}
Expand All @@ -140,7 +140,7 @@ body.dex-demo {
font-size: 13px;
}

.title {
.select__title {
height: 41px;
font-size: 13px;
}
Expand Down
16 changes: 8 additions & 8 deletions src/modules/saveSeed/less/saveSeed.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,28 @@ body.saveSeed {
background-position: center;
}

w-select {
.select-list {
.select {
.select__list {
max-height: 300px;
overflow: auto;
}

.title-content .icon-remove-user {
.select__title-content .icon-remove-user {
display: none;
}

.title-content, .option {
.select__title-content, .option {
display: flex;
flex-direction: row;
align-items: center;
}
}

w-select.one-item {
.title-content .icon-remove-user {
.select.one-item {
.select__title-content .icon-remove-user {
display: inline-block;
}
.title {
.select__title {
padding: 0 0 0 15px;
}
}
Expand All @@ -71,7 +71,7 @@ body.saveSeed {
}

.input-like,
w-select {
.select {
.has-name {
.address {
color: @color-basic-500;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/saveSeed/templates/saveSeedHasUsers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
one-item="$ctrl.userList.length <= 1"
disabled="$ctrl.userList.length <= 1"
hide-active="::false"
class="big margin-3">
class="select big margin-3">
<w-option ng-repeat="user in $ctrl.userList track by user.address"
value="::user.address">

Expand Down
6 changes: 3 additions & 3 deletions src/modules/sessions/less/sessions.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
padding: 0;
margin: 60px 0 30px 0;

w-select,
.select,
.input-like {
display: flex;
flex-direction: row;
Expand Down Expand Up @@ -46,11 +46,11 @@
background-position: center;
}

.title-content .icon-remove-user {
.select__title-content .icon-remove-user {
display: none;
}

.title-content,
.select__title-content,
.option {
display: flex;
flex-direction: row;
Expand Down
2 changes: 1 addition & 1 deletion src/modules/sessions/templates/sessions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ul>

<div class="sessions-holder">
<w-select class="big" ng-if="$ctrl.session.address.length > 3" ng-model="$ctrl.activeSession">
<w-select class="select big" ng-if="$ctrl.session.address.length > 3" ng-model="$ctrl.activeSession">
<w-option ng-repeat="session in $ctrl.sessions track by session.address"
value="{{::session.address}}">
<w-avatar class="margin-right-1" address="session.address" size="30"></w-avatar>
Expand Down
16 changes: 8 additions & 8 deletions src/modules/signIn/less/signIn.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,28 +35,28 @@ body.signIn {
background-position: center;
}

w-select {
.select-list {
.select {
.select__list {
max-height: 300px;
overflow: auto;
}

.title-content .icon-remove-user {
.select__title-content .icon-remove-user {
display: none;
}

.title-content, .option {
.select__title-content, .option {
display: flex;
flex-direction: row;
align-items: center;
}
}

w-select.one-item {
.title-content .icon-remove-user {
.select.one-item {
.select__title-content .icon-remove-user {
display: inline-block;
}
.title {
.select__title {
padding: 0 0 0 15px;
}
}
Expand All @@ -69,7 +69,7 @@ body.signIn {
}

.input-like,
w-select {
.select {
.has-name {
.address {
color: @color-basic-500;
Expand Down
Loading