From 2855fff70298f9429d9169ed61fc3ec5f2b4263c Mon Sep 17 00:00:00 2001
From: hunicus <93150691+hunicus@users.noreply.github.com>
Date: Sun, 6 Aug 2023 16:16:16 +0900
Subject: [PATCH] Make basic footer refinement

TODO: responsiveness
---
 .../fiat-selector.component.html              |  2 +-
 .../language-selector.component.html          |  2 +-
 .../rate-unit-selector.component.html         |  2 +-
 .../global-footer.component.html              | 25 +++++------
 .../global-footer.component.scss              | 45 +++++++++----------
 5 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/frontend/src/app/components/fiat-selector/fiat-selector.component.html b/frontend/src/app/components/fiat-selector/fiat-selector.component.html
index dd32b1815..eec6f4b0a 100644
--- a/frontend/src/app/components/fiat-selector/fiat-selector.component.html
+++ b/frontend/src/app/components/fiat-selector/fiat-selector.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="fiatForm" class="text-small text-center">
-    <select formControlName="fiat" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 200px;" (change)="changeFiat()">
+    <select formControlName="fiat" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 150px;" (change)="changeFiat()">
         <option *ngFor="let currency of currencies" [value]="currency[1].code">{{ currency[1].name + " (" + currency[1].code + ")" }}</option>
     </select>
 </div>
diff --git a/frontend/src/app/components/language-selector/language-selector.component.html b/frontend/src/app/components/language-selector/language-selector.component.html
index 22839441c..41e0efb0e 100644
--- a/frontend/src/app/components/language-selector/language-selector.component.html
+++ b/frontend/src/app/components/language-selector/language-selector.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="languageForm" class="text-small text-center">
-    <select formControlName="language" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 200px;" (change)="changeLanguage()">
+    <select formControlName="language" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 100px;" (change)="changeLanguage()">
         <option *ngFor="let lang of languages" [value]="lang.code">{{ lang.name }}</option>
     </select>
 </div>
diff --git a/frontend/src/app/components/rate-unit-selector/rate-unit-selector.component.html b/frontend/src/app/components/rate-unit-selector/rate-unit-selector.component.html
index 016d1b555..a2be9df87 100644
--- a/frontend/src/app/components/rate-unit-selector/rate-unit-selector.component.html
+++ b/frontend/src/app/components/rate-unit-selector/rate-unit-selector.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="rateUnitForm" class="text-small text-center">
-    <select formControlName="rateUnits" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 200px;" (change)="changeUnits()">
+    <select formControlName="rateUnits" class="custom-select custom-select-sm form-control-secondary form-control mx-auto" style="width: 100px;" (change)="changeUnits()">
         <option *ngFor="let unit of units" [value]="unit.name">{{ unit.label }}</option>
     </select>
 </div>
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
index d4f303221..0408accbe 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.html
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.html
@@ -1,12 +1,11 @@
 <footer>
     <div class="container-fluid">
     <div class="row main">
-      <div class="offset-lg-1 col-lg-4 col align-self-center branding mt-2">
+      <div class="col-md-12 branding mt-2">
         <div class="main-logo">
           <app-svg-images *ngIf="officialMempoolSpace" name="officialMempoolSpace" viewBox="0 0 500 126"></app-svg-images>
           <app-svg-images *ngIf="!officialMempoolSpace" name="mempoolSpace" viewBox="0 0 500 126"></app-svg-images>
         </div>
-        <p><ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container><ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template></p>
         <div class="selector">
           <app-language-selector></app-language-selector>
         </div>
@@ -23,9 +22,10 @@
           </a>
         </div>
       </div>
-      <div class="col-lg-6 col-md-10 offset-md-1 links outer">
-        <div class="row">
-          <div class="col-lg-6">
+    </div>
+    <div class="row col-md-12 link-tree">
+      <!--<div class="links outer">-->
+          <div class="links">
             <p class="category">Explore</p>
             <p><a [routerLink]="['/mining' | relativeUrl]">Mining Dashboard</a></p>
             <p><a *ngIf="env.LIGHTNING" [routerLink]="['/lightning' | relativeUrl]">Lightning Dashboard</a></p>
@@ -34,7 +34,7 @@
             <p *ngIf="officialMempoolSpace"><a [routerLink]="['/lightning/group/the-mempool-open-source-project' | relativeUrl]" i18n="footer.connect-to-our-nodes">Connect to our Nodes</a></p>
             <p><a [routerLink]="['/docs/api' | relativeUrl]">API Documentation</a></p>
           </div>
-          <div class="col-lg-6 links">
+          <div class="links">
             <p class="category">Learn</p>
             <p><a [routerLink]="['/docs/faq']" fragment="what-is-a-mempool">What is a mempool?</a></p>
             <p><a [routerLink]="['/docs/faq']" fragment="what-is-a-block-explorer">What is a block explorer?</a></p>
