From: Chocobozzz <me@florianbigard.com>
Date: Thu, 1 Mar 2018 12:02:09 +0000 (+0100)
Subject: Improve playback speed style
X-Git-Tag: v1.0.0-alpha.1~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a73c582e5b6f5c52427b38aaf55b3afbead24053;p=oweals%2Fpeertube.git

Improve playback speed style
---

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;
 
     .vjs-playback-rate {
       font-size: 10px;
-      margin-right: 60px;
-      margin-top: 2px;
+      margin-right: 48px;
+
+      .vjs-playback-rate-value {
+        font-size: 13px;
+        line-height: $control-bar-height;
+      }
     }
 
     .vjs-mute-control {
@@ -369,6 +373,10 @@ $control-bar-height: 34px;
       font-size: 5em;
     }
 
+    .vjs-playback-rate {
+      display: none;
+    }
+
     .vjs-peertube {
       padding: 0 !important;
 
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 @@
 import * as Sequelize from 'sequelize'
 import {
-  AllowNull, BeforeCreate, BeforeUpdate, Column, CreatedAt, DataType, Default, DefaultScope, HasMany, HasOne, Is, IsEmail, Model,
-  Scopes, Table, UpdatedAt
+  AllowNull,
+  BeforeCreate,
+  BeforeUpdate,
+  Column,
+  CreatedAt,
+  DataType,
+  Default,
+  DefaultScope,
+  HasMany,
+  HasOne,
+  Is,
+  IsEmail,
+  Model,
+  Scopes,
+  Table,
+  UpdatedAt
 } from 'sequelize-typescript'
 import { hasUserRight, USER_ROLE_LABELS, UserRight } from '../../../shared'
 import { User, UserRole } from '../../../shared/models/users'
 import {
-  isUserAutoPlayVideoValid, isUserDisplayNSFWValid, isUserPasswordValid, isUserRoleValid, isUserUsernameValid,
+  isUserAutoPlayVideoValid,
+  isUserDisplayNSFWValid,
+  isUserPasswordValid,
+  isUserRoleValid,
+  isUserUsernameValid,
   isUserVideoQuotaValid
 } from '../../helpers/custom-validators/users'
 import { comparePassword, cryptPassword } from '../../helpers/peertube-crypto'
 import { OAuthTokenModel } from '../oauth/oauth-token'
 import { getSort, throwIfNotValid } from '../utils'
 import { VideoChannelModel } from '../video/video-channel'
-import { VideoCommentModel } from '../video/video-comment'
 import { AccountModel } from './account'
 
 @DefaultScope({