Przeglądaj źródła

fix: fix filmstrip-only toolbar

master
Bettenbuk Zoltan 5 lat temu
rodzic
commit
6a916fd0e1
3 zmienionych plików z 29 dodań i 66 usunięć
  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 Wyświetl plik

1
-
1
+.filmstrip-toolbox,
2
 .always-on-top-toolbox {
2
 .always-on-top-toolbox {
3
     background-color: $newToolbarBackgroundColor;
3
     background-color: $newToolbarBackgroundColor;
4
     border-radius: 3px;
4
     border-radius: 3px;
5
     display: flex;
5
     display: flex;
6
-    flex-direction: row;
7
-    left: 50%;
8
-    position: absolute;
9
-    top: 10px;
10
-    transform: translateX(-50%);
11
     z-index: $toolbarZ;
6
     z-index: $toolbarZ;
12
 
7
 
13
     .toolbox-icon {
8
     .toolbox-icon {
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
     .toolbox-button {
38
     .toolbox-button {
27
         &:first-child {
39
         &:first-child {
28
             .toolbox-icon {
40
             .toolbox-icon {
31
             }
43
             }
32
         }
44
         }
33
 
45
 
34
-        &:nth-child(2) {
35
-            svg {
36
-                fill: $hangupColor;
37
-            }
38
-        }
39
-
40
         &:last-child {
46
         &:last-child {
41
             .toolbox-icon {
47
             .toolbox-icon {
42
                 border-top-right-radius: 3px;
48
                 border-top-right-radius: 3px;
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 Wyświetl plik

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
  * START of fade in animation for main toolbar
274
  * START of fade in animation for main toolbar
327
  */
275
  */

+ 1
- 1
css/main.scss Wyświetl plik

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

Ładowanie…
Anuluj
Zapisz