Browse Source

feat: make the hangup button first

master
Bettenbuk Zoltan 5 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
             cursor: initial;
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
 .always-on-top-toolbox {
22
 .always-on-top-toolbox {
43
             }
34
             }
44
         }
35
         }
45
 
36
 
37
+        &:nth-child(2) {
38
+            svg {
39
+                fill: $hangupColor;
40
+            }
41
+        }
42
+
46
         &:last-child {
43
         &:last-child {
47
             .toolbox-icon {
44
             .toolbox-icon {
48
                 border-top-right-radius: 3px;
45
                 border-top-right-radius: 3px;
56
     flex-direction: column;
53
     flex-direction: column;
57
 
54
 
58
     .toolbox-button {
55
     .toolbox-button {
56
+        &:nth-child(1) {
57
+            svg {
58
+                fill: $hangupColor;
59
+            }
60
+        }
61
+
59
         .toolbox-icon {
62
         .toolbox-icon {
60
             border-radius: 3px;
63
             border-radius: 3px;
61
         }
64
         }

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

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

Loading…
Cancel
Save