Merge branch 'master' into nymkappa/twitter-handle

frontend/src/app/components/master-page/master-page.component.html

@@ -78,7 +78,7 @@
 
 <div class="d-flex" style="overflow: clip">
   <app-menu *ngIf="servicesEnabled" [navOpen]="menuOpen" (loggedOut)="onLoggedOut()" (menuToggled)="menuToggled($event)"></app-menu>
-  <div *ngIf="!servicesEnabled" class="sidenav"><!-- empty sidenav needed to push footer down the screen --></div>
+  <div *ngIf="!servicesEnabled" class="empty-sidenav"><!-- empty sidenav needed to push footer down the screen --></div>
 
   <div class="flex-grow-1 d-flex flex-column">
     <app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert>

frontend/src/app/components/master-page/master-page.component.scss

@@ -241,7 +241,7 @@ main {
 }
 
 // empty sidenav
-.sidenav {
+.empty-sidenav {
   z-index: 1;
   background-color: transparent;
   width: 0px;

frontend/src/app/shared/components/global-footer/global-footer.component.html

@@ -11,7 +11,7 @@
           <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="site-options d-flex justify-content-center align-items-center" [class]="{'services': isServicesPage}">
+        <div class="site-options float-right d-flex justify-content-center align-items-center" [class]="{'services': isServicesPage}">
           <div class="selector">
             <app-language-selector></app-language-selector>
           </div>

frontend/src/app/shared/components/global-footer/global-footer.component.scss

@@ -63,7 +63,6 @@ footer .row.main .links .category:not(:first-child) {
 }
 
 footer .site-options {
-  float: right;
   margin-top: -20px;
 }