From 85c8669a6183518d905e42370ec4fc4f71f16a98 Mon Sep 17 00:00:00 2001 From: Carles Tubio Date: Sat, 19 Oct 2024 05:26:02 +0000 Subject: [PATCH] Updated colors of ui buttons because of reasons. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ████ ███ To request new features or in case this commit breaks something for you, ████ ███ please, create a new github issue with all possible information for me, ▓███▀█▄ but never share your API Keys! ▒▓██ ███ ░▒▓█ ███ Signed-off-by: Carles Tubio _________________________________________ / Hello, WORLD! \ | | \ pssst.. 1.00000000 BTC = 62924.54 EUR. / ----------------------------------------- \ ^__^ \ (oo)\_______ (__)\ )\/\ ||----w | || || --- Makefile | 2 +- .../trading-bot/trading-bot.client/Orders.ts | 2 +- .../trading-bot/trading-bot.client/Trades.ts | 2 +- .../www/css/bootstrap-dark.scss | 5 ++ .../www/css/bootstrap.scss | 83 ++++++++++--------- 5 files changed, 51 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index f6059de8a..edcc99d21 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ K ?= K.sh MAJOR = 0 MINOR = 7 PATCH = 0 -BUILD = 44 +BUILD = 45 OBLIGATORY = DISCLAIMER: This is strict non-violent software: \n$\ if you hurt other living creatures, please stop; \n$\ diff --git a/src/bin/trading-bot/trading-bot.client/Orders.ts b/src/bin/trading-bot/trading-bot.client/Orders.ts index d4f7ab4af..0e4c82f22 100644 --- a/src/bin/trading-bot/trading-bot.client/Orders.ts +++ b/src/bin/trading-bot/trading-bot.client/Orders.ts @@ -29,7 +29,7 @@ export class OrdersComponent { private grid: GridOptions = { suppressNoRowsOverlay: true, defaultColDef: { sortable: true, resizable: true, flex: 1 }, - rowHeight:25, + rowHeight:27, headerHeight:25, columnDefs: [{ width: 30, diff --git a/src/bin/trading-bot/trading-bot.client/Trades.ts b/src/bin/trading-bot/trading-bot.client/Trades.ts index 03a3579dd..93114023b 100644 --- a/src/bin/trading-bot/trading-bot.client/Trades.ts +++ b/src/bin/trading-bot/trading-bot.client/Trades.ts @@ -44,7 +44,7 @@ export class TradesComponent { overlayLoadingTemplate: `0 closed orders`, overlayNoRowsTemplate: `0 closed orders`, defaultColDef: { sortable: true, resizable: true, flex: 1 }, - rowHeight:25, + rowHeight:27, headerHeight:25, animateRows:true, getRowId: (params: any) => params.data.tradeId, diff --git a/src/lib/Krypto.ninja-client/www/css/bootstrap-dark.scss b/src/lib/Krypto.ninja-client/www/css/bootstrap-dark.scss index 4a2cc9afe..d4dd4106b 100644 --- a/src/lib/Krypto.ninja-client/www/css/bootstrap-dark.scss +++ b/src/lib/Krypto.ninja-client/www/css/bootstrap-dark.scss @@ -36,6 +36,11 @@ body.theme-dark { color: #ffff00; background-color: #2b2b2b; } + .btn { + &:active:hover, &.active.hover { + border-color: #000; + } + } .btn-default { color: #00ff00; background-color: #00ff001a; diff --git a/src/lib/Krypto.ninja-client/www/css/bootstrap.scss b/src/lib/Krypto.ninja-client/www/css/bootstrap.scss index 6a22738d4..2c7f1a69d 100644 --- a/src/lib/Krypto.ninja-client/www/css/bootstrap.scss +++ b/src/lib/Krypto.ninja-client/www/css/bootstrap.scss @@ -2127,7 +2127,7 @@ textarea.form-group-lg .form-control, select[multiple].form-group-lg .form-contr -moz-user-select: none; -ms-user-select: none; user-select: none; - &:hover, &:focus, &.focus { + &:hover { color: #333; text-decoration: none; } @@ -2137,6 +2137,11 @@ textarea.form-group-lg .form-control, select[multiple].form-group-lg .form-contr -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125); } + &:active:hover, &.active.hover { + border-color: transparent; + -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.525); + box-shadow: inset 0 3px 5px rgba(0, 0, 0, .525); + } &.disabled, &[disabled] { cursor: not-allowed; pointer-events: none; @@ -2153,9 +2158,6 @@ textarea.form-group-lg .form-control, select[multiple].form-group-lg .form-contr } &:active:hover, &.active.hover { background-color:#00c500; - border-color: transparent; - -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.525); - box-shadow: inset 0 3px 5px rgba(0, 0, 0, .525); } } @@ -2360,13 +2362,14 @@ fieldset[disabled] .btn-primary.active { } .btn-success { - color: #fff; - background-color: #5cb85c; - border-color: #4cae4c; - &:hover, &:focus, &.focus, &:active, &.active { - color: #fff; - background-color: #449d44; - border-color: #398439; + color: #00b789; + background-color: rgba(0, 255, 0, 24%); + border-color: #00ff00; + &:hover, &.hover { + background-color: #00ff00; + } + &:active:hover, &.active.hover { + background-color: #3a943a; } } @@ -2464,13 +2467,14 @@ fieldset[disabled] .btn-success.active { } .btn-info { - color: #fff; - background-color: #508190; - border-color: #46b8da; - &:hover, &:focus, &.focus, &:active, &.active { - color: #fff; - background-color: #31b0d5; - border-color: #269abc; + color: #5eccff; + background-color: rgba(0, 0, 255, 0.1019607843); + border-color: #28b9b3; + &:hover, &.hover { + background-color: #53b0ef; + } + &:active:hover, &.active.hover { + background-color: #3879a4; } } @@ -2480,12 +2484,6 @@ fieldset[disabled] .btn-success.active { border-color: #269abc; } -.btn-info { - &:active, &.active { - background-image: none; - } -} - .open > .dropdown-toggle.btn-info { background-image: none; } @@ -2568,13 +2566,14 @@ fieldset[disabled] .btn-info.active { } .btn-warning { - color: #fff; - background-color: #f0ad4e; + color: #eea236; + background-color: rgba(255, 225, 0, 0.102); border-color: #eea236; - &:hover, &:focus, &.focus, &:active, &.active { - color: #fff; + &:hover, &.hover { background-color: #ec971f; - border-color: #d58512; + } + &:active:hover, &.active.hover { + background-color: #ab7a36; } } @@ -2672,13 +2671,14 @@ fieldset[disabled] .btn-warning.active { } .btn-danger { - color: #fff; - background-color: #c12e2a; + color: #ff0000; + background-color: rgba(255,0,0,.1019607843); border-color: #b92c28; - &:hover, &:focus, &.focus, &:active, &.active { - color: #fff; - background-color: #e21913; - border-color: #ac2925; + &:hover, &.hover { + background-color: #ff0900; + } + &:active:hover, &.active.hover { + background-color: #b40802; } } @@ -5155,6 +5155,7 @@ div#hud { padding: 5px; border: 1px solid #363636; border-radius: .25rem; + // animation: entrance 400ms (800ms + 200ms * 3) linear backwards 1; } div#hud.bg-danger { @@ -5392,12 +5393,8 @@ address { background-color: #00ff00; border-color: #00ff00; } - } - - .ag-cell .btn { - position: relative; - top: -1px; } + .tradeSafety, .tradeSafety2 { background: white; @@ -5526,3 +5523,9 @@ table.marketQuoting { input#filter_pattern { background-color: #00000024!important; } + + +@keyframes entrance { + to, 20%, 40%, 60%, 80% { opacity: 1 } + from, 10%, 30%, 50%, 70%, 90% { opacity: 0 } +} \ No newline at end of file