aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/app/account/account-settings/account-settings.component.scss1
-rw-r--r--client/src/app/menu/menu.component.scss4
-rw-r--r--client/src/sass/include/_mixins.scss13
-rw-r--r--server/controllers/api/users.ts2
-rw-r--r--server/lib/activitypub/process/process-update.ts1
5 files changed, 12 insertions, 9 deletions
diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/account/account-settings/account-settings.component.scss
index c8a27dbcd..fbd1cb9f0 100644
--- a/client/src/app/account/account-settings/account-settings.component.scss
+++ b/client/src/app/account/account-settings/account-settings.component.scss
@@ -6,6 +6,7 @@
6 6
7 img { 7 img {
8 @include avatar(50px); 8 @include avatar(50px);
9
9 margin-right: 15px; 10 margin-right: 15px;
10 } 11 }
11 12
diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 8cb94b3dd..ae167cfb6 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -21,10 +21,10 @@ menu {
21 margin-bottom: 35px; 21 margin-bottom: 35px;
22 22
23 img { 23 img {
24 @include avatar(34px);
25
24 margin-left: 20px; 26 margin-left: 20px;
25 margin-right: 10px; 27 margin-right: 10px;
26
27 @include avatar(34px);
28 } 28 }
29 29
30 .logged-in-info { 30 .logged-in-info {
diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss
index 140de1b2c..7bfc93f08 100644
--- a/client/src/sass/include/_mixins.scss
+++ b/client/src/sass/include/_mixins.scss
@@ -110,11 +110,6 @@
110 } 110 }
111} 111}
112 112
113@mixin avatar ($size) {
114 width: $size;
115 height: $size;
116}
117
118@mixin icon ($size) { 113@mixin icon ($size) {
119 display: inline-block; 114 display: inline-block;
120 background-repeat: no-repeat; 115 background-repeat: no-repeat;
@@ -125,7 +120,6 @@
125 cursor: pointer; 120 cursor: pointer;
126} 121}
127 122
128
129@mixin peertube-select-container ($width) { 123@mixin peertube-select-container ($width) {
130 padding: 0; 124 padding: 0;
131 margin: 0; 125 margin: 0;
@@ -267,3 +261,10 @@
267 } 261 }
268} 262}
269 263
264
265@mixin avatar ($size) {
266 object-fit: cover;
267 border-radius:50%;
268 width: $size;
269 height: $size;
270}
diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts
index 6c24434f2..d37813595 100644
--- a/server/controllers/api/users.ts
+++ b/server/controllers/api/users.ts
@@ -3,7 +3,7 @@ import { extname, join } from 'path'
3import * as sharp from 'sharp' 3import * as sharp from 'sharp'
4import * as uuidv4 from 'uuid/v4' 4import * as uuidv4 from 'uuid/v4'
5import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared' 5import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
6import { renamePromise, unlinkPromise } from '../../helpers/core-utils' 6import { unlinkPromise } from '../../helpers/core-utils'
7import { retryTransactionWrapper } from '../../helpers/database-utils' 7import { retryTransactionWrapper } from '../../helpers/database-utils'
8import { logger } from '../../helpers/logger' 8import { logger } from '../../helpers/logger'
9import { createReqFiles, getFormattedObjects } from '../../helpers/utils' 9import { createReqFiles, getFormattedObjects } from '../../helpers/utils'
diff --git a/server/lib/activitypub/process/process-update.ts b/server/lib/activitypub/process/process-update.ts
index a5ad406cb..bc8ae5cc6 100644
--- a/server/lib/activitypub/process/process-update.ts
+++ b/server/lib/activitypub/process/process-update.ts
@@ -65,6 +65,7 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
65 videoInstance.set('licence', videoData.licence) 65 videoInstance.set('licence', videoData.licence)
66 videoInstance.set('language', videoData.language) 66 videoInstance.set('language', videoData.language)
67 videoInstance.set('nsfw', videoData.nsfw) 67 videoInstance.set('nsfw', videoData.nsfw)
68 videoInstance.set('commentsEnabled', videoData.commentsEnabled)
68 videoInstance.set('privacy', videoData.privacy) 69 videoInstance.set('privacy', videoData.privacy)
69 videoInstance.set('description', videoData.description) 70 videoInstance.set('description', videoData.description)
70 videoInstance.set('duration', videoData.duration) 71 videoInstance.set('duration', videoData.duration)