瀏覽代碼

ref(toolbar): remove main css for old toolbar

master
Leonard Kim 7 年之前
父節點
當前提交
09482f053b
共有 4 個文件被更改,包括 3 次插入434 次删除
  1. 0
    50
      css/_animations.scss
  2. 0
    355
      css/_toolbars.scss
  3. 0
    13
      css/_variables.scss
  4. 3
    16
      css/_vertical_filmstrip_overrides.scss

+ 0
- 50
css/_animations.scss 查看文件

@@ -2,42 +2,6 @@
2 2
 * Project animations
3 3
 **/
4 4
 
5
-/**
6
- *   Slide in animation for extended toolbar.
7
- */
8
-@include keyframes(slideInX) {
9
-    0% { transform: translateX(-100%); }
10
-    100% { transform: translateX(0%); }
11
-}
12
-
13
-@include keyframes(slideOutX) {
14
-    0% { transform: translateX(0%); }
15
-    100% { transform: translateX(-100%); }
16
-}
17
-
18
-@include keyframes(slideInExtX) {
19
-    0% { transform: translateX(-500%); }
20
-    100% { transform: translateX(0%); }
21
-}
22
-
23
-@include keyframes(slideOutExtX) {
24
-    0% { transform: translateX(0%); }
25
-    100% { transform: translateX(-500%); }
26
-}
27
-
28
-/**
29
- *   Slide in / out animation for main toolbar.
30
- */
31
-
32
-@include keyframes(slideInY) {
33
-    100% { transform: translateY(0%); }
34
-}
35
-
36
-@include keyframes(slideOutY) {
37
-    0% { transform: translateY(0%); }
38
-    100% { transform: translateY(-100%); }
39
-}
40
-
41 5
 /**
42 6
  *   Slide in animation for extended toolbar (inner) panel.
43 7
  */
@@ -53,17 +17,3 @@
53 17
     from { left: 0; }
54 18
     to   { left: -$sidebarWidth; }
55 19
 }
56
-
57
-/**
58
-*   Slide in animation for extended toolbar container
59
-**/
60
-
61
-@include keyframes(slideOutExtContainer) {
62
-    from { width: $sidebarWidth; }
63
-    to { width: 0; }
64
-}
65
-
66
-@include keyframes(slideInExtContainer) {
67
-    from { width: 0; }
68
-    to { width: $sidebarWidth; }
69
-}

+ 0
- 355
css/_toolbars.scss 查看文件

@@ -30,248 +30,6 @@
30 30
     }
31 31
 }
32 32
 
