From 108af66140713c4beec681a71d360ab788226528 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 8 Jan 2018 11:30:48 +0100 Subject: Fix overflow in select inputs --- client/src/app/videos/+video-edit/video-add.component.html | 6 +++--- client/src/app/videos/+video-edit/video-add.component.ts | 4 ++++ client/src/sass/include/_mixins.scss | 3 ++- server/controllers/activitypub/client.ts | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/client/src/app/videos/+video-edit/video-add.component.html b/client/src/app/videos/+video-edit/video-add.component.html index 20277423c..193cc55ee 100644 --- a/client/src/app/videos/+video-edit/video-add.component.html +++ b/client/src/app/videos/+video-edit/video-add.component.html @@ -11,7 +11,7 @@
Select the file to upload - +
@@ -42,8 +42,8 @@
diff --git a/client/src/app/videos/+video-edit/video-add.component.ts b/client/src/app/videos/+video-edit/video-add.component.ts index 843475647..066f945fc 100644 --- a/client/src/app/videos/+video-edit/video-add.component.ts +++ b/client/src/app/videos/+video-edit/video-add.component.ts @@ -52,6 +52,10 @@ export class VideoAddComponent extends FormReactive implements OnInit { super() } + get videoExtensions () { + return this.serverService.getConfig().video.file.extensions.join(',') + } + buildForm () { this.form = this.formBuilder.group({}) this.form.valueChanges.subscribe(data => this.onValueChanged(data)) diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 7bfc93f08..1237e675d 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -146,7 +146,7 @@ } select { - padding: 0 12px; + padding: 0 35px 0 12px; width: calc(100% + 2px); position: relative; left: 1px; @@ -156,6 +156,7 @@ appearance: none; cursor: pointer; height: $button-height; + text-overflow: ellipsis; &:focus { outline: none; diff --git a/server/controllers/activitypub/client.ts b/server/controllers/activitypub/client.ts index 717473912..d1a761724 100644 --- a/server/controllers/activitypub/client.ts +++ b/server/controllers/activitypub/client.ts @@ -16,7 +16,7 @@ import { VideoShareModel } from '../../models/video/video-share' const activityPubClientRouter = express.Router() -activityPubClientRouter.get('/accounts/:name', +activityPubClientRouter.get('/accounts?/:name', executeIfActivityPub(asyncMiddleware(localAccountValidator)), executeIfActivityPub(accountController) ) -- cgit v1.2.3