aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/+about/about-instance/about-instance.component.html2
-rw-r--r--client/src/app/+about/about-instance/about-instance.component.scss2
-rw-r--r--client/src/manifest.webmanifest1
-rw-r--r--client/src/sass/application.scss2
-rw-r--r--client/src/sass/ng-select.scss8
-rw-r--r--server/lib/activitypub/actor.ts2
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 @@
7 <button i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" (keydown.enter)="openContactModal()" class="contact-admin">Contact administrator</button> 7 <button i18n *ngIf="isContactFormEnabled" (click)="openContactModal()" (keydown.enter)="openContactModal()" class="contact-admin">Contact administrator</button>
8 </div> 8 </div>
9 9
10 <div class="block instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0"> 10 <div class="instance-badges" *ngIf="categories.length !== 0 || languages.length !== 0">
11 <span *ngFor="let category of categories" class="badge badge-primary category">{{ category }}</span> 11 <span *ngFor="let category of categories" class="badge badge-primary category">{{ category }}</span>
12 12
13 <span *ngFor="let language of languages" class="badge badge-secondary language">{{ language }}</span> 13 <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 @@
4.about-instance-title { 4.about-instance-title {
5 display: flex; 5 display: flex;
6 justify-content: space-between; 6 justify-content: space-between;
7 margin-bottom: 20px;
8 7
9 .title { 8 .title {
10 font-size: 20px; 9 font-size: 20px;
@@ -21,6 +20,7 @@
21 20
22.instance-badges { 21.instance-badges {
23 font-size: 16px; 22 font-size: 16px;
23 margin-bottom: 20px;
24 24
25 .badge { 25 .badge {
26 font-size: 12px; 26 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 @@
2 "name": "PeerTube", 2 "name": "PeerTube",
3 "short_name": "PeerTube", 3 "short_name": "PeerTube",
4 "start_url": "/", 4 "start_url": "/",
5 "scope": "/",
6 "background_color": "#fff", 5 "background_color": "#fff",
7 "theme_color": "#fff", 6 "theme_color": "#fff",
8 "description": "A federated video streaming platform using P2P", 7 "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 {
90 90
91input, textarea { 91input, textarea {
92 outline: none; 92 outline: none;
93 color: pvar(--mainForegroundColor); 93 color: pvar(--inputForegroundColor);
94} 94}
95 95
96button { 96button {
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;
26 border-color: #ccc !important; 26 border-color: #ccc !important;
27 } 27 }
28 } 28 }
29
30 .ng-select-container {
31 background-color: pvar(--inputBackgroundColor);
32 }
33
34 &.ng-select-single .ng-value-container .ng-value {
35 color: pvar(--inputForegroundColor);
36 }
29} 37}
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 (
104 const recurseIfNeeded = false 104 const recurseIfNeeded = false
105 ownerActor = await getOrCreateActorAndServerAndModel(accountAttributedTo.id, 'all', recurseIfNeeded) 105 ownerActor = await getOrCreateActorAndServerAndModel(accountAttributedTo.id, 'all', recurseIfNeeded)
106 } catch (err) { 106 } catch (err) {
107 logger.error('Cannot get or create account attributed to video channel ' + actor.url) 107 logger.error('Cannot get or create account attributed to video channel ' + actorUrl)
108 throw new Error(err) 108 throw new Error(err)
109 } 109 }
110 } 110 }