diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.css b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.css index 859eb7dbf2..9a7c6e3e95 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.css +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.css @@ -1,8 +1,48 @@ +.viewer-video-row { + display: -webkit-box; + display: -moz-box; + display: -ms-flexbox; + display: -webkit-flex; + display: flex; + + -webkit-box-orient: horizontal; + -moz-box-orient: horizontal; + box-orient: horizontal; + flex-direction: row; + + -webkit-box-pack: center; + -moz-box-pack: center; + box-pack: center; + justify-content: center; + + -webkit-box-align: center; + -moz-box-align: center; + box-align: center; + align-items: center; +} + +.viewer-video-cell { + -webkit-box-flex: 1; + -moz-box-flex: 1; + box-flex: 1; + -webkit-flex: 1 1 auto; + flex: 1 1 auto; + + padding: 10px; + margin: 10px; + + text-align: center; +} + video { + max-height: 80vh; + display: flex; + flex-direction: row; + flex-wrap: nowrap; + justify-content: center; + align-items: center; + align-content: center; max-width: 100%; margin-left: auto; margin-right: auto; - display: block; - width: 70%; - width: 70%; } diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.html b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.html index 1f511aaa1d..cf89162907 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.html @@ -1,3 +1,10 @@ - +
+
+
+ +
+
+
+ diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts index 539a6b777a..a4d618cbc8 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts +++ b/ng2-components/ng2-alfresco-viewer/src/componets/mediaPlayer.component.ts @@ -15,14 +15,15 @@ * limitations under the License. */ -import { Component, Input } from '@angular/core'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; declare let __moduleName: string; @Component({ moduleId: __moduleName, selector: 'media-player', templateUrl: './mediaPlayer.component.html', - styleUrls: ['./mediaPlayer.component.css'] + styleUrls: ['./mediaPlayer.component.css'], + encapsulation: ViewEncapsulation.None }) export class MediaPlayerComponent { diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css index f814ea2582..677f0acbf3 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.css @@ -55,7 +55,3 @@ img-viewer { justify-content: center; } -.viewer-content-container { - width: 100%; - margin: auto; -} diff --git a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.html b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.html index 2d30d473bb..0e586a295b 100644 --- a/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/componets/viewer.component.html @@ -43,9 +43,8 @@ -
+
-
@@ -60,7 +59,6 @@
-