diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-05-28 14:25:03 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-05-28 14:25:03 +0200 |
| commit | 1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89 (patch) | |
| tree | b8f8243bccb517e8e6fb54dc99526d62636ca0b4 | |
| parent | daa45ded44f0e7329a8ea88024275b0bb69ea0cb (diff) | |
| parent | 1025ce5df9f5cfa7b96f9712c91d1de6bc699f71 (diff) | |
| download | PeerTube-1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89.tar.gz PeerTube-1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89.tar.zst PeerTube-1c5e49e75284100b7b1fc8b4e73c8ba53fe22e89.zip | |
Merge branch 'release/3.2.0' into develop
| -rw-r--r-- | client/src/app/menu/menu.component.html | 2 | ||||
| -rw-r--r-- | client/src/app/menu/menu.component.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html index 2c2c4f260..099ee8f36 100644 --- a/client/src/app/menu/menu.component.html +++ b/client/src/app/menu/menu.component.html | |||
| @@ -92,7 +92,7 @@ | |||
| 92 | 92 | ||
| 93 | <div *ngIf="!isLoggedIn" class="login-buttons-block"> | 93 | <div *ngIf="!isLoggedIn" class="login-buttons-block"> |
| 94 | <a i18n routerLink="/login" class="peertube-button-link orange-button">Login</a> | 94 | <a i18n routerLink="/login" class="peertube-button-link orange-button">Login</a> |
| 95 | <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="peertube-button-link">Create an account</a> | 95 | <a i18n *ngIf="isRegistrationAllowed()" routerLink="/signup" class="peertube-button-link create-account-button">Create an account</a> |
| 96 | </div> | 96 | </div> |
| 97 | 97 | ||
| 98 | <div *ngIf="isLoggedIn" class="in-my-library"> | 98 | <div *ngIf="isLoggedIn" class="in-my-library"> |
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss index d0edd820e..6da80191a 100644 --- a/client/src/app/menu/menu.component.scss +++ b/client/src/app/menu/menu.component.scss | |||
| @@ -259,7 +259,7 @@ my-actor-avatar { | |||
| 259 | display: block; | 259 | display: block; |
| 260 | width: 100%; | 260 | width: 100%; |
| 261 | 261 | ||
| 262 | :not(:last-child) { | 262 | &:not(:last-child) { |
| 263 | margin-bottom: 10px; | 263 | margin-bottom: 10px; |
| 264 | } | 264 | } |
| 265 | } | 265 | } |