Sfoglia il codice sorgente

fix(toolbox): Fix always on top toolbar

master
Vlad Piersec 4 anni fa
parent
commit
3f0bb6818c

+ 2
- 2
css/_audio-preview.scss Vedi File

@@ -72,7 +72,7 @@
72 72
 
73 73
                 &--selected {
74 74
                     padding-left: 18px;
75
-                    background: #131519;
75
+                    background: $newToolbarBackgroundColor;
76 76
                 }
77 77
             }
78 78
 
@@ -104,7 +104,7 @@
104 104
                 padding-left: 48px;
105 105
 
106 106
                 &--selected {
107
-                    background: #131519;
107
+                    background: $newToolbarBackgroundColor;
108 108
                     padding-left: 18px;
109 109
                 }
110 110
             }

+ 2
- 36
css/_mini_toolbox.scss Vedi File

@@ -23,44 +23,10 @@
23 23
     flex-direction: row;
24 24
     left: 50%;
25 25
     position: absolute;
26
-    top: 10px;
26
+    bottom: 10px;
27 27
     transform: translateX(-50%);
28
-
29
-    .toolbox-button {
30
-        &:first-child {
31
-            .toolbox-icon {
32
-                border-top-left-radius: 3px;
33
-                border-bottom-left-radius: 3px;
34
-            }
35
-        }
36
-
37
-        &:nth-child(2) {
38
-            svg {
39
-                fill: $hangupColor;
40
-            }
41
-        }
42
-
43
-        &:last-child {
44
-            .toolbox-icon {
45
-                border-top-right-radius: 3px;
46
-                border-bottom-right-radius: 3px;
47
-            }
48
-        }
49
-    }
50 28
 }
51 29
 
52 30
 .filmstrip-toolbox {
53 31
     flex-direction: column;
54
-
55
-    .toolbox-button {
56
-        &:nth-child(1) {
57
-            svg {
58
-                fill: $hangupColor;
59
-            }
60
-        }
61
-
62
-        .toolbox-icon {
63
-            border-radius: 3px;
64
-        }
65
-    }
66
-}
32
+}

+ 2
- 1
css/_toolbars.scss Vedi File

@@ -75,6 +75,7 @@
75 75
 
76 76
         &> div {
77 77
             padding: 0;
78
+            background: $menuBG;
78 79
         }
79 80
     }
80 81
 }
@@ -104,7 +105,7 @@
104 105
 
105 106
 
106 107
 .toolbox-content-items {
107
-    background: #131519;
108
+    background: $newToolbarBackgroundColor;
108 109
     box-shadow: 0px 2px 8px 4px rgba(0, 0, 0, 0.25), 0px 0px 0px 1px rgba(0, 0, 0, 0.15);
109 110
     border-radius: 6px;
110 111
     margin: 0 auto;

+ 1
- 1
css/_variables.scss Vedi File

@@ -38,7 +38,7 @@ $presence-idle: rgb(172, 172, 172);
38 38
 /**
39 39
  * Toolbar
40 40
  */
41
-$newToolbarBackgroundColor: rgba(22, 38, 55, 0.8);
41
+$newToolbarBackgroundColor: #131519;
42 42
 $newToolbarButtonHoverColor: rgba(255, 255, 255, 0.2);
43 43
 $newToolbarButtonToggleColor: rgba(255, 255, 255, 0.15);
44 44
 $AOTToolbarButtonHoverColor: rgba(14, 20, 35, 0.6);

+ 1
- 1
react/features/always-on-top/Toolbar.js Vedi File

@@ -48,7 +48,7 @@ export default class Toolbar extends Component<Props> {
48 48
 
49 49
         return (
50 50
             <div
51
-                className = { `always-on-top-toolbox ${className}` }
51
+                className = { `toolbox-content-items always-on-top-toolbox ${className}` }
52 52
                 onMouseOut = { onMouseOut }
53 53
                 onMouseOver = { onMouseOver }>
54 54
                 <AudioMuteButton />

+ 3
- 1
react/features/toolbox/components/web/Toolbox.js Vedi File

@@ -1134,7 +1134,9 @@ class Toolbox extends Component<Props, State> {
1134 1134
 
1135 1135
         if (this._shouldShowButton('chat')) {
1136 1136
             buttons.has('chat')
1137
-                ? mainMenuAdditionalButtons.push(<div className = 'toolbar-button-with-badge'>
1137
+                ? mainMenuAdditionalButtons.push(<div
1138
+                    className = 'toolbar-button-with-badge'
1139
+                    key = 'chatcontainer'>
1138 1140
                     <ToolbarButton
1139 1141
                         accessibilityLabel = { t('toolbar.accessibilityLabel.chat') }
1140 1142
                         icon = { IconChat }

Loading…
Annulla
Salva