Format source code for (some) consistency

This commit is contained in:
Lyubomir Marinov 2016-10-19 15:19:09 -05:00
parent 572fb20dd4
commit 242c1419fd
4 changed files with 31 additions and 36 deletions

1
.gitignore vendored
View File

@ -4,7 +4,6 @@ deploy-local.sh
libs/
all.css
*css.map
*js.map
unsupported_browser.css
.remote-sync.json
.sync-config.cson

View File

@ -2,15 +2,15 @@
* Toolbar side panel main container element.
*/
#sideToolbarContainer {
position: absolute;
top: 0;
left: $defaultToolbarSize;
width: 0;
background-color: rgba(0,0,0,0.8);
height: 100%;
left: $defaultToolbarSize;
max-width: $sidebarWidth;
z-index: 800;
overflow: hidden;
position: absolute;
top: 0;
width: 0;
z-index: 800;
/**
* Labels inside the side panel.
@ -33,8 +33,8 @@
/**
* Specify colors for edit elements.
*/
select, input[type="button"], input[type="text"],
input[type="reset"], input[type="submit"] {
select, input[type="button"], input[type="text"], input[type="reset"],
input[type="submit"] {
color: $inputColor;
background: $inputBackground;
border: none;
@ -45,19 +45,18 @@
*/
.sideToolbarBlock {
input, button, a, select {
margin-top: 5px;
margin-left: 0;
margin-top: 5px;
width: 100%;
}
input[type='checkbox'] {
width: auto !important;
display: inline;
width: auto !important;
> label {
margin-top: 5px;
width: 80%;
}
}
}
/**
@ -74,9 +73,7 @@
/**
* Titles and subtitles of inner containers.
*/
div.title,
div.subTitle {
text-align: left;
div.title, div.subTitle {
margin: 10px 0;
}
@ -85,18 +82,19 @@
*/
div.title {
color: $defaultColor !important;
text-align: center;
font-size: 16px;
text-align: center;
}
/**
* Subtitle specific properties.
*/
div.subTitle {
color: $defaultSideBarFontColor !important;
font-size: 11px;
font-weight: 500;
color: $defaultSideBarFontColor !important;
margin-left: 10%;
text-align: left;
}
/**

View File

@ -2,13 +2,13 @@ form.aui {
.aui-select2-container {
background-color: transparent;
> a{
> a {
margin: 0 auto !important;
width: 100% !important;
}
}
}
.select2-results{
&::-webkit-scrollbar {
background-color: transparent;
@ -23,10 +23,12 @@ form.aui {
background-color: #3572b0;
}
}
.aui-select2-drop{
.aui-select2-drop {
z-index: 901;
}
.select2-drop-mask{
.select2-drop-mask {
z-index: 900;
}
@ -39,8 +41,8 @@ form.aui{
}
}
}
//
.aui-dropdown2.aui-style-default.dropdown-dark{
.aui-dropdown2.aui-style-default.dropdown-dark {
background-color: $defaultBackground;
border-color: transparent;
}
}

View File

@ -1,4 +1,4 @@
/* global APP, $, JitsiMeetJS, interfaceConfig, AJS */
/* global $, APP, AJS, interfaceConfig, JitsiMeetJS */
import UIUtil from "../../util/UIUtil";
import UIEvents from "../../../../service/UI/UIEvents";
@ -70,11 +70,11 @@ function generateDevicesOptions(items, selectedId, permissionGranted) {
*/
function initSelect2($el, onSelectedCb) {
$el.auiSelect2({
minimumResultsForSearch: Infinity,
dropdownCssClass: 'dropdown-dark',
containerCssClass: 'input-container-dark',
dropdownCssClass: 'dropdown-dark',
minimumResultsForSearch: Infinity
});
if (typeof onSelectedCb === 'function'){
if (typeof onSelectedCb === 'function') {
$el.change(onSelectedCb);
}
}
@ -143,14 +143,10 @@ export default {
});
// FOLLOW ME
let followMeToggle = document.getElementById('followMeCheckBox');
followMeToggle.addEventListener('change', function() {
let isFollowMeEnabled = followMeToggle.checked;
emitter.emit(
UIEvents.FOLLOW_ME_ENABLED,
isFollowMeEnabled
);
const followMeToggle = document.getElementById('followMeCheckBox');
followMeToggle.addEventListener('change', () => {
const isFollowMeEnabled = followMeToggle.checked;
emitter.emit(UIEvents.FOLLOW_ME_ENABLED, isFollowMeEnabled);
});
UIUtil.showElement(wrapperId);
@ -189,7 +185,7 @@ export default {
if (show && UIUtil.isSettingEnabled('moderator')) {
// Only show the subtitle if this isn't the only setting section.
if (!$("#moderatorOptionsTitle").is(":visible")
&& interfaceConfig.SETTINGS_SECTIONS.length > 1)
&& interfaceConfig.SETTINGS_SECTIONS.length > 1)
UIUtil.showElement("moderatorOptionsTitle");
UIUtil.showElement("startMutedOptions");