@@ -42,9 +42,8 @@
             <p><a [routerLink]="['/docs/faq']" fragment="why-is-transaction-stuck-in-mempool">Why isn't my transaction confirming?</a></p>
             <p><a [routerLink]="['/docs/faq' | relativeUrl]">More FAQs ›</a></p>
           </div>
-        </div>
-        <div class="row">
-          <div class="col-lg-6 links" *ngIf="officialMempoolSpace || env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.LIQUID_TESTNET_ENABLED else toolBox" >
+
+          <div class="links" *ngIf="officialMempoolSpace || env.TESTNET_ENABLED || env.SIGNET_ENABLED || env.LIQUID_ENABLED || env.LIQUID_TESTNET_ENABLED else toolBox" >
             <p class="category">Networks</p>
             <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== '') && (currentNetwork !== 'mainnet')"><a [href]="networkLink('mainnet')">Mainnet Explorer</a></p>
             <p *ngIf="(officialMempoolSpace || (env.BASE_MODULE === 'mempool')) && (currentNetwork !== 'testnet') && env.TESTNET_ENABLED"><a [href]="networkLink('testnet')">Testnet Explorer</a></p>
@@ -54,21 +53,21 @@
             <p *ngIf="(officialMempoolSpace && (currentNetwork !== 'bisq'))"><a [href]="networkLink('bisq')">Bisq Explorer</a></p>
           </div>
           <ng-template #toolBox>
-          <div class="col-lg-6 links">
+          <div class="links">
             <p class="category">Tools</p>
             <p><a [routerLink]="['/clock/mempool/0']">Clock (Mempool)</a></p>
             <p><a [routerLink]="['/clock/mined/0']">Clock (Mined)</a></p>
             <p><a [routerLink]="['/tools/calculator']">BTC/Fiat Converter</a></p>
           </div>
           </ng-template>
-          <div class="col-lg-6 links">
+          <div class="links">
             <p class="category">Legal</p>
             <p><a [routerLink]="['/terms-of-service']" i18n="shared.terms-of-service|Terms of Service">Terms of Service</a></p>
             <p><a [routerLink]="['/privacy-policy']" i18n="shared.privacy-policy|Privacy Policy">Privacy Policy</a></p>
             <p><a [routerLink]="['/trademark-policy']">Trademark Policy</a></p>
           </div>
-        </div>
-      </div>
+
+     <!-- </div>-->
     </div>
     <div class="row social-links">
       <div class="col-sm-12">
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
index 6b67711b6..8cdc6df21 100644
--- a/frontend/src/app/shared/components/global-footer/global-footer.component.scss
+++ b/frontend/src/app/shared/components/global-footer/global-footer.component.scss
@@ -12,13 +12,13 @@ footer p {
 }
 
 footer .row.main {
-  padding: 40px 0;
-  max-width: 1200px;
+  padding: 40px 0 24px 0;
+  max-width: 1140px;
   margin: 0 auto;
 }
 
 footer .row.main .branding {
-  text-align: center;
+
 }
 
 footer .row.main .branding > p {
@@ -38,16 +38,16 @@ footer .row.main .branding .cta {
   margin: 25px auto 25px auto;
 }
 
-footer .row.main .links.outer {
-  padding-left: 24px;
-  padding-top: 10px;
+footer .link-tree .links:nth-child(1), footer .link-tree .links:nth-child(4) {
+  padding-left: 0;
+  padding-right: 0;
 }
 
 footer .row.main .links > div:first-child {
   margin-bottom: 20px;
 }
 
-footer .row.main .links .category {
+footer .links .category {
   color: #4a68b9;
   font-weight: 700;
 }
@@ -57,12 +57,20 @@ footer .row.main .links .category:not(:first-child) {
 }
 
 footer .selector {
-  margin: 20px 0;
+  margin: 20px 5px;
+  float: right;
+}
+
+footer .row.link-tree {
+  max-width: 1140px;
+  margin: 0 auto;
+  display: flex;
+  justify-content: space-between;
 }
 
 footer .row.social-links {
   text-align: center;
-  margin-bottom: 24px;
+  margin: 24px 0;
 }
 
 footer .row.social-links a {
@@ -90,22 +98,11 @@ footer .row.version p a {
 }
 
 .main-logo {
-  max-width: 220px;
-  margin: 0 auto 20px auto;
+  width: 220px;
+  margin: 0;
+  display: inline-block;
 }
 
-@media (max-width: 992px) {
-
-  footer .row.main .links.outer {
-    text-align: center;
-  }
-
-  footer .row.main .links.outer > .row {
-    margin-top: 20px;
-  }
-
-  footer .row.main .links.outer > .row > div:first-child {
-    margin-bottom: 20px;
-  }
+@media (max-width: 1100px) {
 
 }