Browse Source

fix: fix filmstrip-only toolbar

master
Bettenbuk Zoltan 4 years ago
parent
commit
6a916fd0e1
3 changed files with 29 additions and 66 deletions
  1. 28
    13
      css/_mini_toolbox.scss
  2. 0
    52
      css/_toolbars.scss
  3. 1
    1
      css/main.scss

css/_always_on_top.scss → css/_mini_toolbox.scss View File

@@ -1,13 +1,8 @@
1
-
1
+.filmstrip-toolbox,
2 2
 .always-on-top-toolbox {
3 3
     background-color: $newToolbarBackgroundColor;
4 4
     border-radius: 3px;
5 5
     display: flex;
6
-    flex-direction: row;
7
-    left: 50%;
8
-    position: absolute;
9
-    top: 10px;
10
-    transform: translateX(-50%);
11 6
     z-index: $toolbarZ;
12 7
 
13 8
     .toolbox-icon {
@@ -23,6 +18,23 @@
23 18
         }
24 19
     }
25 20
 
21
+    .toolbox-button {
22
+        &:nth-child(2) {
23
+            svg {
24
+                fill: $hangupColor;
25
+            }
26
+        }
27
+    }
28
+
29
+}
30
+
31
+.always-on-top-toolbox {
32
+    flex-direction: row;
33
+    left: 50%;
34
+    position: absolute;
35
+    top: 10px;
36
+    transform: translateX(-50%);
37
+
26 38
     .toolbox-button {
27 39
         &:first-child {
28 40
             .toolbox-icon {
@@ -31,12 +43,6 @@
31 43
             }
32 44
         }
33 45
 
34
-        &:nth-child(2) {
35
-            svg {
36
-                fill: $hangupColor;
37
-            }
38
-        }
39
-
40 46
         &:last-child {
41 47
             .toolbox-icon {
42 48
                 border-top-right-radius: 3px;
@@ -44,5 +50,14 @@
44 50
             }
45 51
         }
46 52
     }
47
-    
53
+}
54
+
55
+.filmstrip-toolbox {
56
+    flex-direction: column;
57
+
58
+    .toolbox-button {
59
+        .toolbox-icon {
60
+            border-radius: 3px;
61
+        }
62
+    }
48 63
 }

+ 0
- 52
css/_toolbars.scss View File

@@ -270,58 +270,6 @@
270 270
     }
271 271
 }
272 272
 
273
-.filmstrip-toolbox {
274
-    background-color: $newToolbarBackgroundColor;
275
-    box-sizing: border-box;
276
-    display: flex;
277
-    flex-direction: column;
278
-    z-index: $toolbarZ;
279
-
280
-    i {
281
-        cursor: pointer;
282
-        display: block;
283
-    }
284
-
285
-    i:hover {
286
-        background-color: $AOTToolbarButtonHoverColor;
287
-    }
288
-
289
-    i.toggled {
290
-        background: $AOTToolbarButtonToggleColor;
291
-    }
292
-
293
-    i.toggled:hover:not(.disabled) {
294
-        background-color: $AOTToolbarButtonHoverColor;
295
-    }
296
-
297
-    .toolbox-button {
298
-        color: $toolbarButtonColor;
299
-        cursor: pointer;
300
-        text-align: center;
301
-    }
302
-
303
-    border-radius: 3px;
304
-}
305
-
306
-.filmstrip-toolbox {
307
-    i {
308
-        font-size: 1.9em;
309
-        height: 37px;
310
-        line-height: 37px;
311
-        width: 37px;
312
-    }
313
-
314
-    .toolbox-button:first-child i {
315
-        border-top-left-radius: 3px;
316
-        border-top-right-radius: 3px;
317
-    }
318
-
319
-    .toolbox-button:last-child i {
320
-        border-bottom-left-radius: 3px;
321
-        border-bottom-right-radius: 3px;
322
-    }
323
-}
324
-
325 273
 /**
326 274
  * START of fade in animation for main toolbar
327 275
  */

+ 1
- 1
css/main.scss View File

@@ -26,13 +26,13 @@ $flagsImagePath: "../images/";
26 26
 /* Modules BEGIN */
27 27
 
28 28
 @import 'aui_reset';
29
-@import 'always_on_top';
30 29
 @import 'atlaskit_overrides';
31 30
 @import 'base';
32 31
 @import 'utils';
33 32
 @import 'overlay/overlay';
34 33
 @import 'inlay';
35 34
 @import 'reload_overlay/reload_overlay';
35
+@import 'mini_toolbox';
36 36
 @import 'modals/desktop-picker/desktop-picker';
37 37
 @import 'modals/device-selection/device-selection';
38 38
 @import 'modals/dialog';

Loading…
Cancel
Save