From 46a79f98d3498f40b90734726c64a7f1583cc3eb Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Thu, 3 Oct 2019 18:45:12 +0300 Subject: [PATCH 01/14] DEXW-2206: fix ui --- src/modules/ui/directives/footer/footer.less | 6 +++--- .../mainHeader/less/largeHeader/switch-account.less | 2 +- .../mainHeader/less/largeHeader/user-account.less | 2 +- .../ui/directives/transactionList/transactionList.less | 6 ++++++ .../receiveCryptocurrency/receive-cryptocurrency.html | 2 +- src/themeConfig/black/config.less | 1 + src/themeConfig/black/icons.less | 2 +- src/themeConfig/default/config.less | 1 + 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/modules/ui/directives/footer/footer.less b/src/modules/ui/directives/footer/footer.less index 5f101eda84..62330ff4e7 100644 --- a/src/modules/ui/directives/footer/footer.less +++ b/src/modules/ui/directives/footer/footer.less @@ -4,7 +4,7 @@ .footer { display: block; - background: @color-basic-900; + background: @footer-background; &__wrap { max-width: 1440px; @@ -21,7 +21,7 @@ margin-bottom: 24px; text-transform: uppercase; font-size: 13px; - color: @color-basic-700; + color: @footer-color-title; } &__link { @@ -31,7 +31,7 @@ transition: color 0.3s; &:hover { - color: @color-white; + color: @white-only; } &_support { diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less b/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less index 151ff54149..e3f138d86e 100644 --- a/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less +++ b/src/modules/ui/directives/mainHeader/less/largeHeader/switch-account.less @@ -32,7 +32,7 @@ &__list { flex: 1; - max-height: 195px; + max-height: 186px; padding: 4px 20px 4px 0; overflow: auto; overflow-x: hidden; diff --git a/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less b/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less index 5a88a439b6..20f961cf51 100644 --- a/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less +++ b/src/modules/ui/directives/mainHeader/less/largeHeader/user-account.less @@ -10,7 +10,7 @@ padding-bottom: 10px; display: flex; flex-direction: column; - border-bottom: 1px solid @color-info-50; + border-bottom: 1px solid @header-user-account-border; max-width: 249px; &__name { diff --git a/src/modules/ui/directives/transactionList/transactionList.less b/src/modules/ui/directives/transactionList/transactionList.less index b40e35fea9..ce8f48df5c 100644 --- a/src/modules/ui/directives/transactionList/transactionList.less +++ b/src/modules/ui/directives/transactionList/transactionList.less @@ -70,6 +70,12 @@ w-transaction-list { border-bottom: 1px solid @color-basic-50; } + &:last-child { + .w-visible { + border-bottom: none; + } + } + &:hover { background: @hover-default; } diff --git a/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html b/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html index 080c130e91..c07f36a87b 100644 --- a/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html +++ b/src/modules/utils/modals/receive/receiveCryptocurrency/receive-cryptocurrency.html @@ -77,7 +77,7 @@ -
+
diff --git a/src/themeConfig/black/config.less b/src/themeConfig/black/config.less index 88539a1f10..b01ceac6c3 100644 --- a/src/themeConfig/black/config.less +++ b/src/themeConfig/black/config.less @@ -9,6 +9,7 @@ @fader-opacity: .3; @fader-background: #000; @header-dropdown-hover: #353535; +@header-user-account-border: #424242; @dex-selected-item-bg: #353535; diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index ea409d4f1d..4c10094ba2 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -1,5 +1,5 @@ @logo-header: url(/img/icons/wavesdex-invert-32.svg); -@logo-footer: url(/img/icons/wavesdex-black-32.svg); +@logo-footer: url(/img/icons/wavesdex-invert-32.svg); /* mobile and top menu icons */ @power-icon: url(/img/icons/dark/menu/power-disabled-600.svg); diff --git a/src/themeConfig/default/config.less b/src/themeConfig/default/config.less index e6373c9c2b..cd23a624d1 100644 --- a/src/themeConfig/default/config.less +++ b/src/themeConfig/default/config.less @@ -9,6 +9,7 @@ @fader-opacity: .3; @fader-background: @color-basic-900; @header-dropdown-hover: @color-info-50; +@header-user-account-border: @color-info-50; @dex-selected-item-bg: @color-info-50; From 5e31985d51f66e1cacd26941ebb3528f8d1ea392 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Fri, 4 Oct 2019 12:17:48 +0300 Subject: [PATCH 02/14] DEXW-2206: some fix --- src/img/icons/icon-removeacc.svg | 6 ++---- src/img/icons/select-arrow-black.svg | 3 +++ src/modules/dex/directives/createOrder/createOrder.less | 4 ++-- src/modules/ui/directives/actions/action-item.less | 3 ++- src/modules/ui/directives/actions/actions.less | 4 ++-- .../utils/modals/changeToken/change-token-modal.less | 1 + src/modules/utils/modals/settings/settings.html | 6 +++--- src/themeConfig/black/config.less | 1 + src/themeConfig/black/icons.less | 2 +- src/themeConfig/default/config.less | 1 + 10 files changed, 18 insertions(+), 13 deletions(-) create mode 100644 src/img/icons/select-arrow-black.svg diff --git a/src/img/icons/icon-removeacc.svg b/src/img/icons/icon-removeacc.svg index 9be3a96934..886b1c8c0f 100644 --- a/src/img/icons/icon-removeacc.svg +++ b/src/img/icons/icon-removeacc.svg @@ -1,8 +1,6 @@ - - - - + + diff --git a/src/img/icons/select-arrow-black.svg b/src/img/icons/select-arrow-black.svg new file mode 100644 index 0000000000..cd4024a26e --- /dev/null +++ b/src/img/icons/select-arrow-black.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index ab9feb0854..e6cdf0c6c7 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -257,8 +257,8 @@ w-create-order { width: 50%; padding: 6px 11px; background-color: @color-basic-50; - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; + border-top-right-radius: @border-radius / 2; + border-bottom-right-radius: @border-radius / 2; text-align: right; } } diff --git a/src/modules/ui/directives/actions/action-item.less b/src/modules/ui/directives/actions/action-item.less index c4d66b743a..75e4063cc1 100644 --- a/src/modules/ui/directives/actions/action-item.less +++ b/src/modules/ui/directives/actions/action-item.less @@ -1,8 +1,9 @@ @import (reference) 'config'; .action-item { - padding: 8px 20px; + padding: 8px 10px; display: block; + border-radius: @border-radius; &:hover { background-color: @color-basic-50; diff --git a/src/modules/ui/directives/actions/actions.less b/src/modules/ui/directives/actions/actions.less index 94de0d31d0..f6e1d0ffad 100644 --- a/src/modules/ui/directives/actions/actions.less +++ b/src/modules/ui/directives/actions/actions.less @@ -23,9 +23,9 @@ right: 20px; top: 0; margin-bottom: 10px; - padding: 17px 0; + padding: 17px 10px; background-color: @color-white; - box-shadow: @shadow-buttons-default; + box-shadow: @shadow-portfolio-dropdown; border-radius: @border-radius; &.expanded { diff --git a/src/modules/utils/modals/changeToken/change-token-modal.less b/src/modules/utils/modals/changeToken/change-token-modal.less index e95aa93700..24c1e9c928 100644 --- a/src/modules/utils/modals/changeToken/change-token-modal.less +++ b/src/modules/utils/modals/changeToken/change-token-modal.less @@ -70,6 +70,7 @@ md-dialog.change-token { max-height: 200px; overflow: auto; align-items: flex-start; + margin-top: 4px; } padding: 12px 0; diff --git a/src/modules/utils/modals/settings/settings.html b/src/modules/utils/modals/settings/settings.html index 76c9cbc9a3..27620cff5c 100644 --- a/src/modules/utils/modals/settings/settings.html +++ b/src/modules/utils/modals/settings/settings.html @@ -159,12 +159,12 @@
{{::$ctrl.publicKey}}
-
+
{{::$ctrl.address}}
-
+
@@ -173,7 +173,7 @@
-
+
diff --git a/src/themeConfig/black/config.less b/src/themeConfig/black/config.less index b01ceac6c3..a250afd489 100644 --- a/src/themeConfig/black/config.less +++ b/src/themeConfig/black/config.less @@ -203,6 +203,7 @@ @shadow-buttons-hover: 0 2px 8px 0 rgba(0, 0, 0, 0.4); @shadow-tooltip-confirm: 0 0 20px rgba(0, 0, 0, 0.5); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); +@shadow-portfolio-dropdown: 0 4px 18px 0 rgba(0, 0, 0, .5); // Hovers @hover-default: rgba(53, 53, 53, .7); diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 4c10094ba2..a2e8086ac3 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -135,7 +135,7 @@ @arrow-right-white-icon: url(/img/icons/arrow-right-white.svg); @smart-asset-marker-icon: url(/img/icons/smart-asset-marker.svg); @sponsored-asset-marker-icon: url(/img/icons/sponosred-asset-marker.svg); -@select-arrow-icon: url(/img/icons/select-arrow.svg); +@select-arrow-icon: url(/img/icons/select-arrow-black.svg); @select-arrow-active-icon: url(/img/icons/select-arrow-active.svg); @migrate-lock-icon: url(/img/icons/lock-basic-200.svg); @migrate-success-icon: url(/img/icons/migrate-success.svg); diff --git a/src/themeConfig/default/config.less b/src/themeConfig/default/config.less index cd23a624d1..7fba8e98ae 100644 --- a/src/themeConfig/default/config.less +++ b/src/themeConfig/default/config.less @@ -204,6 +204,7 @@ @shadow-buttons-hover: 0 2px 8px 1px rgba(199, 210, 222, 0.6); @shadow-tooltip-confirm: 0 0 19px rgba(97, 116, 144, 0.25); @shadow-dex-welcome: 0 1px 4px 0 rgba(203, 221, 239, 0.2); +@shadow-portfolio-dropdown: 0 2px 4px 0 rgba(218, 225, 233, 0.5); // Hovers @hover-default: rgba(248, 249, 251, .5); From bad3a1cd1009e82bd78e2e54de7970475f2de267 Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Fri, 4 Oct 2019 12:41:57 +0300 Subject: [PATCH 03/14] DEXW-2206: fix height layout dex --- .../directives/createOrder/createOrder.less | 391 +++++++++--------- .../less/dex-layout__column_createorder.less | 2 +- .../less/dex-layout__column_orderbook.less | 2 +- 3 files changed, 197 insertions(+), 198 deletions(-) diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index ab9feb0854..2da63ea413 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -26,7 +26,6 @@ w-create-order { .plate-note { padding: 6px 14px; - font-family: 'Roboto-Medium', sans-serif; } .split-half { @@ -90,262 +89,262 @@ w-create-order { background-size: 10px; background-position: center; } +} - .create-order { - position: relative; +.create-order { + position: relative; - w-input { - .w-input-wrap { - input { - color: @color-disabled-900; - background: @color-white; + w-input { + .w-input-wrap { + input { + color: @color-disabled-900; + background: @color-white; - &[type="text"].tiny { - padding: 0 16px; - } + &[type="text"].tiny { + padding: 0 16px; } } } - .head { - align-items: center; - width: 100%; - padding: 0 16px; - height: 30px; - position: relative; + } + .head { + align-items: center; + width: 100%; + padding: 0 16px; + height: 30px; + position: relative; + display: none; + border-bottom: 1px solid @color-disabled-100; + } + + .body { + .choice { display: none; - border-bottom: 1px solid @color-disabled-100; + flex-direction: row; + position: relative; + z-index: 2; + text-transform: uppercase; + background-color: @color-white; + + .choose { + width: 50%; + flex-grow: 1; + height: 50px; + padding-top: 8px; + text-align: center; + cursor: pointer; + color: @white-only; + + .name { + font-size: @font-size-caption-2; + text-transform: uppercase; + } + + .price { + .footnote-2(); + } + + &.sell { + background: @color-error-400; + } + + &.buy { + background: @color-submit-400; + } + + &.inactive { + background: black; + } + } + + .middle { + width: 70px; + padding-top: 15px; + text-align: center; + } } - .body { - .choice { - display: none; + .making-order { + .create-order-notification { + z-index: 1; + } + + .areas { + display: flex; flex-direction: row; position: relative; - z-index: 2; - text-transform: uppercase; - background-color: @color-white; + z-index: 3; - .choose { + .area { width: 50%; flex-grow: 1; - height: 50px; - padding-top: 8px; - text-align: center; + height: 38px; + color: @color-disabled-400; + border-bottom: 1px solid @color-basic-100; cursor: pointer; - color: @white-only; + background: @color-white; + text-align: center; + border-top: 2px solid @color-white; .name { - font-size: @font-size-caption-2; + line-height: 32px; text-transform: uppercase; } - .price { - .footnote-2(); + &:first-child { + border-right: 1px solid @color-basic-100; } - &.sell { - background: @color-error-400; - } + .spread { + position: absolute; + left: 50%; + transform: translate(-50%, 50px); + margin-top: -12px; - &.buy { - background: @color-submit-400; - } + span { + display: block; + text-align: center; + } - &.inactive { - background: black; + .spread-label { + font-size: 9px; + } } } - - .middle { - width: 70px; - padding-top: 15px; - text-align: center; - } } - .making-order { - .create-order-notification { - z-index: 1; - } - - .areas { - display: flex; - flex-direction: row; - position: relative; - z-index: 3; - - .area { - width: 50%; - flex-grow: 1; - height: 38px; - color: @color-disabled-400; - border-bottom: 1px solid @color-basic-100; - cursor: pointer; - background: @color-white; - text-align: center; - border-top: 2px solid @color-white; - - .name { - line-height: 32px; - text-transform: uppercase; - } + .fields { + padding: 6px 25px 17px; + background: @color-white; - &:first-child { - border-right: 1px solid @color-basic-100; - } + .field-label { + margin-top: 8px; + padding-bottom: 4px; + } - .spread { - position: absolute; - left: 50%; - transform: translate(-50%, 50px); - margin-top: -12px; + .field-fee { + margin: 13px 0; - span { - display: block; - text-align: center; - } - - .spread-label { - font-size: 9px; - } - } + span:last-child { + margin-left: 5px; } } - .fields { - padding: 6px 25px 17px; - background: @color-white; - - .field-label { - margin-top: 8px; - padding-bottom: 4px; + w-input-container.invalid { + .input-like { + border: 1px solid @color-error-200; } + } + + .input-like { + padding: 0; + display: flex; + align-items: center; + border-radius: @border-radius / 2; - .field-fee { - margin: 13px 0; + w-input { + display: block; + width: 50%; - span:last-child { - margin-left: 5px; + input { + height: 28px; + border: none; } } - w-input-container.invalid { - .input-like { - border: 1px solid @color-error-200; - } + .asset-name-wrap { + position: relative; + height: 100%; + width: 50%; + padding: 6px 11px; + background-color: @color-basic-50; + border-top-right-radius: @border-radius; + border-bottom-right-radius: @border-radius; + text-align: right; } + } - .input-like { - padding: 0; - display: flex; - align-items: center; - border-radius: @border-radius / 2; + .summary { + display: flex; + padding-top: 14px; + padding-bottom: 25px; + justify-content: space-between; + } - w-input { - display: block; - width: 50%; + .place-order { + width: 100%; + color: @white-only; + border: none; + height: 36px; + box-shadow: none; + border-radius: @border-radius / 2; + } + } - input { - height: 28px; - border: none; - } - } + button.micro { + &[disabled] { + border: 1px solid @color-accent-50; + color: @color-basic-500; + } + } - .asset-name-wrap { - position: relative; - height: 100%; - width: 50%; - padding: 6px 11px; - background-color: @color-basic-50; - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; - text-align: right; - } - } + &.buy { + .areas .area.buy { + border-top: 2px solid @color-submit-400; + border-bottom: 1px solid @color-white; + cursor: default; + opacity: 1; + } - .summary { - display: flex; - padding-top: 14px; - padding-bottom: 25px; - justify-content: space-between; + button.place-order { + background: @color-submit-400; + &:hover { + background: @color-submit-600; } - - .place-order { - width: 100%; - color: @white-only; - border: none; - height: 36px; - box-shadow: none; - border-radius: @border-radius / 2; + &:active { + background: @color-submit-700; } - } - - button.micro { &[disabled] { - border: 1px solid @color-accent-50; - color: @color-basic-500; + background: @color-submit-400; + opacity: 0.3; } } + } - &.buy { - .areas .area.buy { - border-top: 2px solid @color-submit-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; - } - - button.place-order { - background: @color-submit-400; - &:hover { - background: @color-submit-600; - } - &:active { - background: @color-submit-700; - } - &[disabled] { - background: @color-submit-400; - opacity: 0.3; - } - } + &.sell { + .areas .area.sell { + border-top: 2px solid @color-error-400; + border-bottom: 1px solid @color-white; + cursor: default; + opacity: 1; } - &.sell { - .areas .area.sell { - border-top: 2px solid @color-error-400; - border-bottom: 1px solid @color-white; - cursor: default; - opacity: 1; + button.place-order { + background: @color-error-400; + &:hover { + background: @color-error-600; } - - button.place-order { + &:active { + background: @color-error-700; + } + &[disabled] { background: @color-error-400; - &:hover { - background: @color-error-600; - } - &:active { - background: @color-error-700; - } - &[disabled] { - background: @color-error-400; - opacity: 0.3; - } + opacity: 0.3; } } + } - .price { - font-size: @font-size-caption-2; - line-height: 12px; + .price { + font-size: @font-size-caption-2; + line-height: 12px; - span.link { - color: @color-disabled-900; - font-size: @font-size-caption-2; - line-height: 13px; - height: auto; + span.link { + color: @color-disabled-900; + font-size: @font-size-caption-2; + line-height: 13px; + height: auto; - &.active { - color: @color-disabled-600; - } + &.active { + color: @color-disabled-600; } } } diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less b/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less index fd23e4e762..eeb7ca7dba 100644 --- a/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less +++ b/src/modules/dex/directives/layout/less/dex-layout__column_createorder.less @@ -32,7 +32,7 @@ @media screen and (min-width: 2400px) { .dex-layout { - &__createorder { + &__column_createorder { max-height: 440px; width: 360px; diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less index babfe70c75..655aad9478 100644 --- a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less +++ b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less @@ -73,7 +73,7 @@ @media screen and (min-width: 2400px) { .dex-layout { - &__orderbook { + &__column_orderbook { width: 360px; max-height: calc(100% ~'- 445px') !important; From 5251f2bae899c691d4ac57c339f03497c65138cc Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Fri, 4 Oct 2019 12:54:56 +0300 Subject: [PATCH 04/14] DEXW-2206: fix height layout dex --- .../directives/createOrder/createOrder.less | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/modules/dex/directives/createOrder/createOrder.less b/src/modules/dex/directives/createOrder/createOrder.less index bb05bbe7da..fe3a9065a3 100644 --- a/src/modules/dex/directives/createOrder/createOrder.less +++ b/src/modules/dex/directives/createOrder/createOrder.less @@ -257,8 +257,8 @@ w-create-order { width: 50%; padding: 6px 11px; background-color: @color-basic-50; - border-top-right-radius: @border-radius; - border-bottom-right-radius: @border-radius; + border-top-right-radius: @border-radius / 2; + border-bottom-right-radius: @border-radius / 2; text-align: right; } } @@ -287,7 +287,6 @@ w-create-order { } } -<<<<<<< HEAD &.buy { .areas .area.buy { border-top: 2px solid @color-submit-400; @@ -295,19 +294,6 @@ w-create-order { cursor: default; opacity: 1; } -======= - .asset-name-wrap { - position: relative; - height: 100%; - width: 50%; - padding: 6px 11px; - background-color: @color-basic-50; - border-top-right-radius: @border-radius / 2; - border-bottom-right-radius: @border-radius / 2; - text-align: right; - } - } ->>>>>>> 5e31985d51f66e1cacd26941ebb3528f8d1ea392 button.place-order { background: @color-submit-400; From a4420597617e49103ddd3c331efe756509516e30 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Fri, 4 Oct 2019 12:54:57 +0300 Subject: [PATCH 05/14] DEXW-2206: fix search input --- src/modules/dex/directives/dexWatchlist/DexWatchlist.less | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less b/src/modules/dex/directives/dexWatchlist/DexWatchlist.less index 1bf5e9c7e3..b0a436fadc 100644 --- a/src/modules/dex/directives/dexWatchlist/DexWatchlist.less +++ b/src/modules/dex/directives/dexWatchlist/DexWatchlist.less @@ -24,7 +24,8 @@ display: inline-block; width: 100%; z-index: 4; - height: 35px; + height: 32px; + min-height: 32px; w-help-icon { position: absolute; @@ -296,10 +297,6 @@ &__watchlist { max-height: calc(100% ~'- 445px'); width: 360px; - - // .loader { - // top: 60%; - // } } &__watchlist-collapsed { From 40bac87c1c744b5602318165cfaf1c9d458f4331 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Fri, 4 Oct 2019 15:29:29 +0300 Subject: [PATCH 06/14] DEXW-2206: some fix --- src/modules/ui/directives/assetInfoHead/asset-info-head.less | 1 - src/modules/ui/directives/selectFilter/selectFilter.less | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/ui/directives/assetInfoHead/asset-info-head.less b/src/modules/ui/directives/assetInfoHead/asset-info-head.less index 9395c5f1af..b0e50e03a0 100644 --- a/src/modules/ui/directives/assetInfoHead/asset-info-head.less +++ b/src/modules/ui/directives/assetInfoHead/asset-info-head.less @@ -35,7 +35,6 @@ width: calc(100% ~'+ 80px'); left: -40px; bottom: 0; - border-bottom: 1px solid @color-submit-300; } &__rating { diff --git a/src/modules/ui/directives/selectFilter/selectFilter.less b/src/modules/ui/directives/selectFilter/selectFilter.less index 4d4bf6d5fe..a5c40d34a4 100644 --- a/src/modules/ui/directives/selectFilter/selectFilter.less +++ b/src/modules/ui/directives/selectFilter/selectFilter.less @@ -14,7 +14,7 @@ w-select { w-select { div.select.expanded { position: relative; - z-index: 1; + z-index: 11; w-select-filter { display: block; From 6354067c7eadcea6a5da2dd904faba21d0db6af3 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Fri, 4 Oct 2019 15:57:02 +0300 Subject: [PATCH 07/14] DEXW-2206: portfolio --- .../smartTable/less/smart-table_mode-large.less | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less b/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less index fd607599b3..9971cdf4d6 100644 --- a/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less +++ b/src/modules/ui/directives/smartTable/less/smart-table_mode-large.less @@ -145,6 +145,22 @@ } } + .action-item { + &.icon-show { + span.tospam { + display: none; + } + } + } + + .action-item { + &.icon-hide { + span.unspam { + display: none; + } + } + } + .icon { z-index: 2; display: inline-block; From ee095d06575f8092a18029bd2c82b8bb2c9b890c Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Fri, 4 Oct 2019 17:53:40 +0300 Subject: [PATCH 08/14] DEXW-2206: fix welcome screenshot --- .../ui/directives/transaction/transactions.less | 12 ++++++++++++ src/modules/welcome/less/section-welcome.less | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/src/modules/ui/directives/transaction/transactions.less b/src/modules/ui/directives/transaction/transactions.less index 1c2dc6ba6d..8ccf90a7a3 100644 --- a/src/modules/ui/directives/transaction/transactions.less +++ b/src/modules/ui/directives/transaction/transactions.less @@ -7,6 +7,18 @@ border-radius: @border-radius; box-shadow: @shadow-type-1; background: @color-white; + + .row { + &:first-child { + border-top-left-radius: @border-radius; + border-top-right-radius: @border-radius; + } + + &:last-child { + border-bottom-left-radius: @border-radius; + border-bottom-right-radius: @border-radius; + } + } } .status-label, diff --git a/src/modules/welcome/less/section-welcome.less b/src/modules/welcome/less/section-welcome.less index da1217e278..8de9229084 100644 --- a/src/modules/welcome/less/section-welcome.less +++ b/src/modules/welcome/less/section-welcome.less @@ -103,6 +103,12 @@ } } +@media screen and (min-width: 2040px) { + .section-welcome__dex-screenshot { + background-size: 100% 100%; + } +} + @media screen and (max-width: 1440px) { .section-welcome { &__left { From b7936d26fb19c1af623353a2cd7996eb0c1c0800 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Mon, 7 Oct 2019 17:10:11 +0300 Subject: [PATCH 09/14] DEXW-2206: new fix --- src/img/icons/logo-ledger-white.svg | 6 ++++++ src/modules/signIn/templates/signIn.html | 2 +- .../ui/directives/assetInfoHead/asset-info-head.less | 8 ++++++++ src/modules/utils/modals/assetInfo/assetInfo.html | 2 +- src/modules/utils/modals/assetInfo/assetInfo.less | 6 ++++-- .../utils/modals/exportAccounts/exportAccounts.html | 6 +++--- .../utils/modals/exportAccounts/exportAccounts.less | 1 + src/themeConfig/black/icons.less | 2 +- 8 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 src/img/icons/logo-ledger-white.svg diff --git a/src/img/icons/logo-ledger-white.svg b/src/img/icons/logo-ledger-white.svg new file mode 100644 index 0000000000..93fc91f17d --- /dev/null +++ b/src/img/icons/logo-ledger-white.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/modules/signIn/templates/signIn.html b/src/modules/signIn/templates/signIn.html index c1dff8761c..c78816b91e 100644 --- a/src/modules/signIn/templates/signIn.html +++ b/src/modules/signIn/templates/signIn.html @@ -35,7 +35,7 @@
- +
diff --git a/src/modules/ui/directives/assetInfoHead/asset-info-head.less b/src/modules/ui/directives/assetInfoHead/asset-info-head.less index b0e50e03a0..42ac1e5883 100644 --- a/src/modules/ui/directives/assetInfoHead/asset-info-head.less +++ b/src/modules/ui/directives/assetInfoHead/asset-info-head.less @@ -4,6 +4,14 @@ .asset-info-head { display: flex; + &_p-40 { + padding: 0 40px; + + @media screen and (max-width: 768px) { + padding: 0 20px; + } + } + &__head { height: 130px; position: relative; diff --git a/src/modules/utils/modals/assetInfo/assetInfo.html b/src/modules/utils/modals/assetInfo/assetInfo.html index b34f825198..d35f018dfb 100644 --- a/src/modules/utils/modals/assetInfo/assetInfo.html +++ b/src/modules/utils/modals/assetInfo/assetInfo.html @@ -1,6 +1,6 @@
- +
-

-
+
@@ -21,7 +21,7 @@ class="exportAccounts-modal__avatar">
diff --git a/src/modules/utils/modals/exportAccounts/exportAccounts.less b/src/modules/utils/modals/exportAccounts/exportAccounts.less index 8314c331d8..a75ca18027 100644 --- a/src/modules/utils/modals/exportAccounts/exportAccounts.less +++ b/src/modules/utils/modals/exportAccounts/exportAccounts.less @@ -98,6 +98,7 @@ &__password { margin-right: 5px; color: @color-basic-900; + font-size: 15px; } &__form { diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 1f5c861be0..1425ce15bb 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -120,7 +120,7 @@ @import-modal-icon-beta: url(/img/icons/logo-beta.svg); @import-modal-icon-old: url(/img/icons/logo-alfa.svg); -@import-modal-icon-ledger: url(/img/icons/logo-ledger.svg); +@import-modal-icon-ledger: url(/img/icons/logo-ledger-white.svg); @import-modal-icon-keeper: url(/img/icons/keeper-icon.svg); @import-modal-icon-error: url(/img/icons/icon-error-import.svg); @not-saved-account-icon: url(/img/icons/userimg-empty-box-150.svg); From ef0743f6ee1a5370cab00af761473555373df677 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Tue, 8 Oct 2019 10:30:00 +0300 Subject: [PATCH 10/14] DEXW-2206: fix ui --- locale/de/app.utils.json | 2 +- locale/en/app.utils.json | 4 +-- locale/es/app.utils.json | 2 +- locale/et_EE/app.utils.json | 2 +- locale/fr/app.utils.json | 2 +- locale/hi_IN/app.utils.json | 2 +- locale/id/app.utils.json | 2 +- locale/ja/app.utils.json | 2 +- locale/ko/app.utils.json | 2 +- locale/nl_NL/app.utils.json | 2 +- locale/pl/app.utils.json | 2 +- locale/pt_BR/app.utils.json | 2 +- locale/pt_PT/app.utils.json | 4 +-- locale/ru/app.utils.json | 6 ++-- locale/tr/app.utils.json | 2 +- locale/zh_CN/app.utils.json | 2 +- .../icons/dark/import-keystore-file-dark.svg | 13 +++++++++ .../utils/modals/settings/settings.html | 29 +++++++++---------- src/themeConfig/black/icons.less | 2 +- 19 files changed, 48 insertions(+), 36 deletions(-) create mode 100644 src/img/icons/dark/import-keystore-file-dark.svg diff --git a/locale/de/app.utils.json b/locale/de/app.utils.json index 4240daae28..f51d6323d0 100644 --- a/locale/de/app.utils.json +++ b/locale/de/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Backup Phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Codierter Seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privat Schlüssel", "publicKey": "Öffentlicher Schlüssel", diff --git a/locale/en/app.utils.json b/locale/en/app.utils.json index 7aaac7f724..7cb3a7cc0b 100644 --- a/locale/en/app.utils.json +++ b/locale/en/app.utils.json @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Export account", + "devicePairing": "Export account to app", "header": "Scan Pairing Code", "showCodeLink": "Show Pairing Code", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Backup phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Private key", "publicKey": "Public Key", diff --git a/locale/es/app.utils.json b/locale/es/app.utils.json index 1baebb0519..ec6ac0e2db 100644 --- a/locale/es/app.utils.json +++ b/locale/es/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frase de Recuperación", "base58Seed": "Frase de seguridad (SEED) codificada", "encodedSeed": "Semilla codificada", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Clave privada", "publicKey": "Clave pública", diff --git a/locale/et_EE/app.utils.json b/locale/et_EE/app.utils.json index d862093626..e06e3d6c13 100644 --- a/locale/et_EE/app.utils.json +++ b/locale/et_EE/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Salafraas", "base58Seed": "Encoded backup phrase", "encodedSeed": "Kodeeritud salafraas", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privaatne võti", "publicKey": "Avalik võti", diff --git a/locale/fr/app.utils.json b/locale/fr/app.utils.json index 8547375703..3948625475 100644 --- a/locale/fr/app.utils.json +++ b/locale/fr/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Phrase de sauvegarde", "base58Seed": "Encoded backup phrase", "encodedSeed": "SEED encodée", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Clé privée", "publicKey": "Clé publique", diff --git a/locale/hi_IN/app.utils.json b/locale/hi_IN/app.utils.json index 3d8f520f3c..094778f3b4 100644 --- a/locale/hi_IN/app.utils.json +++ b/locale/hi_IN/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "बैकअप वाक्य", "base58Seed": "Encoded backup phrase", "encodedSeed": "इनकोडेड सीड", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "निजी कुंजी", "publicKey": "सार्वजनिक कुंजी", diff --git a/locale/id/app.utils.json b/locale/id/app.utils.json index aaf3eabdd7..4a9c43a11c 100644 --- a/locale/id/app.utils.json +++ b/locale/id/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frasa cadangan", "base58Seed": "Encoded backup phrase", "encodedSeed": "SEED terenkode", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Kunci pribadi", "publicKey": "Kunci Publik", diff --git a/locale/ja/app.utils.json b/locale/ja/app.utils.json index 64e03c4bfa..c8aa62d66f 100644 --- a/locale/ja/app.utils.json +++ b/locale/ja/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "バックアップフレーズ", "base58Seed": "Encoded backup phrase", "encodedSeed": "エンコードされたシード", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "秘密鍵", "publicKey": "公開鍵", diff --git a/locale/ko/app.utils.json b/locale/ko/app.utils.json index bcd038792a..b459fffd33 100644 --- a/locale/ko/app.utils.json +++ b/locale/ko/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "백업 구절", "base58Seed": "Encoded backup phrase", "encodedSeed": "암호화된 백업 구절", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "프라이빗 키", "publicKey": "퍼블릭 키", diff --git a/locale/nl_NL/app.utils.json b/locale/nl_NL/app.utils.json index 5d1ccea3b8..b8211046a8 100644 --- a/locale/nl_NL/app.utils.json +++ b/locale/nl_NL/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Backup regel", "base58Seed": "Gecodeerde back-upzin", "encodedSeed": "Gecodeerde seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Privésleutel", "publicKey": "Publieke sleutel", diff --git a/locale/pl/app.utils.json b/locale/pl/app.utils.json index b0824127b5..38f564ddef 100644 --- a/locale/pl/app.utils.json +++ b/locale/pl/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Kopia zapasowa wyrażenia", "base58Seed": "Encoded backup phrase", "encodedSeed": "Zakodowany SEED", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Klucz prywatny", "publicKey": "Klucz publiczny", diff --git a/locale/pt_BR/app.utils.json b/locale/pt_BR/app.utils.json index 6ffb016790..dc2708daa7 100644 --- a/locale/pt_BR/app.utils.json +++ b/locale/pt_BR/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Frase de Backup", "base58Seed": "Encoded backup phrase", "encodedSeed": "Seed codificado", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Chave Privada", "publicKey": "Chave Pública", diff --git a/locale/pt_PT/app.utils.json b/locale/pt_PT/app.utils.json index faad0b9430..316ca219c7 100644 --- a/locale/pt_PT/app.utils.json +++ b/locale/pt_PT/app.utils.json @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Export account", + "devicePairing": "Export account to app", "header": "Scan Pairing Code", "showCodeLink": "Show Pairing Code", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Backup phrase", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded seed", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Private key", "publicKey": "Public Key", diff --git a/locale/ru/app.utils.json b/locale/ru/app.utils.json index 6a333e66fa..8ff459393c 100644 --- a/locale/ru/app.utils.json +++ b/locale/ru/app.utils.json @@ -610,7 +610,7 @@ "notEnoughFunds": "У вас недостаточно средств для оплаты комиссии. Вам необходимо оплатить комиссию за транзакцию {{fee, money-currency}}.", "notEnoughFundsWithdraw": "У вас недостаточно средств для отправки транзакции. Вам необходимо оплатить комиссию за транзакцию {{fee, money-currency}} и комиссию шлюза {{getawayFee, BigNumber}} {{currency}}. Минимальная сумма для отправки составляет {{minGatewayAmount, BigNumber}} {{currency}}." }, - "withdrawTitle": "Withdraw" + "withdrawTitle": "Вывод" }, "sepa": { "countryList": "Список допустимых стран и ID", @@ -695,7 +695,7 @@ }, "ok": "Sign in", "pairing": { - "devicePairing": "Экспортировать аккаунт", + "devicePairing": "Экспорт аккаунта в приложение", "header": "Отсканируйте QR-код", "showCodeLink": "Показать QR-код", "unavailable": { @@ -717,7 +717,7 @@ "backupPhrase": "Секретная фраза", "base58Seed": "Закодированная секретная фраза", "encodedSeed": "Зашифрованная секретная фраза", - "exportAccount": "Экспортировать аккаунт", + "exportAccount": "Экспорт аккаунта в файл", "id": "ID аккаунта", "privateKey": "Приватный ключ", "publicKey": "Публичный ключ", diff --git a/locale/tr/app.utils.json b/locale/tr/app.utils.json index 37c63675c4..8280643e85 100644 --- a/locale/tr/app.utils.json +++ b/locale/tr/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "Anahtar (Yedek) kelimeler", "base58Seed": "Encoded backup phrase", "encodedSeed": "Encoded Anahtar kelimeler", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "Account ID", "privateKey": "Özel Anahtar", "publicKey": "Açık Anahtar", diff --git a/locale/zh_CN/app.utils.json b/locale/zh_CN/app.utils.json index bcb61d1f5b..404b495412 100644 --- a/locale/zh_CN/app.utils.json +++ b/locale/zh_CN/app.utils.json @@ -717,7 +717,7 @@ "backupPhrase": "备份短语", "base58Seed": "编码备份短语", "encodedSeed": "编码的SEED", - "exportAccount": "Export account", + "exportAccount": "Export account to file", "id": "帐户ID", "privateKey": "私钥", "publicKey": "公钥", diff --git a/src/img/icons/dark/import-keystore-file-dark.svg b/src/img/icons/dark/import-keystore-file-dark.svg new file mode 100644 index 0000000000..ab09a520f0 --- /dev/null +++ b/src/img/icons/dark/import-keystore-file-dark.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/modules/utils/modals/settings/settings.html b/src/modules/utils/modals/settings/settings.html index 27620cff5c..3b1eda7ba1 100644 --- a/src/modules/utils/modals/settings/settings.html +++ b/src/modules/utils/modals/settings/settings.html @@ -87,25 +87,10 @@ -
- -
-
-
- -
-
- -
{{$ctrl.blockHeight}}
@@ -164,6 +149,20 @@
{{::$ctrl.address}}
+ +
+
+
+ +
+
+ +
diff --git a/src/themeConfig/black/icons.less b/src/themeConfig/black/icons.less index 1425ce15bb..58d2ba93d6 100644 --- a/src/themeConfig/black/icons.less +++ b/src/themeConfig/black/icons.less @@ -154,4 +154,4 @@ @dex-screenshot: url(/img/landing/dex-screenshot.png); @importBackupFile-icon: url(/img/icons/keystore-file.svg); @importBackupPassword-icon: url(/img/icons/backup-password.svg); -@importKeyStore-file-icon: url(/img/icons/import-keystore-file.svg); +@importKeyStore-file-icon: url(/img/icons/dark/import-keystore-file-dark.svg); From 50b888c0f9ff0e5681d077252ec28fa8650f2c51 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Tue, 8 Oct 2019 12:50:13 +0300 Subject: [PATCH 11/14] DEXW-2206: change icon --- .../icons/dark/import-keystore-file-dark.svg | 26 +++--- .../ui/directives/tabs/less/tabs_default.less | 81 ++++--------------- 2 files changed, 31 insertions(+), 76 deletions(-) diff --git a/src/img/icons/dark/import-keystore-file-dark.svg b/src/img/icons/dark/import-keystore-file-dark.svg index ab09a520f0..a5ba926c74 100644 --- a/src/img/icons/dark/import-keystore-file-dark.svg +++ b/src/img/icons/dark/import-keystore-file-dark.svg @@ -1,13 +1,21 @@ - + + + + Icon/40/KeystoreFile-Dark + Created with Sketch. - - - + + + + + + + - - - - + + + + - + \ No newline at end of file diff --git a/src/modules/ui/directives/tabs/less/tabs_default.less b/src/modules/ui/directives/tabs/less/tabs_default.less index d4ae4c6ca3..b4bf7919d7 100644 --- a/src/modules/ui/directives/tabs/less/tabs_default.less +++ b/src/modules/ui/directives/tabs/less/tabs_default.less @@ -57,21 +57,6 @@ min-height: 60px; cursor: pointer; position: relative; - - // &_active { - // color: @color-submit-400; - - // &::after { - // position: absolute; - // z-index: 1; - // content: ''; - // width: 100%; - // height: 1px; - // display: block; - // bottom: 0; - // background: @color-submit-400; - // } - // } } } @@ -112,20 +97,10 @@ w-confirm-transaction { height: 39px; padding: 0; - &::before { + &::before, + &::after { display: none; } - - &:after { - content: ''; - display: block; - position: absolute; - width: 100%; - height: 1px; - left: 0; - bottom: 0; - background: @color-basic-100; - } } &__title { @@ -141,40 +116,22 @@ w-confirm-transaction { border-left: 1px solid transparent; border-right: 1px solid transparent; white-space: nowrap; + min-height: 38px; &:first-child { border-left: 1px solid @color-white; } - - // &_active { - // background: @color-white; - // border-bottom: 1px solid @color-white; - // border-right: 1px solid @color-disabled-200; - // border-left: 1px solid @color-disabled-200; - - // &::before { - // display: block; - // position: absolute; - // top: 0; - // left: 0; - // width: 100%; - // content: ''; - // height: 2px; - // background: @color-submit-400; - // } - - // &:after { - // position: absolute; - // bottom: -2px; - // height: 2px; - // width: 100%; - // left: 0; - // content: ''; - // display: block; - // z-index: 1; - // background: @color-white; - // } - // } + + &:after { + content: ''; + display: block; + position: absolute; + width: 101%; + height: 1px; + left: 0; + bottom: 0; + background: @color-basic-100; + } } } } @@ -231,16 +188,6 @@ w-confirm-transaction { height: 48px; line-height: 48px; min-height: 48px; - - // &_active { - // border: 0 none; - // border-bottom: 1px solid @color-submit-400; - - // &::after, - // &::before { - // display: none; - // } - // } } } } From b08fad6b7aae023c7fa9a48adb947d2e57754d5f Mon Sep 17 00:00:00 2001 From: ekomarovskaya Date: Tue, 8 Oct 2019 12:58:50 +0300 Subject: [PATCH 12/14] DEXW-2206: fix --- .../dex/directives/layout/less/dex-layout.less | 13 +++++++++++-- .../layout/less/dex-layout__column_orderbook.less | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/modules/dex/directives/layout/less/dex-layout.less b/src/modules/dex/directives/layout/less/dex-layout.less index 9c5c3aa03f..b8effcb94d 100644 --- a/src/modules/dex/directives/layout/less/dex-layout.less +++ b/src/modules/dex/directives/layout/less/dex-layout.less @@ -36,7 +36,8 @@ } &__block[data-block="tradevolume"] { - height: 38px; + height: 37px; + overflow: hidden; .block-title i { transform: rotate(-180deg); @@ -269,7 +270,7 @@ &__column { min-width: 360px; } - + &__block { min-width: 360px; } @@ -293,6 +294,14 @@ .caption-2 { font-size: 12px; } + + &_tradevolume-collapsed { + .dex-layout__column_orderbook { + .dex-layout__block[data-block="tradevolume"] { + height: 41px; + } + } + } } } diff --git a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less index 655aad9478..3dd43f49cf 100644 --- a/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less +++ b/src/modules/dex/directives/layout/less/dex-layout__column_orderbook.less @@ -216,6 +216,7 @@ max-height: 420px; margin-left: 0; order: 2; + margin-bottom: 5px; .dex-layout { &__block[data-block="tradevolume"] { From 164898d6d161c2681cf0a021d367cd176d765c12 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Tue, 8 Oct 2019 13:10:45 +0300 Subject: [PATCH 13/14] DEXW-2206: fix trade-history --- .../ui/directives/tabs/less/tabs_default.less | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/modules/ui/directives/tabs/less/tabs_default.less b/src/modules/ui/directives/tabs/less/tabs_default.less index b4bf7919d7..e0b13c494e 100644 --- a/src/modules/ui/directives/tabs/less/tabs_default.less +++ b/src/modules/ui/directives/tabs/less/tabs_default.less @@ -97,8 +97,7 @@ w-confirm-transaction { height: 39px; padding: 0; - &::before, - &::after { + &::before { display: none; } } @@ -127,7 +126,6 @@ w-confirm-transaction { display: block; position: absolute; width: 101%; - height: 1px; left: 0; bottom: 0; background: @color-basic-100; @@ -151,6 +149,20 @@ w-confirm-transaction { } } +@media screen and (max-width: 1130px) { + .dex-layout__column_tradehistory { + .tabs { + &__header::after { + display: none; + } + + &__title::after { + height: 1px; + } + } + } +} + @media screen and (max-width: 1024px) { .dex-layout__tradehistory { .tabs { From 3e2aa3dd6c0b3ec6433c3aabe6a93bf35a22e174 Mon Sep 17 00:00:00 2001 From: Vusal Gakhramanov Date: Mon, 14 Oct 2019 11:03:12 +0300 Subject: [PATCH 14/14] DEXW-2206: fix picture in landing --- src/modules/welcome/less/section-welcome.less | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/modules/welcome/less/section-welcome.less b/src/modules/welcome/less/section-welcome.less index 8de9229084..dba34c2de6 100644 --- a/src/modules/welcome/less/section-welcome.less +++ b/src/modules/welcome/less/section-welcome.less @@ -104,11 +104,21 @@ } @media screen and (min-width: 2040px) { - .section-welcome__dex-screenshot { - background-size: 100% 100%; + .section-welcome { + height: 870px; } } +@media screen and (min-width: 2400px) { + .section-welcome { + height: 970px; + + &__dex-screenshot { + top: 55px; + bottom: 55px; + } + } +} @media screen and (max-width: 1440px) { .section-welcome { &__left {