Browse Source

ref(filmstrip): use explicit class for horizontal filmstrip

This will make it easier to support horizontal, vertical, and
tile layout filmstrip by reducing the css overriding needed
for tile layout.
master
Leonard Kim 7 years ago
parent
commit
2547ee3a04
2 changed files with 32 additions and 7 deletions
  1. 1
    1
      css/filmstrip/_horizontal_filmstrip.scss
  2. 31
    6
      css/filmstrip/_vertical_filmstrip.scss

+ 1
- 1
css/filmstrip/_horizontal_filmstrip.scss View File

@@ -5,7 +5,7 @@
5 5
     justify-content: flex-start;
6 6
 }
7 7
 
8
-.filmstrip {
8
+.horizontal-filmstrip .filmstrip {
9 9
     position: absolute;
10 10
     bottom: 0;
11 11
     right: 0;

+ 31
- 6
css/filmstrip/_vertical_filmstrip.scss View File

@@ -1,4 +1,11 @@
1 1
 .vertical-filmstrip .filmstrip {
2
+    &.hide-videos {
3
+        .remote-videos-container {
4
+            opacity: 0;
5
+            pointer-events: none;
6
+        }
7
+    }
8
+
2 9
     /*
3 10
      * Firefox sets flex items to min-height: auto and min-width: auto,
4 11
      * preventing flex children from shrinking like they do on other browsers.
@@ -11,11 +18,14 @@
11 18
         min-width: 0;
12 19
     }
13 20
 
21
+    @extend %align-right;
14 22
     align-items: flex-end;
23
+    bottom: 0;
15 24
     box-sizing: border-box;
16 25
     display: flex;
17 26
     flex-direction: column-reverse;
18 27
     height: 100%;
28
+    padding: 10px 5px;
19 29
     /**
20 30
      * fixed positioning is necessary for remote menus and tooltips to pop
21 31
      * out of the scrolling filmstrip. AtlasKit dialogs and tooltips use
@@ -25,6 +35,7 @@
25 35
     position: fixed;
26 36
     top: 0;
27 37
     transition: height .3s ease-in;
38
+    right: 0;
28 39
     z-index: $filmstripVideosZ;
29 40
 
30 41
     &.reduce-height {
@@ -35,7 +46,13 @@
35 46
      * Hide videos by making them slight to the right.
36 47
      */
37 48
     .filmstrip__videos {
49
+        @extend %align-right;
50
+        bottom: 0;
51
+        overflow: visible !important;
52
+        padding: 0;
53
+        position:relative;
38 54
         right: 0;
55
+        width: auto;
39 56
 
40 57
         &.hidden {
41 58
             bottom: auto;
@@ -47,12 +64,7 @@
47 64
          * filmstrip styles.
48 65
          */
49 66
         &#remoteVideos {
50
-            /**
51
-             * Remove horizontal filmstrip padding used to prevent videos
52
-             * from overlapping getting near the left-side of the screen.
53
-             * An id selector is used to match id specificity with filmstrip
54
-             * styles.
55
-             */
67
+            border: $thumbnailsBorder solid transparent;
56 68
             padding-left: 0;
57 69
             transition: right 2s;
58 70
         }
@@ -105,6 +117,11 @@
105 117
         flex-direction: column;
106 118
         flex-grow: 1;
107 119
     }
120
+
121
+    .remote-videos-container {
122
+        display: flex;
123
+        transition: opacity 1s;
124
+    }
108 125
 }
109 126
 
110 127
 /**
@@ -115,8 +132,16 @@
115 132
         flex-direction: row-reverse;
116 133
     }
117 134
     .filmstrip__videos-filmstripOnly {
135
+        margin-top: auto;
136
+        margin-bottom: auto;
118 137
         height: 100%;
119 138
     }
139
+
140
+    .filmstrip__videos {
141
+        &#filmstripLocalVideo {
142
+            bottom: 0px;
143
+        }
144
+    }
120 145
 }
121 146
 
122 147
 /**

Loading…
Cancel
Save