Browse Source

toolbar buttons fixes

j8
Konstantyn Pahsura 8 years ago
parent
commit
77e28a6a45
3 changed files with 15 additions and 20 deletions
  1. 3
    18
      css/_toolbars.scss
  2. 2
    0
      index.html
  3. 10
    2
      modules/UI/toolbars/Toolbar.js

+ 3
- 18
css/_toolbars.scss View File

42
     margin-right: auto;
42
     margin-right: auto;
43
     width: auto;
43
     width: auto;
44
     border-radius: 3px;
44
     border-radius: 3px;
45
-
46
-    /**
47
-     * First button in the toolbar.
48
-     */
49
-    .first {
50
-        border-bottom-left-radius: 3px;
51
-        border-top-left-radius: 3px;
52
-    }
53
-
54
-    /**
55
-     * Last button in the toolbar.
56
-     */
57
-    .last {
58
-        border-bottom-right-radius: 3px;
59
-        border-top-right-radius: 3px;
60
-    }
45
+    overflow: hidden;
61
 
46
 
62
     /**
47
     /**
63
      * Splitter button in the toolbar.
48
      * Splitter button in the toolbar.
75
     display: flex;
60
     display: flex;
76
     width: $defaultToolbarSize;
61
     width: $defaultToolbarSize;
77
     height: 100%;
62
     height: 100%;
78
-    top: 0px;
79
-    left: 0px;
63
+    top: 0;
64
+    left: 0;
80
     padding-top: 10px;
65
     padding-top: 10px;
81
     box-sizing: border-box;
66
     box-sizing: border-box;
82
     flex-direction: column;
67
     flex-direction: column;

+ 2
- 0
index.html View File

107
         <div id="extendedToolbar" class="toolbar">
107
         <div id="extendedToolbar" class="toolbar">
108
             <div id="extendedToolbarButtons"></div>
108
             <div id="extendedToolbarButtons"></div>
109
 
109
 
110
+            <a class="button icon-feedback" id="feedbackButton"></a>
111
+
110
             <div id="sideToolbarContainer">
112
             <div id="sideToolbarContainer">
111
                 <div id="profile_container" class="sideToolbarContainer__inner">
113
                 <div id="profile_container" class="sideToolbarContainer__inner">
112
                     <div class="title" data-i18n="profile.title"></div>
114
                     <div class="title" data-i18n="profile.title"></div>

+ 10
- 2
modules/UI/toolbars/Toolbar.js View File

219
         id: 'toolbar_contact_list',
219
         id: 'toolbar_contact_list',
220
         tooltipKey: 'bottomtoolbar.contactlist',
220
         tooltipKey: 'bottomtoolbar.contactlist',
221
         className: 'button icon-contactList',
221
         className: 'button icon-contactList',
222
-        sideContainerId: 'contacts_container'
222
+        sideContainerId: 'contacts_container',
223
+        html: `<span class="badge-round">
224
+                   <span id="numberOfParticipants"></span>
225
+               </span>`
223
     },
226
     },
224
     'profile': {
227
     'profile': {
225
         id: 'toolbar_button_profile',
228
         id: 'toolbar_button_profile',
295
     'sharedvideo': {
298
     'sharedvideo': {
296
         id: 'toolbar_button_sharedvideo',
299
         id: 'toolbar_button_sharedvideo',
297
         tooltipKey: 'toolbar.sharedvideo',
300
         tooltipKey: 'toolbar.sharedvideo',
298
-        className: 'button icon-shared-video'
301
+        className: 'button icon-shared-video',
302
+        html: `<ul id="sharedVideoMutedPopup" 
303
+                   class="loginmenu extendedToolbarPopup">
304
+                   <li data-i18n="[html]toolbar.sharedVideoMutedPopup"></li>
305
+               </ul>
306
+`
299
     },
307
     },
300
     'sip': {
308
     'sip': {
301
         id: 'toolbar_button_sip',
309
         id: 'toolbar_button_sip',

Loading…
Cancel
Save