33
-.toolbar-container {
34
-    display: block;
35
-    left:0;
36
-    min-height: 100px;
37
-    opacity: 0;
38
-    pointer-events: none;
39
-    position: absolute;
40
-    right:0;
41
-    text-align: center;
42
-    top:0;
43
-    z-index: $toolbarZ;
44
-}
45
-
46
-/**
47
- * Common toolbar styles.
48
- */
49
-.toolbar {
50
-    height: 100%;
51
-    pointer-events: auto;
52
-    position: relative;
53
-    z-index: $toolbarZ;
54
-
55
-    /**
56
-     * Ensure nested elements that don't have a button class, maybe because they
57
-     * are wrapped in a React Element, still display in a line.
58
-     */
59
-    > div {
60
-        display: inline-block;
61
-    }
62
-
63
-    /**
64
-     * Always on top overrides.
65
-     */
66
-    &.always-on-top {
67
-        /**
68
-         * Toolbar button styles for always on top.
69
-         */
70
-        .button {
71
-            font-size: $alwaysOnTopToolbarFontSize;
72
-            height: $alwaysOnTopToolbarSize;
73
-            line-height: $alwaysOnTopToolbarSize;
74
-            width: $alwaysOnTopToolbarSize;
75
-            &_hangup, &_hangup:hover {
76
-                font-size: $alwaysOnTopToolbarFontSize;
77
-            }
78
-        }
79
-    }
80
-
81
-    /**
82
-     * Toolbar button styles.
83
-     */
84
-    .button {
85
-        color: $toolbarButtonColor;
86
-        cursor: pointer;
87
-        z-index: $zindex1;
88
-        display: inline-block;
89
-        font-size: $toolbarFontSize;
90
-        height: $defaultToolbarSize;
91
-        line-height: $defaultToolbarSize;
92
-        position: relative;
93
-        text-align: center;
94
-        top:0px;
95
-        vertical-align: middle;
96
-        width: $defaultToolbarSize;
97
-
98
-        &[disabled] {
99
-            opacity: 0.5;
100
-        }
101
-
102
-        &:hover, &:active {
103
-            color: $toolbarButtonColor;
104
-            cursor: pointer;
105
-            text-decoration: none;
106
-        }
107
-
108
-        &_hangup, &_hangup:hover {
109
-            color: $hangupColor;
110
-            font-size: $hangupFontSize;
111
-        }
112
-
113
-        &:not(.toggled) {
114
-            &:hover, &:active {
115
-                // sum opacity with background layer should give us 0.8
116
-                background: $toolbarSelectBackground;
117
-            }
118
-        }
119
-
120
-        &.toggled {
121
-            background: $toolbarToggleBackground;
122
-
123
-            &.icon-camera {
124
-                @extend .icon-camera-disabled;
125
-            }
126
-
127
-            &.icon-full-screen {
128
-                @extend .icon-exit-full-screen;
129
-            }
130
-
131
-            &.icon-microphone {
132
-                @extend .icon-mic-disabled;
133
-            }
134
-        }
135
-
136
-        &.unclickable {
137
-            cursor: default;
138
-
139
-            &:hover, &:active, &.selected {
140
-                background: none;
141
-                cursor: default;
142
-            }
143
-        }
144
-    }
145
-
146
-    /**
147
-     * Primary toolbar styles.
148
-     */
149
-    &_primary {
150
-        background-color: $toolbarBackground;
151
-        position: absolute;
152
-        left: 50%;
153
-        top: 30px;
154
-        display: inline-block;
155
-        width: auto;
156
-        height: $defaultToolbarSize;
157
-        border-radius: 3px;
158
-        opacity: 0;
159
-
160
-        &.always-on-top {
161
-            height: $alwaysOnTopToolbarSize;
162
-            top: 10px;
163
-        }
164
-
165
-        @include transform(translateX(-50%));
166
-
167
-        > a:first-child.button,
168
-        > div:first-child .button {
169
-            border-bottom-left-radius: 3px;
170
-            border-top-left-radius: 3px;
171
-        }
172
-
173
-        > a:last-child.button,
174
-        > div:last-child .button {
175
-            border-bottom-right-radius: 3px;
176
-            border-top-right-radius: 3px;
177
-        }
178
-    }
179
-
180
-    &_primary a.button:last-child::after {
181
-        content: none;
182
-    }
183
-
184
-    /**
185
-     * Secondary toolbar styles.
186
-     */
187
-    &_secondary {
188
-        background-color: $secondaryToolbarBg;
189
-        position: absolute;
190
-        align-items: center;
191
-        box-sizing: border-box;
192
-        display: -moz-box;
193
-        display: -ms-flexbox;
194
-        display: -webkit-box;
195
-        display: -webkit-flex;
196
-        display: flex;
197
-        flex-direction: column;
198
-        flex-wrap: nowrap;
199
-        height: 100%;
200
-        justify-content: flex-start;
201
-        left: 0;
202
-        padding-top: 24px;
203
-        pointer-events: none;
204
-        top: 0;
205
-        transform: translateX(-100%);
206
-        width: $defaultToolbarSize;
207
-        -webkit-transform: translateX(-100%);
208
-
209
-        .button {
210
-            font-size: $secToolbarFontSize;
211
-            height: $secToolbarLineHeight;
212
-            line-height: $secToolbarLineHeight;
213
-        }
214
-
215
-        > * {
216
-            pointer-events: auto
217
-        }
218
-
219
-        .button.toggled:not(.icon-raised-hand):not(.button-active) {
220
-            background: $secondaryToolbarBg;
221
-            cursor: pointer;
222
-            text-decoration: none;
223
-
224
-            &.unclickable {
225
-                cursor: default;
226
-
227
-                &:hover, &:active, &.selected {
228
-                    background: none;
229
-                    cursor: default;
230
-                }
231
-            }
232
-        }
233
-    }
234
-
235
-    /**
236
-     * Styles the toolbar in filmstrip-only mode.
237
-     */
238
-    &_filmstrip-only {
239
-        background-color: $toolbarBackground;
240
-        border-radius: 3px;
241
-        display: inline-block;
242
-        height: auto;
243
-        width: $defaultFilmStripOnlyToolbarSize;
244
-
245
-        .button {
246
-            height: 37px;
247
-            line-height: 37px !important;
248
-            width: 37px;
249
-        }
250
-
251
-        .button-popover-message {
252
-            width: 100px;
253
-        }
254
-
255
-        .toolbar-button-wrapper:first-child .button {
256
-            border-top-left-radius: 3px;
257
-            border-top-right-radius: 3px;
258
-        }
259
-        .toolbar-button-wrapper:last-child .button {
260
-            border-bottom-right-radius: 3px;
261
-            border-bottom-left-radius: 3px;
262
-        }
263
-    }
264
-
265
-    /**
266
-     * Toolbar specific round badge.
267
-     */
268
-    .badge-round {
269
-        bottom: 9px;
270
-        position: absolute;
271
-        right: 9px;
272
-    }
273
-}
274
-
275 33
 /**
276 34
  * TODO: when the old filmstrip has been removed, remove the "new-" prefix.
277 35
  */
