Browse Source

Format source code for (some) consistency

master
Lyubomir Marinov 8 years ago
parent
commit
242c1419fd

+ 0
- 1
.gitignore View File

4
 libs/
4
 libs/
5
 all.css
5
 all.css
6
 *css.map
6
 *css.map
7
-*js.map
8
 unsupported_browser.css
7
 unsupported_browser.css
9
 .remote-sync.json
8
 .remote-sync.json
10
 .sync-config.cson
9
 .sync-config.cson

+ 13
- 15
css/_side_toolbar_container.scss View File

2
  * Toolbar side panel main container element.
2
  * Toolbar side panel main container element.
3
  */
3
  */
4
 #sideToolbarContainer {
4
 #sideToolbarContainer {
5
-    position: absolute;
6
-    top: 0;
7
-    left: $defaultToolbarSize;
8
-    width: 0;
9
     background-color: rgba(0,0,0,0.8);
5
     background-color: rgba(0,0,0,0.8);
10
     height: 100%;
6
     height: 100%;
7
+    left: $defaultToolbarSize;
11
     max-width: $sidebarWidth;
8
     max-width: $sidebarWidth;
12
-    z-index: 800;
13
     overflow: hidden;
9
     overflow: hidden;
10
+    position: absolute;
11
+    top: 0;
12
+    width: 0;
13
+    z-index: 800;
14
 
14
 
15
     /**
15
     /**
16
      * Labels inside the side panel.
16
      * Labels inside the side panel.
33
     /**
33
     /**
34
      * Specify colors for edit elements.
34
      * Specify colors for edit elements.
35
      */
35
      */
36
-    select, input[type="button"], input[type="text"],
37
-    input[type="reset"], input[type="submit"] {
36
+    select, input[type="button"], input[type="text"], input[type="reset"],
37
+    input[type="submit"] {
38
         color: $inputColor;
38
         color: $inputColor;
39
         background: $inputBackground;
39
         background: $inputBackground;
40
         border: none;
40
         border: none;
45
      */
45
      */
46
     .sideToolbarBlock {
46
     .sideToolbarBlock {
47
         input, button, a, select {
47
         input, button, a, select {
48
-            margin-top: 5px;
49
             margin-left: 0;
48
             margin-left: 0;
49
+            margin-top: 5px;
50
             width: 100%;
50
             width: 100%;
51
         }
51
         }
52
         input[type='checkbox'] {
52
         input[type='checkbox'] {
53
-            width: auto !important;
54
             display: inline;
53
             display: inline;
54
+            width: auto !important;
55
             > label {
55
             > label {
56
                 margin-top: 5px;
56
                 margin-top: 5px;
57
                 width: 80%;
57
                 width: 80%;
58
             }
58
             }
59
         }
59
         }
60
-
61
     }
60
     }
62
 
61
 
63
     /**
62
     /**
74
         /**
73
         /**
75
          * Titles and subtitles of inner containers.
74
          * Titles and subtitles of inner containers.
76
          */
75
          */
77
-         div.title,
78
-         div.subTitle {
79
-            text-align: left;
76
+        div.title, div.subTitle {
80
             margin: 10px 0;
77
             margin: 10px 0;
81
         }
78
         }
82
 
79
 
85
          */
82
          */
86
         div.title {
83
         div.title {
87
             color: $defaultColor !important;
84
             color: $defaultColor !important;
88
-            text-align: center;
89
             font-size: 16px;
85
             font-size: 16px;
86
+            text-align: center;
90
         }
87
         }
91
 
88
 
92
         /**
89
         /**
93
          * Subtitle specific properties.
90
          * Subtitle specific properties.
94
          */
91
          */
95
         div.subTitle {
92
         div.subTitle {
93
+            color: $defaultSideBarFontColor !important;
96
             font-size: 11px;
94
             font-size: 11px;
97
             font-weight: 500;
95
             font-weight: 500;
98
-            color: $defaultSideBarFontColor !important;
99
             margin-left: 10%;
96
             margin-left: 10%;
97
+            text-align: left;
100
         }
98
         }
101
 
99
 
102
         /**
100
         /**

+ 9
- 7
css/aui-components/dropdown.scss View File

2
     .aui-select2-container {
2
     .aui-select2-container {
3
         background-color: transparent;
3
         background-color: transparent;
4
 
4
 
5
-        > a{
5
+        > a {
6
             margin: 0 auto !important;
6
             margin: 0 auto !important;
7
             width: 100% !important;
7
             width: 100% !important;
8
         }
8
         }
9
     }
9
     }
10
-
11
 }
10
 }
11
+
12
 .select2-results{
12
 .select2-results{
13
     &::-webkit-scrollbar {
13
     &::-webkit-scrollbar {
14
         background-color: transparent;
14
         background-color: transparent;
23
         background-color: #3572b0;
23
         background-color: #3572b0;
24
     }
24
     }
25
 }
25
 }
26
-.aui-select2-drop{
26
+
27
+.aui-select2-drop {
27
     z-index: 901;
28
     z-index: 901;
28
 }
29
 }
29
-.select2-drop-mask{
30
+
31
+.select2-drop-mask {
30
     z-index: 900;
32
     z-index: 900;
31
 }
33
 }
32
 
34
 
39
         }
41
         }
40
     }
42
     }
41
 }
43
 }
42
-//
43
-.aui-dropdown2.aui-style-default.dropdown-dark{
44
+
45
+.aui-dropdown2.aui-style-default.dropdown-dark {
44
     background-color: $defaultBackground;
46
     background-color: $defaultBackground;
45
     border-color: transparent;
47
     border-color: transparent;
46
-}
48
+}

+ 9
- 13
modules/UI/side_pannels/settings/SettingsMenu.js View File

1
-/* global APP, $, JitsiMeetJS, interfaceConfig, AJS */
1
+/* global $, APP, AJS, interfaceConfig, JitsiMeetJS */
2
 
2
 
3
 import UIUtil from "../../util/UIUtil";
3
 import UIUtil from "../../util/UIUtil";
4
 import UIEvents from "../../../../service/UI/UIEvents";
4
 import UIEvents from "../../../../service/UI/UIEvents";
70
  */
70
  */
71
 function initSelect2($el, onSelectedCb) {
71
 function initSelect2($el, onSelectedCb) {
72
     $el.auiSelect2({
72
     $el.auiSelect2({
73
-        minimumResultsForSearch: Infinity,
74
-        dropdownCssClass: 'dropdown-dark',
75
         containerCssClass: 'input-container-dark',
73
         containerCssClass: 'input-container-dark',
74
+        dropdownCssClass: 'dropdown-dark',
75
+        minimumResultsForSearch: Infinity
76
     });
76
     });
77
-    if (typeof onSelectedCb === 'function'){
77
+    if (typeof onSelectedCb === 'function') {
78
         $el.change(onSelectedCb);
78
         $el.change(onSelectedCb);
79
     }
79
     }
80
 }
80
 }
143
             });
