Skip to content

Commit

Permalink
Merge pull request dexlab-io#1 from dexlab-io/hotfix/fixing-the-mess
Browse files Browse the repository at this point in the history 
Hotfix/fixing the mess
  • Loading branch information
@Alexintosh
Alexintosh authored Oct 17, 2018
2 parents c0aff5e + 0ba339e commit 1a44868
Show file tree
Hide file tree
Showing 49 changed files with 4,231 additions and 1,444 deletions.
Binary file added dex23082018.zip
View file
Binary file not shown.
Binary file added dexDefaultbtn.zip
View file
Binary file not shown.
Binary file added dexlab2018-16-08.zip
View file
Binary file not shown.
Binary file added dexlab20180817.zip
View file
Binary file not shown.
Binary file added dexlab20180820.zip
View file
Binary file not shown.
Binary file added dexlab20180824 V1.1.3 fixed css.zip
View file
Binary file not shown.
Binary file added dexlabAddresstruncate.zip
View file
Binary file not shown.
Binary file added dist2018-08-15.zip
View file
Binary file not shown.
Binary file added fontfamily0820.zip
View file
Binary file not shown.
1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"async": "2.6.0",
"copy-to-clipboard": "3.0.8",
"dva": "2.1.0",
"jquery": "^3.3.1",
"ledgerco": "1.2.1",
"lodash": "4.17.5",
"moment": "2.20.1",
Expand Down
4 changes: 3 additions & 1 deletion public/index.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" href="./static/favicon.ico">
<link href="https://fonts.googleapis.com/css?family=Quicksand" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" >
<title>Dexlab Wallet & DEX By Dexlab Protocol</title>
<meta name="keywords" content="Dexlab protocol Dexlab Wallet & DEX DXL" />
<meta name="description" content="Dexlab protocol Dexlab Wallet & DEX DXL" />
</head>
<body>
<div id="root"></div>
</body>
</html>
</html>
4 changes: 4 additions & 0 deletions src/assets/css/basic/margin.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@
margin-top: 5.0rem !important
}

.mt70 {
margin-top: 7.0rem !important
}

