From 9d756c8dfd5b5ba02563a9663785e8be81d71799 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 24 Jul 2020 12:05:36 +0200
Subject: [PATCH] adapt notifications buttons for small screens

---
 .../my-account-notifications.component.html                | 2 +-
 client/src/sass/application.scss                           | 2 +-
 server/controllers/api/users/my-subscriptions.ts           | 7 ++++++-
 server/models/activitypub/actor-follow.ts                  | 3 +--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
index 8de152b5efed..a60ed885da71 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -5,7 +5,7 @@ <h1 class="sr-only" i18n>Notifications</h1>
     Notification preferences
   </a>
 
-  <div class="peertube-select-container peertube-select-button ml-2">
+  <div class="peertube-select-container peertube-select-button ml-2 mr-2">
     <select [(ngModel)]="notificationSortType" (ngModelChange)="onChangeSortColumn()" class="form-control">
       <option value="undefined" disabled>Sort by</option>
       <option value="createdAt" i18n>Newest first</option>
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss
index c76e5db7b2c6..c4aa2d418026 100644
--- a/client/src/sass/application.scss
+++ b/client/src/sass/application.scss
@@ -363,7 +363,7 @@ table {
       input[type=email],
       textarea,
       .peertube-select-container {
-        width: 100% !important;
+        flex-grow: 1;
       }
 
       .caption input[type=text] {
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index d207a19ae02b..8b88feaf3d0b 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -13,7 +13,12 @@ import {
   userSubscriptionAddValidator,
   userSubscriptionGetValidator
 } from '../../../middlewares'
-import { areSubscriptionsExistValidator, userSubscriptionsSortValidator, videosSortValidator, userSubscriptionListValidator } from '../../../middlewares/validators'
+import {
+  areSubscriptionsExistValidator,
+  userSubscriptionsSortValidator,
+  videosSortValidator,
+  userSubscriptionListValidator
+} from '../../../middlewares/validators'
 import { VideoModel } from '../../../models/video/video'
 import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
 import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
diff --git a/server/models/activitypub/actor-follow.ts b/server/models/activitypub/actor-follow.ts
index 529cb35ccc0d..10c13304f8dd 100644
--- a/server/models/activitypub/actor-follow.ts
+++ b/server/models/activitypub/actor-follow.ts
@@ -15,8 +15,7 @@ import {
   Max,
   Model,
   Table,
-  UpdatedAt,
-  Sequelize
+  UpdatedAt
 } from 'sequelize-typescript'
 import { FollowState } from '../../../shared/models/actors'
 import { ActorFollow } from '../../../shared/models/actors/follow.model'