143
             });
144
 
144
 
145
             // FOLLOW ME
145
             // FOLLOW ME
146
-            let followMeToggle = document.getElementById('followMeCheckBox');
147
-            followMeToggle.addEventListener('change', function() {
148
-                let isFollowMeEnabled = followMeToggle.checked;
149
-
150
-                emitter.emit(
151
-                    UIEvents.FOLLOW_ME_ENABLED,
152
-                    isFollowMeEnabled
153
-                );
146
+            const followMeToggle = document.getElementById('followMeCheckBox');
147
+            followMeToggle.addEventListener('change', () => {
148
+                const isFollowMeEnabled = followMeToggle.checked;
149
+                emitter.emit(UIEvents.FOLLOW_ME_ENABLED, isFollowMeEnabled);
154
             });
150
             });
155
 
151
 
156
             UIUtil.showElement(wrapperId);
152
             UIUtil.showElement(wrapperId);
189
         if (show && UIUtil.isSettingEnabled('moderator')) {
185
         if (show && UIUtil.isSettingEnabled('moderator')) {
190
             // Only show the subtitle if this isn't the only setting section.
186
             // Only show the subtitle if this isn't the only setting section.
191
             if (!$("#moderatorOptionsTitle").is(":visible")
187
             if (!$("#moderatorOptionsTitle").is(":visible")
192
-                && interfaceConfig.SETTINGS_SECTIONS.length > 1)
188
+                    && interfaceConfig.SETTINGS_SECTIONS.length > 1)
193
                 UIUtil.showElement("moderatorOptionsTitle");
189
                 UIUtil.showElement("moderatorOptionsTitle");
194
 
190
 
195
             UIUtil.showElement("startMutedOptions");
191
             UIUtil.showElement("startMutedOptions");

Loading…
Cancel
Save