Kostiantyn Pashura 8 лет назад
Родитель
Сommit
91fd16e9b4
2 измененных файлов: 27 добавлений и 24 удалений
  1. 11
    4
      css/_side_toolbar_container.scss
  2. 16
    20
      index.html

+ 11
- 4
css/_side_toolbar_container.scss Просмотреть файл

4
 #sideToolbarContainer {
4
 #sideToolbarContainer {
5
     position: absolute;
5
     position: absolute;
6
     top: 0;
6
     top: 0;
7
-    //magic 10px for toolbar height. TODO: fix it
8
-    bottom: 10px;
9
     left: $defaultToolbarSize;
7
     left: $defaultToolbarSize;
10
     width: 0;
8
     width: 0;
11
     background-color: rgba(0,0,0,0.8);
9
     background-color: rgba(0,0,0,0.8);
24
     /**
22
     /**
25
      * Form elements and blocks.
23
      * Form elements and blocks.
26
      */
24
      */
27
-    input, label, select, a,
25
+    input, select, a,
28
     .sideToolbarBlock, .input-control, .button-control {
26
     .sideToolbarBlock, .input-control, .button-control {
29
         display: inline-block;
27
         display: inline-block;
30
         margin-top: 15px;
28
         margin-top: 15px;
46
      * Specify styling of elements inside a block.
44
      * Specify styling of elements inside a block.
47
      */
45
      */
48
     .sideToolbarBlock {
46
     .sideToolbarBlock {
49
-        input, label, button, a, select {
47
+        input, button, a, select {
50
             margin-top: 5px;
48
             margin-top: 5px;
51
             margin-left: 0;
49
             margin-left: 0;
52
             width: 100%;
50
             width: 100%;
53
         }
51
         }
52
+        input[type='checkbox'] {
53
+            width: auto !important;
54
+            display: inline;
55
+            > label {
56
+                margin-top: 5px;
57
+                width: 80%;
58
+            }
59
+        }
60
+
54
     }
61
     }
55
 
62
 
56
     /**
63
     /**

+ 16
- 20
index.html Просмотреть файл

30
             <a class="poweredby" href="http://jitsi.org" target="_new" ><span data-i18n="poweredby"></span> jitsi.org</a>
30
             <a class="poweredby" href="http://jitsi.org" target="_new" ><span data-i18n="poweredby"></span> jitsi.org</a>
31
 
31
 
32
             <div id="enter_room_container">
32
             <div id="enter_room_container">
33
-                    <div id="enter_room_form" >
34
-                        <div id="domain_name"></div>
35
-                        <div id="enter_room">
36
-                            <input id="enter_room_field" type="text" autofocus/>
37
-                            <div class="icon-reload" id="reload_roomname"></div>
38
-                            <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
33
+                <div id="enter_room_form" >
34
+                    <div id="domain_name"></div>
35
+                    <div id="enter_room">
36
+                        <input id="enter_room_field" type="text" autofocus/>
37
+                        <div class="icon-reload" id="reload_roomname"></div>
38
+                        <input id="enter_room_button" type="button" data-i18n="[value]welcomepage.go" value="GO" />
39
 
39
 
40
-                        </div>
41
                     </div>
40
                     </div>
41
+                </div>
42
             </div>
42
             </div>
43
             <div id="brand_header"></div>
43
             <div id="brand_header"></div>
44
             <input type='checkbox' name='checkbox' id="disable_welcome"/>
44
             <input type='checkbox' name='checkbox' id="disable_welcome"/>
202
                             <div id="moderatorOptionsTitle" class="subTitle hide" data-i18n="settings.moderator"></div>
202
                             <div id="moderatorOptionsTitle" class="subTitle hide" data-i18n="settings.moderator"></div>
203
                             <div id="startMutedOptions" class="hide">
203
                             <div id="startMutedOptions" class="hide">
204
                                 <div class="sideToolbarBlock first">
204
                                 <div class="sideToolbarBlock first">
205
-                                    <aui-label for="startAudioMuted">
206
-                                        <p data-i18n="settings.startAudioMuted"></p>
207
-                                    </aui-label>
208
-                                    <aui-toggle id="startAudioMuted" label="Audio muted"></aui-toggle>
205
+                                    <input type="checkbox" id="startAudioMuted">
206
+                                    <label class="startMutedLabel" for="startAudioMuted" data-i18n="settings.startAudioMuted"></label>
209
                                 </div>
207
                                 </div>
210
                                 <div class="sideToolbarBlock">
208
                                 <div class="sideToolbarBlock">
211
-                                    <aui-label for="startVideoMuted" >
212
-                                        <p data-i18n="settings.startVideoMuted"></p>
213
-                                    </aui-label>
214
-                                    <aui-toggle id="startVideoMuted" label="Video muted"></aui-toggle>
209
+                                    <input type="checkbox" id="startVideoMuted">
210
+                                    <label class="startMutedLabel" for="startVideoMuted" data-i18n="settings.startVideoMuted"></label>
215
                                 </div>
211
                                 </div>
216
                             </div>
212
                             </div>
217
-                            <div id="followMeOptions" class="sideToolbarBlock hide">
218
-                                <aui-label for="followMeCheckBox">
219
-                                    <p data-i18n="settings.followMe"></p>
220
-                                </aui-label>
221
-                                <aui-toggle id="followMeCheckBox" label="Follow Me"></aui-toggle>
213
+                            <div id="followMeOptions" class="hide">
214
+                                <div class="sideToolbarBlock">
215
+                                    <input type="checkbox" id="followMeCheckBox">
216
+                                    <label class="followMeLabel" for="followMeCheckBox" data-i18n="settings.followMe"></label>
217
+                                </div>
222
                             </div>
218
                             </div>
223
                         </div>
219
                         </div>
224
                     </form>
220
                     </form>

Загрузка…
Отмена
Сохранить