@@ -527,119 +285,6 @@
527 285
     }
528 286
 }
529 287
 
530
-.filmstrip-only {
531
-    .toolbox,
532
-    .toolbox-toolbars {
533
-        align-items: center;
534
-        display: flex;
535
-    }
536
-}
537
-
538
-.subject {
539
-    background: linear-gradient(to bottom, rgba(255,255,255,.85) , rgba(255,255,255,.35));
540
-    border-bottom-left-radius: 12px;
541
-    border-bottom-right-radius: 12px;
542
-    box-shadow: 0 0 2px #000000, 0 0 10px #000000;
543
-    margin-left: 40%;
544
-    margin-right: 40%;
545
-    padding: 5px;
546
-    position: relative;
547
-    text-align: center;
548
-    width: auto;
549
-    z-index: $zindex3;
550
-
551
-    &.subject_slide-in {
552
-        top: 80px;
553
-        @include transition(top .3s ease-in);
554
-    }
555
-
556
-    &.subject_slide-out {
557
-        top: 0;
558
-        @include transition(top .3s ease-out);
559
-    }
560
-}
561
-
562
-#toolbar_button_profile {
563
-    height: $toolbarAvatarSize + 2*$toolbarAvatarPadding;
564
-}
565
-
566
-a.button>#avatar {
567
-    border-radius: 50%;
568
-    padding-bottom: $toolbarAvatarPadding;
569
-    padding-top: $toolbarAvatarPadding;
570
-    width: $toolbarAvatarSize;
571
-}
572
-
573
-#feedbackButton {
574
-    margin-top: auto;
575
-}
576
-
577
-/**
578
- * START of slide in animation for extended toolbar.
579
- */
580
-@include keyframes(slideInX) {
581
-  0% { transform: translateX(-100%); }
582
-  100% { transform: translateX(0%); }
583
-}
584
-
585
-.slideInX {
586
-  @include animation('slideInX .5s forwards');
587
-}
588
-
589
-@include keyframes(slideOutX) {
590
-  0% { transform: translateX(0%); }
591
-  100% { transform: translateX(-100%); }
592
-}
593
-
594
-.slideOutX {
595
-  @include animation('slideOutX .5s forwards');
596
-}
597
-
598
-@include keyframes(slideInExtX) {
599
-    0% { transform: translateX(-500%); }
600
-    100% { transform: translateX(0%); }
601
-}
602
-
603
-.slideInExtX {
604
-  @include animation('slideInExtX .5s forwards');
605
-}
606
-
607
-@include keyframes(slideOutExtX) {
608
-    0% { transform: translateX(0%); }
609
-    100% { transform: translateX(-500%); }
610
-}
611
-
612
-.slideOutExtX {
613
-  @include animation('slideOutExtX .5s forwards');
614
-}
615
-
616
-/**
617
- * END of slide out animation for extended toolbar.
618
- */
619
-
620
-/**
621
- * START of slide in / out animation for main toolbar.
622
- */
623
-@include keyframes(slideInY) {
624
-    100% { transform: translateY(0%); }
625
-}
626
-
627
-.slideInY {
628
-  @include animation('slideInY .5s forwards');
629
-}
630
-
631
-@include keyframes(slideOutY) {
632
-    0% { transform: translateY(0%); }
633
-    100% { transform: translateY(-100%); }
634
-}
635
-
636
-.slideOutY {
637
-    @include animation('slideOutY .5s forwards');
638
-}
639
-/**
640
- * END of slide in / out animation for main toolbar.
641
- */
642
-
643 288
 /**
644 289
  * START of slide in animation for extended toolbar panel.
645 290
  */

