Browse Source

feat: make the hangup button first

master
Bettenbuk Zoltan 4 years ago
parent
commit
d11735b04c
2 changed files with 15 additions and 12 deletions
  1. 12
    9
      css/_mini_toolbox.scss
  2. 3
    3
      react/features/filmstrip/components/web/Toolbar.js

+ 12
- 9
css/_mini_toolbox.scss View File

@@ -17,15 +17,6 @@
17 17
             cursor: initial;
18 18
         }
19 19
     }
20
-
21
-    .toolbox-button {
22
-        &:nth-child(2) {
23
-            svg {
24
-                fill: $hangupColor;
25
-            }
26
-        }
27
-    }
28
-
29 20
 }
30 21
 
31 22
 .always-on-top-toolbox {
@@ -43,6 +34,12 @@
43 34
             }
44 35
         }
45 36
 
37
+        &:nth-child(2) {
38
+            svg {
39
+                fill: $hangupColor;
40
+            }
41
+        }
42
+
46 43
         &:last-child {
47 44
             .toolbox-icon {
48 45
                 border-top-right-radius: 3px;
@@ -56,6 +53,12 @@
56 53
     flex-direction: column;
57 54
 
58 55
     .toolbox-button {
56
+        &:nth-child(1) {
57
+            svg {
58
+                fill: $hangupColor;
59
+            }
60
+        }
61
+
59 62
         .toolbox-icon {
60 63
             border-radius: 3px;
61 64
         }

+ 3
- 3
react/features/filmstrip/components/web/Toolbar.js View File

@@ -40,12 +40,12 @@ class Toolbar extends Component<Props> {
40 40
             <div
41 41
                 className = 'filmstrip-toolbox'
42 42
                 id = 'new-toolbox'>
43
-                <AudioMuteButton
44
-                    tooltipPosition = 'left'
45
-                    visible = { this._shouldShowButton('microphone') } />
46 43
                 <HangupButton
47 44
                     tooltipPosition = 'left'
48 45
                     visible = { this._shouldShowButton('hangup') } />
46
+                <AudioMuteButton
47
+                    tooltipPosition = 'left'
48
+                    visible = { this._shouldShowButton('microphone') } />
49 49
                 <VideoMuteButton
50 50
                     tooltipPosition = 'left'
51 51
                     visible = { this._shouldShowButton('camera') } />

Loading…
Cancel
Save