machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into nymkappa/twitter-handle

Browse Source
This commit is contained in:
nymkappa 2023-12-12 09:10:38 +01:00
commit 38479db5ca
No known key found for this signature in database
GPG Key ID: E155910B16E8BD04
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@ -35,7 +35,7 @@ jobs:
- name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain - name: Install ${{ steps.gettoolchain.outputs.toolchain }} Rust toolchain
# Latest version available on this commit is 1.71.1 # Latest version available on this commit is 1.71.1
# Commit date is Aug 3, 2023 # Commit date is Aug 3, 2023
uses: dtolnay/rust-toolchain@f361669954a8ecfc00a3443f35f9ac8e610ffc06 uses: dtolnay/rust-toolchain@be73d7920c329f220ce78e0234b8f96b7ae60248
with: with:
toolchain: ${{ steps.gettoolchain.outputs.toolchain }} toolchain: ${{ steps.gettoolchain.outputs.toolchain }}

2
frontend/src/app/components/master-page/master-page.component.html
View File

@ -78,7 +78,7 @@
<div class="d-flex" style="overflow: clip"> <div class="d-flex" style="overflow: clip">
<app-menu *ngIf="servicesEnabled" [navOpen]="menuOpen" (loggedOut)="onLoggedOut()" (menuToggled)="menuToggled($event)"></app-menu> <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"> <div class="flex-grow-1 d-flex flex-column">
<app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert> <app-testnet-alert *ngIf="network.val === 'testnet' || network.val === 'signet'"></app-testnet-alert>

2
frontend/src/app/components/master-page/master-page.component.scss
View File

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

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

@ -11,7 +11,7 @@
<ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container> <ng-container i18n="@@7deec1c1520f06170e1f8e8ddfbe4532312f638f">Explore the full Bitcoin ecosystem</ng-container>
<ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template> <ng-template [ngIf]="locale.substr(0, 2) === 'en'"> &trade;</ng-template>
</p> </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"> <div class="selector">
<app-language-selector></app-language-selector> <app-language-selector></app-language-selector>
</div> </div>

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

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

21
frontend/src/styles.scss
View File

@ -996,6 +996,27 @@ th {
.btn-audit { .btn-audit {
margin-left: .5em; margin-left: .5em;
} }
.sidenav {
@extend .sidenav;
margin-left: 0px !important;
margin-right: -250px;
}
.sidenav.open {
margin-right: 0px;
}
.profile_image_container {
@extend .profile_image_container;
margin-right: 0px !important;
margin-left: 15px;
}
#blockchain-container.with-menu {
width: calc(100% + 120px);
left: 120px;
}
} }
.scriptmessage { .scriptmessage {