toolbar buttons fixes

This commit is contained in:
Konstantyn Pahsura 2016-10-31 19:56:05 +02:00
parent be1ba21166
commit 77e28a6a45
3 changed files with 15 additions and 20 deletions

View File

@ -42,22 +42,7 @@
margin-right: auto; margin-right: auto;
width: auto; width: auto;
border-radius: 3px; border-radius: 3px;
overflow: hidden;
/**
* First button in the toolbar.
*/
.first {
border-bottom-left-radius: 3px;
border-top-left-radius: 3px;
}
/**
* Last button in the toolbar.
*/
.last {
border-bottom-right-radius: 3px;
border-top-right-radius: 3px;
}
/** /**
* Splitter button in the toolbar. * Splitter button in the toolbar.
@ -75,8 +60,8 @@
display: flex; display: flex;
width: $defaultToolbarSize; width: $defaultToolbarSize;
height: 100%; height: 100%;
top: 0px; top: 0;
left: 0px; left: 0;
padding-top: 10px; padding-top: 10px;
box-sizing: border-box; box-sizing: border-box;
flex-direction: column; flex-direction: column;

View File

@ -107,6 +107,8 @@
<div id="extendedToolbar" class="toolbar"> <div id="extendedToolbar" class="toolbar">
<div id="extendedToolbarButtons"></div> <div id="extendedToolbarButtons"></div>
<a class="button icon-feedback" id="feedbackButton"></a>
<div id="sideToolbarContainer"> <div id="sideToolbarContainer">
<div id="profile_container" class="sideToolbarContainer__inner"> <div id="profile_container" class="sideToolbarContainer__inner">
<div class="title" data-i18n="profile.title"></div> <div class="title" data-i18n="profile.title"></div>

View File

@ -219,7 +219,10 @@ const defaultToolbarButtons = {
id: 'toolbar_contact_list', id: 'toolbar_contact_list',
tooltipKey: 'bottomtoolbar.contactlist', tooltipKey: 'bottomtoolbar.contactlist',
className: 'button icon-contactList', className: 'button icon-contactList',
sideContainerId: 'contacts_container' sideContainerId: 'contacts_container',
html: `<span class="badge-round">
<span id="numberOfParticipants"></span>
</span>`
}, },
'profile': { 'profile': {
id: 'toolbar_button_profile', id: 'toolbar_button_profile',
@ -295,7 +298,12 @@ const defaultToolbarButtons = {
'sharedvideo': { 'sharedvideo': {
id: 'toolbar_button_sharedvideo', id: 'toolbar_button_sharedvideo',
tooltipKey: 'toolbar.sharedvideo', tooltipKey: 'toolbar.sharedvideo',
className: 'button icon-shared-video' className: 'button icon-shared-video',
html: `<ul id="sharedVideoMutedPopup"
class="loginmenu extendedToolbarPopup">
<li data-i18n="[html]toolbar.sharedVideoMutedPopup"></li>
</ul>
`
}, },
'sip': { 'sip': {
id: 'toolbar_button_sip', id: 'toolbar_button_sip',