Circle avatar

This commit is contained in:
Chocobozzz 2018-01-03 11:54:42 +01:00
parent e8e122002d
commit 4e8c872874
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 12 additions and 9 deletions

View File

@ -6,6 +6,7 @@
img { img {
@include avatar(50px); @include avatar(50px);
margin-right: 15px; margin-right: 15px;
} }

View File

@ -21,10 +21,10 @@ menu {
margin-bottom: 35px; margin-bottom: 35px;
img { img {
@include avatar(34px);
margin-left: 20px; margin-left: 20px;
margin-right: 10px; margin-right: 10px;
@include avatar(34px);
} }
.logged-in-info { .logged-in-info {

View File

@ -110,11 +110,6 @@
} }
} }
@mixin avatar ($size) {
width: $size;
height: $size;
}
@mixin icon ($size) { @mixin icon ($size) {
display: inline-block; display: inline-block;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -125,7 +120,6 @@
cursor: pointer; cursor: pointer;
} }
@mixin peertube-select-container ($width) { @mixin peertube-select-container ($width) {
padding: 0; padding: 0;
margin: 0; margin: 0;
@ -267,3 +261,10 @@
} }
} }
@mixin avatar ($size) {
object-fit: cover;
border-radius:50%;
width: $size;
height: $size;
}

View File

@ -3,7 +3,7 @@ import { extname, join } from 'path'
import * as sharp from 'sharp' import * as sharp from 'sharp'
import * as uuidv4 from 'uuid/v4' import * as uuidv4 from 'uuid/v4'
import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared' import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRate as FormattedUserVideoRate } from '../../../shared'
import { renamePromise, unlinkPromise } from '../../helpers/core-utils' import { unlinkPromise } from '../../helpers/core-utils'
import { retryTransactionWrapper } from '../../helpers/database-utils' import { retryTransactionWrapper } from '../../helpers/database-utils'
import { logger } from '../../helpers/logger' import { logger } from '../../helpers/logger'
import { createReqFiles, getFormattedObjects } from '../../helpers/utils' import { createReqFiles, getFormattedObjects } from '../../helpers/utils'

View File

@ -65,6 +65,7 @@ async function updateRemoteVideo (actor: ActorModel, activity: ActivityUpdate) {
videoInstance.set('licence', videoData.licence) videoInstance.set('licence', videoData.licence)
videoInstance.set('language', videoData.language) videoInstance.set('language', videoData.language)
videoInstance.set('nsfw', videoData.nsfw) videoInstance.set('nsfw', videoData.nsfw)
videoInstance.set('commentsEnabled', videoData.commentsEnabled)
videoInstance.set('privacy', videoData.privacy) videoInstance.set('privacy', videoData.privacy)
videoInstance.set('description', videoData.description) videoInstance.set('description', videoData.description)
videoInstance.set('duration', videoData.duration) videoInstance.set('duration', videoData.duration)