diff --git a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html index 2d7df05e1..eab0537c7 100644 --- a/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html +++ b/frontend/src/app/bisq/bisq-main-dashboard/bisq-main-dashboard.component.html @@ -107,12 +107,7 @@ -
- Terms of Service - | - Privacy Policy -
- + diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 8a0e13335..a2d1fae84 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -408,7 +408,6 @@
Third-party Licenses - Terms of Service +
+
+ diff --git a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html index 3df488c7f..6a2ad4965 100644 --- a/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html +++ b/frontend/src/app/components/liquid-master-page/liquid-master-page.component.html @@ -96,5 +96,6 @@ -
+ + \ No newline at end of file diff --git a/frontend/src/app/components/master-page/master-page.component.html b/frontend/src/app/components/master-page/master-page.component.html index 5724530e5..a5efeeea2 100644 --- a/frontend/src/app/components/master-page/master-page.component.html +++ b/frontend/src/app/components/master-page/master-page.component.html @@ -65,9 +65,9 @@
+
+ +
- - -
- + diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html index 2e6cbbada..a7fbd0066 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.html @@ -73,24 +73,4 @@ - -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Broadcast Transaction -
- -
- diff --git a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss index 218b8e04d..4f01f7cad 100644 --- a/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss +++ b/frontend/src/app/components/mining-dashboard/mining-dashboard.component.scss @@ -1,10 +1,6 @@ .dashboard-container { - padding-bottom: 60px; text-align: center; margin-top: 0.5rem; - @media (min-width: 992px) { - padding-bottom: 0px; - } .col { margin-bottom: 1.5rem; } @@ -104,22 +100,3 @@ text-decoration: none; color: inherit; } - -.terms-of-service { - margin-top: 1rem; -} - -.pref-selectors { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - - .selector { - margin-left: .5em; - margin-bottom: .5em; - &:first { - margin-left: 0; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/components/transaction/transaction.component.html b/frontend/src/app/components/transaction/transaction.component.html index 0b5e12001..e4dc0f8cc 100644 --- a/frontend/src/app/components/transaction/transaction.component.html +++ b/frontend/src/app/components/transaction/transaction.component.html @@ -465,8 +465,6 @@ -
- diff --git a/frontend/src/app/dashboard/dashboard.component.html b/frontend/src/app/dashboard/dashboard.component.html index add846e24..69b0e5616 100644 --- a/frontend/src/app/dashboard/dashboard.component.html +++ b/frontend/src/app/dashboard/dashboard.component.html @@ -143,26 +143,6 @@ - -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Broadcast Transaction -
- -
- diff --git a/frontend/src/app/dashboard/dashboard.component.scss b/frontend/src/app/dashboard/dashboard.component.scss index 4a844eb52..eb466fc16 100644 --- a/frontend/src/app/dashboard/dashboard.component.scss +++ b/frontend/src/app/dashboard/dashboard.component.scss @@ -1,10 +1,6 @@ .dashboard-container { - padding-bottom: 60px; text-align: center; margin-top: 0.5rem; - @media (min-width: 992px) { - padding-bottom: 0px; - } .col { margin-bottom: 1.5rem; } @@ -324,18 +320,3 @@ text-decoration: none; color: inherit; } - -.pref-selectors { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - - .selector { - margin-left: .5em; - margin-bottom: .5em; - &:first { - margin-left: 0; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/docs/docs/docs.component.html b/frontend/src/app/docs/docs/docs.component.html index cf3bdb070..fa9df5459 100644 --- a/frontend/src/app/docs/docs/docs.component.html +++ b/frontend/src/app/docs/docs/docs.component.html @@ -45,15 +45,5 @@
-
- -
- Terms of Service - | - Privacy Policy -
- -
- diff --git a/frontend/src/app/docs/docs/docs.component.scss b/frontend/src/app/docs/docs/docs.component.scss index 9e7a2e03a..64852a1f6 100644 --- a/frontend/src/app/docs/docs/docs.component.scss +++ b/frontend/src/app/docs/docs/docs.component.scss @@ -2,6 +2,7 @@ text-align: left; padding-top: 1rem; scroll-behavior: smooth; + margin-bottom: 20px; } #footer { diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html index b73d21bcd..123069479 100644 --- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html +++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.html @@ -84,24 +84,4 @@ -
-
- -
-
- -
-
- -
- Terms of Service - | - Privacy Policy - | - Connect to our nodes - Broadcast Transaction -
- -
- \ No newline at end of file diff --git a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss index 218b8e04d..e91f7606a 100644 --- a/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss +++ b/frontend/src/app/lightning/lightning-dashboard/lightning-dashboard.component.scss @@ -1,5 +1,4 @@ .dashboard-container { - padding-bottom: 60px; text-align: center; margin-top: 0.5rem; @media (min-width: 992px) { @@ -104,22 +103,3 @@ text-decoration: none; color: inherit; } - -.terms-of-service { - margin-top: 1rem; -} - -.pref-selectors { - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: center; - - .selector { - margin-left: .5em; - margin-bottom: .5em; - &:first { - margin-left: 0; - } - } -} \ No newline at end of file diff --git a/frontend/src/app/lightning/node/node.component.html b/frontend/src/app/lightning/node/node.component.html index e46a99e21..2a74a68aa 100644 --- a/frontend/src/app/lightning/node/node.component.html +++ b/frontend/src/app/lightning/node/node.component.html @@ -352,5 +352,3 @@ - -
diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.html b/frontend/src/app/shared/components/global-footer/global-footer.component.html new file mode 100644 index 000000000..e3cdc07e3 --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.scss b/frontend/src/app/shared/components/global-footer/global-footer.component.scss new file mode 100644 index 000000000..cf4aa02c4 --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss @@ -0,0 +1,22 @@ +footer { + text-align: center; +} + +.terms-of-service { + margin-top: 1rem; +} + +.pref-selectors { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: center; + + .selector { + margin-left: .5em; + margin-bottom: .5em; + &:first { + margin-left: 0; + } + } +} diff --git a/frontend/src/app/shared/components/global-footer/global-footer.component.ts b/frontend/src/app/shared/components/global-footer/global-footer.component.ts new file mode 100644 index 000000000..f886a6505 --- /dev/null +++ b/frontend/src/app/shared/components/global-footer/global-footer.component.ts @@ -0,0 +1,28 @@ +import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; +import { Observable } from 'rxjs'; +import { NavigationService } from '../../../services/navigation.service'; +import { Env, StateService } from '../../../services/state.service'; + +@Component({ + selector: 'app-global-footer', + templateUrl: './global-footer.component.html', + styleUrls: ['./global-footer.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class GlobalFooterComponent implements OnInit { + env: Env; + networkPaths: { [network: string]: string }; + officialMempoolSpace = this.stateService.env.OFFICIAL_MEMPOOL_SPACE; + networkPaths$: Observable>; + + constructor( + public stateService: StateService, + private navigationService: NavigationService, + ) {} + + ngOnInit(): void { + this.env = this.stateService.env; + this.networkPaths$ = this.navigationService.subnetPaths; + } + +} diff --git a/frontend/src/app/shared/shared.module.ts b/frontend/src/app/shared/shared.module.ts index 7286056f9..7d3e51d20 100644 --- a/frontend/src/app/shared/shared.module.ts +++ b/frontend/src/app/shared/shared.module.ts @@ -88,6 +88,7 @@ import { TimestampComponent } from './components/timestamp/timestamp.component'; import { ToggleComponent } from './components/toggle/toggle.component'; import { GeolocationComponent } from '../shared/components/geolocation/geolocation.component'; import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert.component'; +import { GlobalFooterComponent } from './components/global-footer/global-footer.component'; @NgModule({ declarations: [ @@ -170,6 +171,7 @@ import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert. ToggleComponent, GeolocationComponent, TestnetAlertComponent, + GlobalFooterComponent, ], imports: [ CommonModule, @@ -276,6 +278,7 @@ import { TestnetAlertComponent } from './components/testnet-alert/testnet-alert. ToggleComponent, GeolocationComponent, PreviewTitleComponent, + GlobalFooterComponent, ] }) export class SharedModule { diff --git a/frontend/src/styles.scss b/frontend/src/styles.scss index d9ea867dc..fbaaa5ed2 100644 --- a/frontend/src/styles.scss +++ b/frontend/src/styles.scss @@ -60,11 +60,8 @@ body { .container { position: relative; - padding-bottom: 60px; -} -.container-xl { - padding-bottom: 60px; } + .full-height { @media (max-width: 767.98px) { min-height: 100vh; @@ -1141,3 +1138,17 @@ th { .visually-hidden { display: none; } + +app-master-page, app-liquid-master-page { + display: flex; + flex-direction: column; + min-height: 100vh; + padding-bottom: 60px; + @media (min-width: 992px) { + padding-bottom: 0px; + } +} + +app-global-footer { + margin-top: auto; +} \ No newline at end of file