diff --git a/frontend/src/app/components/about/about.component.html b/frontend/src/app/components/about/about.component.html index 8a0e13335..0b9b81dc6 100644 --- a/frontend/src/app/components/about/about.component.html +++ b/frontend/src/app/components/about/about.component.html @@ -434,6 +434,8 @@ +
+
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..3075b109a 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,30 @@
+
+ +
- - -
+ diff --git a/frontend/src/app/components/master-page/master-page.component.scss b/frontend/src/app/components/master-page/master-page.component.scss index 54a22a470..39aee903d 100644 --- a/frontend/src/app/components/master-page/master-page.component.scss +++ b/frontend/src/app/components/master-page/master-page.component.scss @@ -193,3 +193,27 @@ nav { font-size: 7px; } } + +footer { + text-align: center; + margin-top: auto; +} + +.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/components/master-page/master-page.component.ts b/frontend/src/app/components/master-page/master-page.component.ts index 7c4f8dcff..fcec8cdf6 100644 --- a/frontend/src/app/components/master-page/master-page.component.ts +++ b/frontend/src/app/components/master-page/master-page.component.ts @@ -35,6 +35,7 @@ export class MasterPageComponent implements OnInit { this.urlLanguage = this.languageService.getLanguageForUrl(); this.subdomain = this.enterpriseService.getSubdomain(); this.navigationService.subnetPaths.subscribe((paths) => { + console.log(paths); this.networkPaths = paths; }); } 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 @@ - -
-
- -
-
- -
-
- - - -
- 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 @@
-
- - - -
- 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 @@ -
-
- -
-
- -
-
- - - -
- \ 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/styles.scss b/frontend/src/styles.scss index d9ea867dc..d928223e5 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,9 @@ th { .visually-hidden { display: none; } + +app-master-page { + display: flex; + flex-direction: column; + min-height: 100vh; +}