diff options
author | Chocobozzz <me@florianbigard.com> | 2019-11-13 09:21:32 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-11-13 09:21:32 +0100 |
commit | f0c0c0abd88d0177f8be769f12d5affcacd934e8 (patch) | |
tree | 78e92eea650754e4fc6a95de8fcb807a8888ae18 /client | |
parent | fe02503052013ca1675aad4ee1eb4a35c2f8359f (diff) | |
parent | 9bdcf6248fb59f847d5de32defa923c8236656f6 (diff) | |
download | PeerTube-f0c0c0abd88d0177f8be769f12d5affcacd934e8.tar.gz PeerTube-f0c0c0abd88d0177f8be769f12d5affcacd934e8.tar.zst PeerTube-f0c0c0abd88d0177f8be769f12d5affcacd934e8.zip |
Merge branch 'release/2.0.0' into develop
Diffstat (limited to 'client')
-rw-r--r-- | client/src/app/login/login.component.html | 2 | ||||
-rw-r--r-- | client/src/sass/bootstrap.scss | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html index 3fb1247c8..9bbeab3be 100644 --- a/client/src/app/login/login.component.html +++ b/client/src/app/login/login.component.html | |||
@@ -19,7 +19,7 @@ | |||
19 | or create an account | 19 | or create an account |
20 | </a> | 20 | </a> |
21 | 21 | ||
22 | <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#instances-list" target="_blank" title="Click here to see a list of instances where to register" class="create-an-account"> | 22 | <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/instances#instances-list" target="_blank" title="Click here to see a list of instances where to register" class="create-an-account"> |
23 | or create an account on another instance | 23 | or create an account on another instance |
24 | </a> | 24 | </a> |
25 | 25 | ||
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 12e73278a..8f1e18d9e 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss | |||
@@ -125,6 +125,11 @@ ngb-tabset.bootstrap { | |||
125 | border-bottom: none; | 125 | border-bottom: none; |
126 | } | 126 | } |
127 | 127 | ||
128 | .card { | ||
129 | background-color: var(--mainBackgroundColor); | ||
130 | border-color: #dee2e6; | ||
131 | } | ||
132 | |||
128 | .collapse-transition { | 133 | .collapse-transition { |
129 | // Animation when we show/hide the filters | 134 | // Animation when we show/hide the filters |
130 | transition: max-height 0.3s; | 135 | transition: max-height 0.3s; |