From 3b766e181c59ce148fde73e507276c9fbaf37eb1 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Tue, 4 Sep 2018 18:35:39 +0200 Subject: fixing grid readjustment with expand and screens < 1150px --- client/src/app/app.component.html | 2 +- .../src/app/videos/+video-watch/video-watch.component.html | 14 +++++++++----- .../src/app/videos/+video-watch/video-watch.component.scss | 9 +++++++-- .../src/app/videos/+video-watch/video-watch.component.ts | 4 ++++ client/src/sass/application.scss | 6 ++++++ 5 files changed, 27 insertions(+), 8 deletions(-) (limited to 'client/src') diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 697abec8e..3eb8ef40a 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html @@ -22,7 +22,7 @@
-
+
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html index 3b6b5d8ed..582cf6e37 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.html +++ b/client/src/app/videos/+video-watch/video-watch.component.html @@ -28,7 +28,7 @@
-
+
@@ -197,12 +197,16 @@
- + +
+ +
+ +
-
- +
Friendly Reminder: diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index 633b16c05..be1388a83 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -37,8 +37,9 @@ } /deep/ .video-js { - width: 888px; - height: 500px; + width: calc(100vw - 240px); + height: auto; + max-height: 500px; &.vjs-theater-enabled { height: calc(100vh - #{$header-height} - #{$theater-bottom-space}); @@ -479,6 +480,10 @@ } } +@media (max-width: 1150px) { + .w-100-until-1150px { width: 100% !important } +} + @media screen and (max-width: 600px) { .video-bottom { margin: 20px 0 0 0; diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts index 768a08d42..95198f0aa 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.ts +++ b/client/src/app/videos/+video-watch/video-watch.component.ts @@ -317,6 +317,10 @@ export class VideoWatchComponent implements OnInit, OnDestroy { return this.video && this.video.state.id === VideoState.TO_IMPORT } + isMenuExpanded () { + return document.getElementById('right-container').classList.contains('expanded') + } + hasVideoScheduledPublication () { return this.video && this.video.scheduledUpdate !== undefined } diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 8e663d32f..a4fea13c2 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -363,3 +363,9 @@ table { } } } + +@media screen and (max-width: 400px) { + menu { + width: 100%; + } +} -- cgit v1.2.3