diff --git a/frontend/src/app/components/fees-box/fees-box.component.html b/frontend/src/app/components/fees-box/fees-box.component.html index 7a34695bb..675ce64a6 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.html +++ b/frontend/src/app/components/fees-box/fees-box.component.html @@ -1,3 +1,11 @@ +
+ Minimum + Economy + Low + Medium + High +
+
@@ -28,14 +36,6 @@
-
- Minimum - Economy - Low - Medium - Priority -
-
diff --git a/frontend/src/app/components/fees-box/fees-box.component.scss b/frontend/src/app/components/fees-box/fees-box.component.scss index 271e479e4..870b46427 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.scss +++ b/frontend/src/app/components/fees-box/fees-box.component.scss @@ -55,18 +55,17 @@ border-bottom: 1px solid #ffffff1c; width: fit-content; margin: auto; - line-height: 1.45; - padding: 0px 2px; + font-size: 20px; } .fiat { display: block; - font-size: 14px !important; + font-size: 13px !important; } } } .loading-container{ - min-height: 76px; + height: 50px; } .card-text { @@ -74,8 +73,8 @@ width: 100%; display: block; &:first-child { - max-width: 90px; - margin: 15px auto 3px; + max-width: 70px; + margin: 10px auto 3px; } &:last-child { margin: 10px auto 3px; @@ -86,14 +85,15 @@ .fee-progress-bar { width: 100%; - height: 20px; - margin-top: 15px; + height: 22px; + margin-bottom: 8px; border-radius: 0px 10px 10px 0px; display: flex; flex-direction: row; + transition: background-color 1s; } .fee-label { - font-size: 12px; + font-size: 14px; width: 100px; } \ No newline at end of file diff --git a/frontend/src/app/components/fees-box/fees-box.component.ts b/frontend/src/app/components/fees-box/fees-box.component.ts index 3b8f02c80..69b3f55ac 100644 --- a/frontend/src/app/components/fees-box/fees-box.component.ts +++ b/frontend/src/app/components/fees-box/fees-box.component.ts @@ -15,8 +15,8 @@ export class FeesBoxComponent implements OnInit { isLoadingWebSocket$: Observable; recommendedFees$: Observable; defaultFee: number; - startColor = '#557d00'; - endColor = '#557d00'; + startColor = '#2e324e'; + endColor = '#2e324e'; constructor( private stateService: StateService, @@ -29,6 +29,7 @@ export class FeesBoxComponent implements OnInit { this.recommendedFees$ = this.stateService.recommendedFees$ .pipe( tap((fees) => { + // For quick testing purpose // fees.fastestFee = 400; // fees.halfHourFee = 75; // fees.hourFee = 50; diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index d26b6660a..99ae4a301 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -5,7 +5,7 @@
Transaction Fees
-
+
@@ -33,7 +33,7 @@
Transaction Fees
-
+
diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index e6ddb5f84..81e7a671d 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -269,6 +269,9 @@ justify-content: space-around; padding: 22px 20px; } + .less-padding { + padding: 20px 20px; + } } .retarget-sign {