6 files changed, 12 insertions, 5 deletions

diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html
index 40602311c..d8794d602 100644
--- a/client/src/app/+about/about-instance/about-instance.component.html
+++ b/client/src/app/+about/about-instance/about-instance.component.html
@@ -7,7 +7,7 @@
       <button i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" (keydown.enter)="openContactModal()" class="contact-admin">Contact administrator</button>
     </div>
 
-    <div class="block instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0">
+    <div class="instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0">
       <span *ngFor="let category of categories" class="badge badge-primary category">{{ category }}</span>
 
       <span *ngFor="let language of languages" class="badge badge-secondary language">{{ language }}</span>
diff --git a/client/src/app/+about/about-instance/about-instance.component.scss b/client/src/app/+about/about-instance/about-instance.component.scss
index 1a6fad13a..7158a3a79 100644
--- a/client/src/app/+about/about-instance/about-instance.component.scss
+++ b/client/src/app/+about/about-instance/about-instance.component.scss
@@ -4,7 +4,6 @@
 .about-instance-title {
   display: flex;
   justify-content: space-between;
-  margin-bottom: 20px;
 
   .title {
     font-size: 20px;
@@ -21,6 +20,7 @@
 
 .instance-badges {
   font-size: 16px;
+  margin-bottom: 20px;
 
   .badge {
     font-size: 12px;
diff --git a/client/src/manifest.webmanifest b/client/src/manifest.webmanifest
index b2a458aec..6e62856cd 100644
--- a/client/src/manifest.webmanifest
+++ b/client/src/manifest.webmanifest
@@ -2,7 +2,6 @@
   "name": "PeerTube",
   "short_name": "PeerTube",
   "start_url": "/",
-  "scope": "/",
   "background_color": "#fff",
   "theme_color": "#fff",
   "description": "A federated video streaming platform using P2P",
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index 3f6e6c8a7..1888d9350 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -90,7 +90,7 @@ input.readonly {
 
 input, textarea {
   outline: none;
-  color: pvar(--mainForegroundColor);
+  color: pvar(--inputForegroundColor);
 }
 
 button {
diff --git a/client/src/sass/ng-select.scss b/client/src/sass/ng-select.scss
index f836e203c..d7ea73d48 100644
--- a/client/src/sass/ng-select.scss
+++ b/client/src/sass/ng-select.scss
@@ -26,4 +26,12 @@ $ng-select-height: 30px;
       border-color: #ccc !important;
     }
   }
+
+  .ng-select-container {
+    background-color: pvar(--inputBackgroundColor);
+  }
+
+  &.ng-select-single .ng-value-container .ng-value {
+    color: pvar(--inputForegroundColor);
+  }
 }
diff --git a/server/lib/activitypub/actor.ts b/server/lib/activitypub/actor.ts
index 086d656f9..dbb243d3a 100644
--- a/server/lib/activitypub/actor.ts
+++ b/server/lib/activitypub/actor.ts
@@ -104,7 +104,7 @@ async function getOrCreateActorAndServerAndModel (
         const recurseIfNeeded = false
         ownerActor = await getOrCreateActorAndServerAndModel(accountAttributedTo.id, 'all', recurseIfNeeded)
       } catch (err) {
-        logger.error('Cannot get or create account attributed to video channel ' + actor.url)
+        logger.error('Cannot get or create account attributed to video channel ' + actorUrl)
         throw new Error(err)
       }
     }