.mb0 {
margin-bottom: 0.0rem !important
}
Expand Down
8 changes: 4 additions & 4 deletions src/assets/css/components.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ h1,h2,h3,h4,h5,h6{ margin:0 !important; }
.ant-form-item{margin-bottom: 10px !important;}
.ant-select-selection--single,.ant-input{ height: 40px!important; }
.ant-slider-dot{}
.ant-select-selection__rendered,.ant-input{ line-height: 40px !important }
.ant-select-selection__rendered,.ant-input{ line-height: 40px !important; padding: 10px 20px; }
.form-dark .ant-input,.form-dark .ant-input:focus,.form-dark .ant-select-selection,.form-dark .ant-select-selection:focus{ border: 0 !important; outline: 0 !important; box-shadow: none !important; }
.form-dark .ant-form-item-label label{ color: @text-color-dark-2 }
.form-dark .ant-input-group .ant-input-group-addon{ border:0 !important; background: @dark-color; }
.form-dark textarea.ant-input{ line-height: 1.2 !important }
.form-dark .label{ font-size: 14px; color: @text-color-dark-2 }
.prefix .ant-input-affix-wrapper .ant-input:not(:last-child){border:1px solid rgba(255, 255, 255, 0.07); padding-left:11px !important; color:#7689a0 !important}
.ant-input-affix-wrapper .ant-input:not(:last-child){border:1px solid #979797; padding-left:70px !important; border-radius:3px; background-color:#1B1917; color:#ffffff}
.prefix .ant-input-affix-wrapper .ant-input:not(:last-child){border:1px solid rgba(16, 30, 43, 1); padding-left:11px !important; color:#7689a0 !important}
.ant-input-affix-wrapper .ant-input:not(:last-child){border:1px solid #979797; padding-left:70px !important; border-radius:5px; background-color:#101e2b; color:#ffffff}
.card.dark .ant-tabs-bar{ border-bottom-color:@dark-color-2; color:@text-color-dark-3; }
.ant-radio-inner:after{ border-radius: 8px !important }
.ant-input-group .ant-btn{ height: 40px !important; line-height: 38px; }
.form-dark .ant-input-group .ant-btn{ border:0 !important; }
.form-dark .ant-input-group .ant-btn{ border-radius: 5px !important; }
.form-dark .ant-input-group .ant-btn:hover,.form-dark .ant-input-group .ant-btn:focus{ border:0 !important; }
.card.dark .ant-tabs{ font-size: @font-size-base !important }
.card.dark .ant-tabs.ant-tabs-card > .ant-tabs-bar{ margin:@mr-0; }
Expand Down
45 changes: 35 additions & 10 deletions src/assets/css/core.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ol ol, ul ul, ol ul, ul ol { margin-bottom: 0; }
.relative { position: relative; }
.font-bold { font-weight: bold; }
.font-normal { font-weight: normal; font-style: normal; }
.text-primary { color: @primary-color; }
.text-primary { color: @primary-color; font-weight: 600;}
.text-color { color: @text-color-1; }
.text-dark { color: @text-color-dark !important; }
.text-mute { color: @text-color-dark-2 !important; }
Expand All @@ -27,6 +27,7 @@ ol ol, ul ul, ol ul, ul ol { margin-bottom: 0; }
.text-success, .text-up { color: @success-color !important; }
.text-link{ color: @blue-light !important }
.text-left { text-align: left; }
.text-spread {color: #ffffff !important; font-size: 12px; margin: 0px 20px; background-color: rgb(16, 30, 43); padding-right: 20px; border-radius: 5px; font-weight: 600; }
.text-center { text-align: center; }
.text-right { text-align: right; }
.text-sm-control { display: inline-block; max-width: 80px; }
Expand All @@ -37,6 +38,7 @@ ol ol, ul ul, ol ul, ul ol { margin-bottom: 0; }
.bg { background-color: @blue-dark }
.img-responsive { display: block; height: auto; max-width: 100%; }
.img-responsive img { width: 100%; }
.profileimg { vertical-align: middle; border-style: none; width: 44%; }
.cards:after, .cards:before, .clearfix:after, .clearfix:before, .form-horizontal .form-group:after, .form-horizontal .form-group:before, .panel:after, .panel:before, .panel-body:after, .panel-body:before, .collapse:before { display: block; content: " "; }
.article, .clearfix:after, .dl-horizontal dd:after, .form-horizontal .form-group:after, .panel, .list-group .item-md:after, .list-group .item-sm:after, .panel:after, .panel-body:after, .collapse:after { clear: both; }
.clear { clear: both; }
Expand Down Expand Up @@ -105,17 +107,17 @@ ol ol, ul ul, ol ul, ul ol { margin-bottom: 0; }
section { }
.bullet { position: relative; top: 2px; margin-right: 5px; display: inline-block; width: 16px; height: 16px; background-image: linear-gradient(90deg, #FAA48D 0%, #EC7F8F 99%); background-image: -webkit-linear-gradient(90deg, #FAA48D 0%, #EC7F8F 99%); background-image: -moz-linear-gradient(90deg, #FAA48D 0%, #EC7F8F 99%); }
.card { position: relative; width: 100%; background: @blue-dark; }
.card.dark { }
.card.dark { border-radius:5px }
.card.padding .card-body { padding: 15px 0 0; }
.card-header { position: relative; height: 40px; padding: 10px 20px; display: flex; justify-content: space-between; align-items: center }
.card-header h4 { font-size: 16px; font-weight: 600; }
.card-header { position: relative; height: 30px; padding: 10px 20px; display: flex; justify-content: space-between; align-items: center }
.card-header h4 { font-size: 14px; font-weight: 600; }
.card.dark .card-header h4 { color: @text-color-dark-1 !important; }
.card.dark.bordered { position: relative; border: 1px solid @dark-color-2; }
.card.bordered .card-header { padding: 10px; }
.card.dark .card-header.bordered { border-bottom: 1px solid @dark-color-2; }
.card.bordered .col-auto { padding: 0 }
.card-title { display: inline-block; font-size: 15px; line-height: 30px; font-weight: bold; }
.card-body { padding: 15px 15px; }
.card-body { padding: 25px 15px; }
.card-footer { padding: 15px 25px 25px; }
.card-inverse { background: #56535E; }
.card-inverse .card-header.bordered { border-bottom: 1px solid@text-color-dark; color: @text-color-dark; }
Expand Down Expand Up @@ -179,32 +181,54 @@ section { }
.table.text-right-last tr>td:last-child, .table.text-right-last tr>th:last-child { text-align: right !important }

/* btn */
.btn { display: inline-block; font-weight: normal; border:0 !important; text-align: center; white-space: nowrap; vertical-align: middle; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; border: 0; padding: 0 12px; line-height: 30px; transition: all 0.45s ease-in-out; cursor: pointer }
.btn { display: inline-block; font-weight: normal; border:0; border-radius:5px !important; text-align: center; white-space: nowrap; vertical-align: middle; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; border: 0; padding: 0 12px; line-height: 30px; transition: all 0.45s ease-in-out; cursor: pointer }
.btn:focus, .btn:hover { text-decoration: none; }
.btn:focus, .btn.focus { outline: 0; /*box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.25);*/ }
.btn.disabled, .btn:disabled, .disabled .btn { opacity: .65; box-shadow: none; cursor: not-allowed; }
a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; }
.btn-cancelAll {color: @blue-light-dex-color; background-color: transparent; }
.btn-cancelAll:hover { color: @text-color-dark !important}
.btn-primary { color: @text-color-dark !important; background-color: @blue-light !important; border:0 !important; }
.btn-primary:hover { color: @text-color-dark !important; background-color: fade(@blue-light, 54%) !important; }
.btn-primary.disabled, .btn-primary:disabled { background-color: fade(@blue-light, 27%) !important; }
.btn-secondary { background-color: @light-color-1; }
.btn-secondary:hover { color: @text-color-dark-1; background-color: fade(@light-color-1, 54%) }
.btn-secondary.disabled, .btn-secondary:disabled { background-color: fade(@light-color-1, 27%) }
.btn-success { color: @text-color-dark !important; background-color: @success-color !important; }
.btn-success { color: @text-color-dark !important; background-color: @success-color !important; border-radius: 5px !important; border: 0 !important;;}
.btn-success:hover { color: @text-color-dark !important; background-color: fade(@success-color, 54%) !important; }
.btn-success.disabled, .btn-success:disabled { background-color: fade(@success-color, 27%) !important; }
.btn-danger { color: @text-color-dark !important; background-color: @error-color !important; border:0 !important; }
.btn-danger { color: @text-color-dark !important; background-color: @error-color !important; border-radius:5px !important; border: 0 !important;;}
.btn-danger:hover { color: @text-color-dark!important; background-color: fade(@error-color, 54%)!important; }
.btn-danger.disabled, .btn-danger:disabled { background-color: fade(@error-color, 27%)!important; }
.btn-lg{ height: 30px; line-height: 30px; padding: 0 20px; font-size: 16px; line-height: 1.5; }
.btn-xlg { height: 40px !important; padding: 0 20px; font-size: 16px !important; line-height: 40px !important; font-weight: bold !important }
.btn-xlg { height: 40px !important; padding: 0 20px; font-size: 16px !important; line-height: 40px !important; font-weight: bold !important; border-radius: 5px; }
.btn-xxlg { height: 60px !important; padding: 0 20px; font-size: 20px !important; line-height: 60px !important; font-weight: bold !important }
.btn-sm, .btn-group-sm>.btn { padding: 4px 12px; font-size: @font-size-sm; line-height: 1.5; }
.btn-block { display: block; width: 100% }
.btn-block { display: block; width: 100%; border-radius: 5px }
.btn-block+.btn-block { margin-top: 2px; }
.btn-o-dark { border: 1px solid @dark-color-1 !important; background: @transparent !important; color: @text-color-dark !important; }
.btn-o-dark:hover { background-color: @dark-color !important; color: @primary-color !important }

.btn-fee-slow { width: 30%; color: @text-color-light-blue !important; background-color: @fee-background-color !important; font-size: 13px !important; border:0.5px solid #97979733 !important; border-radius: 5px !important; border-top-right-radius: 0px !important; border-bottom-right-radius: 0px !important; display: inline-block;}
.btn-fee-slow:hover {background-color:@fee-hover-bk-color !important}
.btn-fee-slow:focus {background-color:@fee-hover-bk-color !important}
.btn-fee-slow:target {background-color:@fee-hover-bk-color !important}

.btn-fee-standard { width: 40%; color: @text-color-light-blue !important; background-color: @fee-background-color !important; font-size: 13px !important; border:0.5px solid #97979733 !important; border-radius: 0px !important; display: inline-block;}
.btn-fee-standard:active {background-color:@fee-hover-bk-color !important}
.btn-fee-standard:hover {background-color:@fee-hover-bk-color !important}
.btn-fee-standard:focus {background-color:@fee-hover-bk-color !important}
.btn-fee-standard:target {background-color:@fee-hover-bk-color !important}
.btn-button-clicked {width: 40%; color: @text-color-light-blue !important; background-color:@fee-hover-bk-color !important; font-size: 13px !important; border:0.5px solid #97979733 !important; border-radius: 0px !important; display: inline-block;}

.btn-fee-fast { width: 30%; color: @text-color-light-blue !important; background-color: @fee-background-color !important; font-size: 13px !important; border:0.5px solid #97979733 !important; border-radius: 5px !important; border-top-left-radius: 0px !important; border-bottom-left-radius: 0px !important; display: inline-block;}
.btn-fee-fast:hover {background-color:@fee-hover-bk-color !important}
.btn-fee-fast:focus {background-color:@fee-hover-bk-color !important}
.btn-fee-fast:target {background-color:@fee-hover-bk-color !important}

.btn-buy-max {height: 30px; color: rgba(255, 255, 255, 0.77) !important; background-color: #1B1917 !important; font-size: 9px !important; border:0.5px solid #1B1917 !important; border-radius: 5px !important; position: relative; left: 7px;}

.orderFormStl { color: rgba(255, 255, 255, 0.54); }
.container { margin-right: auto; margin-left: auto; padding-right: 15px; padding-left: 15px; width: 1200px; }
.row { display: -ms-flexbox; display: flex; -ms-flex-wrap: wrap; flex-wrap: wrap; margin: 0 -2px; }
.no-gutters { margin-right: 0; margin-left: 0; }
Expand Down Expand Up @@ -236,6 +260,7 @@ a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; }
.order-10 { -ms-flex-order: 10; order: 10; }
.order-11 { -ms-flex-order: 11; order: 11; }
.order-12 { -ms-flex-order: 12; order: 12; }
.orderContainer { border: 1px solid #97979733; border-radius: 5px; }

.flex-row { -ms-flex-direction: row !important; flex-direction: row !important; }
.flex-column { -ms-flex-direction: column !important; flex-direction: column !important; }
Expand Down
6 changes: 3 additions & 3 deletions src/assets/css/fonts.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ span>[class^="icon-"], span>[class*=" icon-"] { margin-right: 5px; }
.icon-chevron-left:before { content: "\e905"; }
.icon-chevron-right:before { content: "\e906"; }
.icon-chevron-up:before { content: "\e907"; }
.icon-eye:before { content: "\e908"; }
.icon-eye-o:before { content: "\e909"; }
.icon-wallet:before { content: "\e916"; }
.icon-wallet-o:before { content: "\e916"; }
.icon-bell:before { content: "\e90a"; }
.icon-lock:before { content: "\e90b"; }
.icon-plus:before { content: "\e90c"; }
Expand All @@ -162,7 +162,7 @@ span>[class^="icon-"], span>[class*=" icon-"] { margin-right: 5px; }
.icon-search:before { content: "\e91d"; }
.icon-caret:before { content: "\e91e"; }
.icon-export:before { content: "\e91f"; }
.icon-eye-slash:before { content: "\e920"; }
.icon-wallet-slash:before { content: "\e916"; }
.icon-poweroff:before { content: "\e922"; }
.icon-gift:before { content: "\e923"; }
.icon-qrcode:before { content: "\e926"; }
Expand Down
Loading

0 comments on commit 1a44868

Please sign in to comment.