Merge branch 'dev'

README.md

@@ -1,7 +1,7 @@
 # The first listing free decentralized exchange.
 Documentation: [docs.alcor.exchange](https://docs.alcor.exchange)
 
-![Alcor Exchange](https://i.imgur.com/NnQCsmO.jpg)
+![Alcor Exchange](https://i.imgur.com/brvzFdi.png)
 
 With Alcor Exchange you can trade any EOS.IO tokens for system EOS tokens, atomically, without the participation of third parties! The token's contract should comply with the [eosio.token](https://github.com/EOSIO/eosio.contracts/tree/master/contracts/eosio.token) standard or be a [Simple Assets](https://github.com/CryptoLions/SimpleAssets) fungible token.
 

assets/_variables.scss

@@ -1,12 +1,13 @@
 :root {
   --main-green: #66c167;
   --main-action-green: #67C23A;
+  --main-action-red: #FF7262;
+  --main-wax: #F89022;
   --main-red: #f96c6c;
   --secondary-green: #1fc781;
   --black-primary: #161617;
   --radius: 4px;
   --radius-2: 8px;
-  --slider-bg: #5E5E5E;
 }
 
 [trade-theme="default"] {
@@ -58,11 +59,13 @@
   --landing-icon-bg: #111111;
   --table-background: #212121;
   --dialog-background: #212121;
+  --card-number: #161617;
 
   // buttons
   --btn-default: #333333;
   --btn-alternative: #333333;
   --btn-active: #161617;
+  --btn-outline: #161617;
   --hover: rgba(21, 21, 21, 0.3);
   --dark-btn-sm: #383838;
   --swap-tab-active: #141415;
@@ -72,8 +75,8 @@
   --text-contrast: #fff;
   --text-secondary: #d9d9d9;
   --text-grey-thirdly: #bdbdbd;
-  --text-disable: #c4c4c4;
-  --text-transparent: rgba(242, 242, 242, 0.3);
+  --text-dark: #888;
+  --text-disable: #BEC6CB;
 
   --card-shadow: 0px -0.5px 0px rgba(0, 0, 0, 0.2);
   --dropdown-shadow: 0px 12px 24px 0px rgba(18, 18, 18, 0.16);
@@ -87,12 +90,14 @@
   --active-row: #282828;
 
   --border-1: 1px solid rgba(60, 60, 67, 0.36);
-  --border-1-color: rgba(60, 60, 67, 0.36); 
   --border-2: 2px solid #3F3F3F;
 
   --selector-bg: #282828;
 
   --table-header-background: #333333;
+  --dropdown-border: #333;
+  --tab-link-border: #333;
+  --dropdown-hover: rgba(200, 200, 200, 0.1);
 
   //trade 
   --trade-bg: #212121;
@@ -104,9 +109,9 @@
   --start-bg: rgba(33, 33, 33, 1);
   --end-bg: rgba(0, 0, 0, 0);
 
-  --cancel: #c4c4c4;
+  --normal-card-shadow: #00000080;
 
-  --select-color: #333333;
+  --cancel: #c4c4c4;
 }
 
 .theme-light {
@@ -126,21 +131,24 @@
   --table-header-background: #dcdfe6;
   --dialog-background: #f5f5f9;
   --chart-actions-background: #d4d7dE;
+  --card-number: #f0f0f0;
 
   // buttons
   --btn-default: #E6E8EB;
   --btn-alternative: #fff;
-  --btn-active: #dcdfe6;
-  --hover: rgba(200, 200, 200, 0.3);
+  --btn-active: #D4D7DE;
+  --btn-outline: #fff;
+  --hover: rgba(200, 200, 200, 0.5);
   --dark-btn-sm: #e0e0e0;
   --swap-tab-active: #e0e0e0;
+
   --text-default: #303133;
-  --text-theme: #fff;
+  --text-theme: #fff; 
   --text-contrast: #000;
   --text-secondary: #606266;
+  --text-dark: #aaa;
   --text-grey-thirdly: #787878;
-  --text-disable: #c4c4c4;
-  --text-transparent: rgba(0, 0, 0, 0.3);
+  --text-disable: #303133;
 
   --border-color: #CDD0D6;
 
@@ -150,11 +158,14 @@
   --active-row: #c2deff;
 
   --border-1: 1px solid rgba(60, 60, 67, 0.36);
-  --border-1-color: rgba(60, 60, 67, 0.36); 
   --border-2: 2px solid #CDD0D6;
 
   --selector-bg: #dcdfe6;
 
+  --dropdown-border: #CDD0D6;
+  --tab-link-border: #CDD0D6;
+  --dropdown-hover: rgba(225, 225, 225, 0.5);
+
     //trade 
   --trade-bg: #F0F2F5;
   --trade-bg-secondary: #F0F2F5;
@@ -166,6 +177,6 @@
   --end-bg: rgba(0, 0, 0, 0); 
   --cancel: #303133;
 
-  --select-color: #ffffff;
+  --normal-card-shadow: #aaaaaa8a;
 }
 

assets/base.scss

@@ -1,13 +1,63 @@
-@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap');
-
-/* Chrome, Safari, Edge, Opera */
-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-  margin: 0;
-}
-
-/* Firefox */
-input[type=number] {
-  -moz-appearance: textfield !important;
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu5mxKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu7mxKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4WxKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu7WxKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu7GxKKTU1Kvnz.woff2) format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/roboto/v20/KFOmCnqEu92Fr1Mu4mxKKTU1Kg.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }

assets/dark.css

@@ -6416,14 +6416,14 @@
 .el-tooltip__popper[x-placement^=bottom] .popper__arrow {
     top: -6px;
     border-top-width: 0;
-    border-bottom-color: #161617
+    border-bottom-color: #F2F2F2
 }
 
 .el-tooltip__popper[x-placement^=bottom] .popper__arrow::after {
     top: 1px;
     margin-left: -5px;
     border-top-width: 0;
-    border-bottom-color: #161617
+    border-bottom-color: #F2F2F2
 }
 
 .el-tooltip__popper[x-placement^=right] {
@@ -9723,7 +9723,9 @@
     display: inline-block;
     text-align: center;
     cursor: pointer;
-    outline: 0
+    outline: 0;
+    height: 100%;
+    width: 100%;
 }
 
 .el-upload__input {
@@ -10166,12 +10168,10 @@
     top: -7px;
     width: 46px;
     height: 26px;
-    background: #13ce66;
+    background: #67C23A;
     text-align: center;
     -webkit-transform: rotate(45deg);
     transform: rotate(45deg);
-    -webkit-box-shadow: 0 1px 1px #ccc;
-    box-shadow: 0 1px 1px #ccc
 }
 
 .el-upload-list--picture .el-upload-list__item-status-label i {
@@ -11624,7 +11624,7 @@
 .el-popper .popper__arrow,
 .el-popper .popper__arrow::after {
     position: absolute;
-    display: none !important;
+    display: block;
     width: 0;
     height: 0;
     border-color: transparent;
@@ -11662,7 +11662,6 @@
 .el-popper[x-placement^=top] .popper__arrow::after {
     bottom: 1px;
     margin-left: -6px;
-    border-top-color: #282828;
     border-bottom-width: 0
 }
 
@@ -11682,7 +11681,6 @@
     top: 1px;
     margin-left: -6px;
     border-top-width: 0;
-    border-bottom-color: var(--bg-alter-1)
 }
 
 .el-popper[x-placement^=right] {
@@ -14742,7 +14740,6 @@
     font-size: 14px;
     cursor: pointer;
     user-select: none;
-    margin-right: 30px
 }
 
 .el-checkbox.is-bordered {

assets/fundamentals/wax.js

@@ -10,7 +10,10 @@ export const wax = {
       "P2E",
       "NFT"
     ],
-    socials: [],
+    socials: [
+      "https://t.me/asdfasdf",
+      "https://vk.com/asdfasdf"
+    ],
     description: "Blockchain Brawlers is the first play-to-earn (P2E) game experience built by WAX Game Studios on the WAX Blockchain. You can collect Brawlers, equip them with gear and send them to Brawl in the Ring for rewards."
   },
   "FWW@farmerstoken": {