Skip to content

Commit

Permalink
ui: restyle markets page
Browse files Browse the repository at this point in the history
  • Loading branch information
@buck54321
buck54321 committed Sep 21, 2022
1 parent f9a565e commit fc2e809
Show file tree
Hide file tree
Showing 36 changed files with 2,137 additions and 1,862 deletions.
4 changes: 2 additions & 2 deletions client/webserver/live_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const (

var (
tCtx context.Context
maxDelay = time.Second * 2
maxDelay = time.Second * 4
epochDuration = time.Second * 30 // milliseconds
feedPeriod = time.Second * 10
creationPendingAsset uint32 = 0xFFFFFFFF
Expand Down Expand Up @@ -183,7 +183,7 @@ func mkMrkt(base, quote string) *core.Market {
Rate: rate,
// BookVolume: ,
Change24: change24,
// Vol24: ,
Vol24: lotSize * uint64(50000*rand.Float32()),
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions client/webserver/locales/en-us.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ var EnUS = map[string]string{
"outdated_tooltip": "Balance may be outdated. Connect to the wallet to refresh.",
"available": "available",
"connect_refresh_tooltip": "Click to connect and refresh",
"add_a_base_wallet": `Add a<br><span data-unit="base"></span><br>wallet`,
"add_a_quote_wallet": `Add a<br><span data-unit="quote"></span><br>wallet`,
"add_a_wallet": `Add a <span data-tmpl="addWalletSymbol"></span> wallet`,
"locked": "locked",
"immature": "immature",
"fee balance": "fee balance",
"Sell Orders": "Sell Orders",
"Your Orders": "Your Orders",
"Recent Matches": "Recent Matches",
Expand Down
3 changes: 1 addition & 2 deletions client/webserver/locales/pl-pl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ var PlPL = map[string]string{
"outdated_tooltip": "Saldo może być nieaktualne. Połącz się z portfelem, aby je odświeżyć.",
"available": "dostępne",
"connect_refresh_tooltip": "Kliknij, aby połączyć i odświeżyć",
"add_a_base_wallet": `Dodaj portfel<br><span data-unit="base"></span><br>`,
"add_a_quote_wallet": `Dodaj portfel<br><span data-unit="quote"></span><br>`,
"add_a_wallet": `Dodaj portfel <span data-tmpl="addWalletSymbol"></span> `,
"locked": "zablokowane",
"immature": "niedojrzałe",
"Sell Orders": "Zlecenia sprzedaży",
Expand Down
3 changes: 1 addition & 2 deletions client/webserver/locales/pt-br.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ var PtBr = map[string]string{
"outdated_tooltip": "Balanço pode está desatualizado. Conecte-se a carteira para atualizar.",
"available": "disponível",
"connect_refresh_tooltip": "Clique para conectar e atualizar",
"add_a_base_wallet": `Adicionar uma carteira<br><span data-unit="base"></span><br>`,
"add_a_quote_wallet": `Adicionar uma<br><span data-unit="quote"></span><br>carteira`,
"add_a_wallet": `Adicionar uma carteira <span data-tmpl="addWalletSymbol"></span> `,
"locked": "trancado",
"immature": "imaturo",
"Sell Orders": "Pedido de venda",
Expand Down
3 changes: 1 addition & 2 deletions client/webserver/locales/zh-cn.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ var ZhCN = map[string]string{
"outdated_tooltip": "账户可能已过期。请连接到钱包进行更新。",
"available": "可用",
"connect_refresh_tooltip": "点击连接并刷新",
"add_a_base_wallet": `添加一个<br><span data-unit="base"></span><br>钱包`,
"add_a_quote_wallet": `添加一个<br><span data-unit="quote"></span><br>钱包`,
"add_a_wallet": `添加一个 <span data-tmpl="addWalletSymbol"></span> 钱包`,
"locked": "锁定",
"immature": "不成熟",
"Sell Orders": "卖单",
Expand Down
15 changes: 6 additions & 9 deletions client/webserver/site/src/css/application.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
$grid-columns: 24;
$font-color-dark: #dfe2e1;
$font-color-light: #333;
$buycolor_dark: #05a35a;
$sellcolor_dark: #ae3333;
$buycolor_dark: #29bb77;
$sellcolor_dark: #e95e5e;
$buycolor_light: #207a46;
$sellcolor_light: #99302b;
$light_bg_1: #eaeaea;
$light_bg_2: #d5d5d5;
$dark_bg_1: #111;
$dark_bg_2: #1e1e1e;
$dark_bg_3: #292929;
$dark_body_bg: #13202b;
$light_body_bg: #e0e0e0;
$light_body_bg: white;
$dark_body_bg: #091a28;
$light_border_color: #ddd;
$dark_border_color: #383f4b;
$sans: "source-sans", sans-serif;
$demi-sans: "demi-sans", sans-serif;
$mono: "mono", monospace;
Expand Down
25 changes: 8 additions & 17 deletions client/webserver/site/src/css/forms.scss
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#regAssetForm {
position: relative;

.grey {
color: #999;
}

div.reg-asset-allmkts {
min-width: 210px;
max-width: 320px;
Expand Down Expand Up @@ -117,10 +113,6 @@
#confirmRegForm {
width: 425px;

.grey {
color: grey;
}

button.submit {
width: auto;
padding: 12px 30px;
Expand Down Expand Up @@ -155,10 +147,6 @@
#newWalletForm {
width: 425px;

.grey {
color: #999;
}

.wallet-tabs {
width: 100%;
display: flex;
Expand Down Expand Up @@ -255,7 +243,7 @@ button.form-button {
bottom: 0;
right: 0;
padding: 25px 0;
background-color: #e0e0e0f3;
background-color: $light_body_bg;
z-index: 100;

& > form {
Expand All @@ -274,10 +262,6 @@ button.form-button {
#walletWait {
max-width: 425px;

.grey {
color: #999;
}

.icons {
width: 25px;
}
Expand Down Expand Up @@ -345,3 +329,10 @@ button.form-button {
#authorizeSeedDisplay {
width: 425px;
}

#deposit {
#copyAlert {
margin-left: 12px;
position: absolute;
}
}
6 changes: 6 additions & 0 deletions client/webserver/site/src/css/icons.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@
transform: rotate(180deg);
}

.ico-arrowup::before {
content: "\e90c";
display: inline-block;
transform: rotate(-90deg);
}

.ico-checkbox::before {
content: "\e90d";
}
Expand Down
130 changes: 65 additions & 65 deletions client/webserver/site/src/css/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,39 +60,44 @@ input:invalid {
overflow-y: auto;
}

.overflow-x-hidden {
.overflow-y-hidden {
overflow-y: hidden;
}

.overflow-x-hidden,
.stylish-overflow.overflow-x-hidden {
overflow-x: hidden;
}

header.maintop {
width: 100%;
height: 60px;
min-height: 60px;
height: 70px;
min-height: 70px;
display: flex;
justify-content: space-between;
align-items: center;
z-index: 100;
background-color: white;
border-bottom: 1px solid #777;
border-bottom: 1px solid $light_border_color;
}

a.logo,
a.logo-icon {
display: block;
height: 30px;
margin: 0 20px;
margin: 0 10px;
background-size: cover;
cursor: pointer;
}

a.logo {
height: 30px;
width: 145px;
background-image: url("/img/logo_wide_v1.svg");
}

a.logo-icon {
width: 30px;
background-image: url("/img/logo_icon_v1.svg");
height: 40px;
width: 40px;
background-image: url("/img/softened-icon.png");
}

div.main {
Expand All @@ -116,31 +121,6 @@ button:focus {
outline: none;
}

.card {
width: 400px;
border-radius: 3px;
position: relative;

button {
padding: 6px 0;
}

input,
select {
background-color: $light_bg_2;
}

input:focus,
select:focus {
background-color: $light_bg_2;
}

form label {
font-size: 15px;
font-family: $demi-sans;
}
}

.dynamicopts {
display: flex;
align-items: stretch;
Expand All @@ -154,11 +134,17 @@ button:focus {
}
}

div.mainlinks > div,
div.mainlinks > a {
padding-right: 1em;
color: #4a4949;
cursor: pointer;
div.mainlinks {
white-space: nowrap;

& > div,
& > a {
color: #4a4949;
cursor: pointer;
padding-top: 5px;
padding-bottom: 5px;
padding-left: 10px;
}
}

.plainlink {
Expand Down Expand Up @@ -187,12 +173,8 @@ header.maintop a:hover,
cursor: pointer;
}

div.mainlinks .hoverbright:hover {
color: $dark_bg_3;
}

form.card button:hover {
color: black;
div.mainlinks .hoverbg:hover {
color: #222;
}

div.spinner {
Expand Down Expand Up @@ -246,6 +228,19 @@ input[type=number] {
@include stylish-overflow;
}

.stylish-overflow.hoveronly:not(:hover) {
scrollbar-color: transparent transparent;

&::-webkit-scrollbar-track {
background: transparent;
}

&::-webkit-scrollbar-thumb {
background-color: transparent;
border-radius: 4px;
}
}

.max-h-100 {
max-height: 100%;
}
Expand Down Expand Up @@ -327,7 +322,7 @@ div.popup-notes {
display: flex;
flex-direction: column;
align-items: stretch;
background-color: white;
background-color: $light_body_bg;
border: 1px solid #7777;
z-index: 100;
font-family: $sans;
Expand Down Expand Up @@ -389,32 +384,36 @@ div.popup-notes {
display: none !important;
}

.bg0 {
background-color: white;
.buycolor {
color: $buycolor_light;
}

.bg1 {
background-color: $light_bg_1;
.sellcolor {
color: $sellcolor_light;
}

.border1 {
border: 1px solid #aaa;
.errcolor {
color: #e61c00;
}

.bg2 {
background-color: $light_bg_2;
.grey {
color: #999;
}

.buycolor {
color: $buycolor_light;
.brdrleft {
border-left: 1px solid $light_border_color;
}

.sellcolor {
color: $sellcolor_light;
.brdrright {
border-right: 1px solid $light_border_color;
}

.errcolor {
color: #e61c00;
.brdrtop {
border-top: 1px solid $light_border_color;
}

.brdrbottom {
border-bottom: 1px solid $light_border_color;
}

hr.dashed {
Expand Down Expand Up @@ -477,10 +476,6 @@ div.form-closer {
font-size: 15px;
}

div.border1 {
border: 1px solid #aaa;
}

#loader {
background-color: #e0e0e077;
}
Expand All @@ -498,6 +493,11 @@ span.token-aware-symbol sup {
@include media-breakpoint-up(md) {
div.mainlinks > div,
div.mainlinks > a {
padding-right: 1.7em;
padding-left: 18px;
padding-right: 18px;

&:last-child {
padding-right: 0;
}
}
}
Loading

0 comments on commit fc2e809

Please sign in to comment.