+ 0
- 13
css/_variables.scss 查看文件

@@ -35,27 +35,14 @@ $defaultDarkColor: #2b3d5c;
35 35
 $alwaysOnTopToolbarFontSize: 1em;
36 36
 $alwaysOnTopToolbarSize: 30px;
37 37
 $defaultToolbarSize: 50px;
38
-$defaultFilmStripOnlyToolbarSize: 37px;
39 38
 $newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
40 39
 $newToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);
41 40
 $newToolbarButtonToggleColor: rgba(14, 20, 35, 1);
42 41
 $newToolbarFontSize: 1.9em;
43 42
 $newToolbarSize: 32px;
44 43
 $newToolbarSizeWithPadding: calc(32px + 32px);
45
-$secToolbarFontSize: 1.9em;
46
-$secToolbarLineHeight: 45px;
47
-$toolbarAvatarPadding: 10px;
48
-$toolbarAvatarSize: 40px;
49
-$toolbarFontSize: 1.9em;
50 44
 $toolbarTitleFontSize: 19px;
51 45
 
52
-/**
53
- * Main controls
54
- * TODO: looks like we don't use it
55
- */
56
-$inputSemiBackground: rgba(132, 132, 132, .8);
57
-$inputLightBackground: #EBEBEB;
58
-
59 46
 /**
60 47
  * Video layout
61 48
  */

+ 3
- 16
css/_vertical_filmstrip_overrides.scss 查看文件

@@ -66,8 +66,9 @@
66 66
             &#remoteVideos {
67 67
                 /**
68 68
                  * Remove horizontal filmstrip padding used to prevent videos
69
-                 * from overlapping the left-side toolbar. An id selector is
70
-                 * used to match id specificity with filmstrip styles.
69
+                 * from overlapping getting near the left-side of the screen.
70
+                 * An id selector is used to match id specificity with filmstrip
71
+                 * styles.
71 72
                  */
72 73
                 padding-left: 0;
73 74
                 transition: right 2s;
@@ -168,20 +169,6 @@
168 169
         .filmstrip__videos-filmstripOnly {
169 170
             height: 100%;
170 171
         }
171
-
172
-        /**
173
-         * In filmstrip only mode, the toolbar is normally displayed in the
174
-         * vertical center of the filmstrip strip. In vertical filmstrip mode,
175
-         * that alignment makes the toolbar appear floating and detached from
176
-         * the filmstrip. So, instead anchor the toolbar next to the local
177
-         * video.
178
-         */
179
-        .toolbar_filmstrip-only {
180
-            bottom: 0;
181
-            top: auto;
182
-            transform: none;
183
-        }
184
-
185 172
     }
186 173
 
187 174
     /**

Loading…
取消
儲存