aui checkbox removed

This commit is contained in:
Kostiantyn Pashura 2016-10-10 13:52:02 +03:00
parent 8118b4aea1
commit 91fd16e9b4
2 changed files with 27 additions and 24 deletions

View File

@ -4,8 +4,6 @@
#sideToolbarContainer { #sideToolbarContainer {
position: absolute; position: absolute;
top: 0; top: 0;
//magic 10px for toolbar height. TODO: fix it
bottom: 10px;
left: $defaultToolbarSize; left: $defaultToolbarSize;
width: 0; width: 0;
background-color: rgba(0,0,0,0.8); background-color: rgba(0,0,0,0.8);
@ -24,7 +22,7 @@
/** /**
* Form elements and blocks. * Form elements and blocks.
*/ */
input, label, select, a, input, select, a,
.sideToolbarBlock, .input-control, .button-control { .sideToolbarBlock, .input-control, .button-control {
display: inline-block; display: inline-block;
margin-top: 15px; margin-top: 15px;
@ -46,11 +44,20 @@
* Specify styling of elements inside a block. * Specify styling of elements inside a block.
*/ */
.sideToolbarBlock { .sideToolbarBlock {
input, label, button, a, select { input, button, a, select {
margin-top: 5px; margin-top: 5px;
margin-left: 0; margin-left: 0;
width: 100%; width: 100%;
} }
input[type='checkbox'] {
width: auto !important;
display: inline;
> label {
margin-top: 5px;
width: 80%;
}
}
} }
/** /**

View File

@ -30,15 +30,15 @@
<a class="poweredby" href="http://jitsi.org" target="_new" ><span data-i18n="poweredby"></span> jitsi.org</a> <a class="poweredby" href="http://jitsi.org" target="_new" ><span data-i18n="poweredby"></span> jitsi.org</a>
<div id="enter_room_container"> <div id="enter_room_container">
<div id="enter_room_form" > <div id="enter_room_form" >
<div id="domain_name"></div> <div id="domain_name"></div>
<div id="enter_room"> <div id="enter_room">
<input id="enter_room_field" type="text" autofocus/> <input id="enter_room_field" type="text" autofocus/>
<div class="icon-reload" id="reload_roomname"></div> <div class="icon-reload" id="reload_roomname"></div>
<input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" /> <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
</div>
</div> </div>
</div>
</div> </div>
<div id="brand_header"></div> <div id="brand_header"></div>
<input type='checkbox' name='checkbox' id="disable_welcome"/> <input type='checkbox' name='checkbox' id="disable_welcome"/>
@ -202,23 +202,19 @@
<div id="moderatorOptionsTitle" class="subTitle hide" data-i18n="settings.moderator"></div> <div id="moderatorOptionsTitle" class="subTitle hide" data-i18n="settings.moderator"></div>
<div id="startMutedOptions" class="hide"> <div id="startMutedOptions" class="hide">
<div class="sideToolbarBlock first"> <div class="sideToolbarBlock first">
<aui-label for="startAudioMuted"> <input type="checkbox" id="startAudioMuted">
<p data-i18n="settings.startAudioMuted"></p> <label class="startMutedLabel" for="startAudioMuted" data-i18n="settings.startAudioMuted"></label>
</aui-label>
<aui-toggle id="startAudioMuted" label="Audio muted"></aui-toggle>
</div> </div>
<div class="sideToolbarBlock"> <div class="sideToolbarBlock">
<aui-label for="startVideoMuted" > <input type="checkbox" id="startVideoMuted">
<p data-i18n="settings.startVideoMuted"></p> <label class="startMutedLabel" for="startVideoMuted" data-i18n="settings.startVideoMuted"></label>
</aui-label>
<aui-toggle id="startVideoMuted" label="Video muted"></aui-toggle>
</div> </div>
</div> </div>
<div id="followMeOptions" class="sideToolbarBlock hide"> <div id="followMeOptions" class="hide">
<aui-label for="followMeCheckBox"> <div class="sideToolbarBlock">
<p data-i18n="settings.followMe"></p> <input type="checkbox" id="followMeCheckBox">
</aui-label> <label class="followMeLabel" for="followMeCheckBox" data-i18n="settings.followMe"></label>
<aui-toggle id="followMeCheckBox" label="Follow Me"></aui-toggle> </div>
</div> </div>
</div> </div>
</form> </form>