aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-03-01 13:02:09 +0100
committerChocobozzz <me@florianbigard.com>2018-03-01 13:02:09 +0100
commita73c582e5b6f5c52427b38aaf55b3afbead24053 (patch)
tree607ecc74df7410fd8b740ff488110b84819accdc
parent57886d66718f0c2dd21f735472e35900a5059cce (diff)
downloadPeerTube-a73c582e5b6f5c52427b38aaf55b3afbead24053.tar.gz
PeerTube-a73c582e5b6f5c52427b38aaf55b3afbead24053.tar.zst
PeerTube-a73c582e5b6f5c52427b38aaf55b3afbead24053.zip
Improve playback speed style
-rw-r--r--client/src/sass/video-js-custom.scss12
-rw-r--r--server/models/account/user.ts25
2 files changed, 31 insertions, 6 deletions
diff --git a/client/src/sass/video-js-custom.scss b/client/src/sass/video-js-custom.scss
index e87ae21ae..f2251244a 100644
--- a/client/src/sass/video-js-custom.scss
+++ b/client/src/sass/video-js-custom.scss
@@ -220,8 +220,12 @@ $control-bar-height: 34px;
220 220
221 .vjs-playback-rate { 221 .vjs-playback-rate {
222 font-size: 10px; 222 font-size: 10px;
223 margin-right: 60px; 223 margin-right: 48px;
224 margin-top: 2px; 224
225 .vjs-playback-rate-value {
226 font-size: 13px;
227 line-height: $control-bar-height;
228 }
225 } 229 }
226 230
227 .vjs-mute-control { 231 .vjs-mute-control {
@@ -369,6 +373,10 @@ $control-bar-height: 34px;
369 font-size: 5em; 373 font-size: 5em;
370 } 374 }
371 375
376 .vjs-playback-rate {
377 display: none;
378 }
379
372 .vjs-peertube { 380 .vjs-peertube {
373 padding: 0 !important; 381 padding: 0 !important;
374 382
diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index afa9d7be0..8afd246b2 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -1,19 +1,36 @@
1import * as Sequelize from 'sequelize' 1import * as Sequelize from 'sequelize'
2import { 2import {
3 AllowNull, BeforeCreate, BeforeUpdate, Column, CreatedAt, DataType, Default, DefaultScope, HasMany, HasOne, Is, IsEmail, Model, 3 AllowNull,
4 Scopes, Table, UpdatedAt 4 BeforeCreate,
5 BeforeUpdate,
6 Column,
7 CreatedAt,
8 DataType,
9 Default,
10 DefaultScope,
11 HasMany,
12 HasOne,
13 Is,
14 IsEmail,
15 Model,
16 Scopes,
17 Table,
18 UpdatedAt
5} from 'sequelize-typescript' 19} from 'sequelize-typescript'
6import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared' 20import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared'
7import { User, UserRole } from '../../../shared/models/users' 21import { User, UserRole } from '../../../shared/models/users'
8import { 22import {
9 isUserAutoPlayVideoValid, isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid, 23 isUserAutoPlayVideoValid,
24 isUserDisplayNSFWValid,
25 isUserPasswordValid,
26 isUserRoleValid,
27 isUserUsernameValid,
10 isUserVideoQuotaValid 28 isUserVideoQuotaValid
11} from '../../helpers/custom-validators/users' 29} from '../../helpers/custom-validators/users'
12import { comparePassword, cryptPassword } from '../../helpers/peertube-crypto' 30import { comparePassword, cryptPassword } from '../../helpers/peertube-crypto'
13import { OAuthTokenModel } from '../oauth/oauth-token' 31import { OAuthTokenModel } from '../oauth/oauth-token'
14import { getSort, throwIfNotValid } from '../utils' 32import { getSort, throwIfNotValid } from '../utils'
15import { VideoChannelModel } from '../video/video-channel' 33import { VideoChannelModel } from '../video/video-channel'
16import { VideoCommentModel } from '../video/video-comment'
17import { AccountModel } from './account' 34import { AccountModel } from './account'
18 35
19@DefaultScope({ 36@DefaultScope({