diff --git a/css/_contact_list.scss b/css/_contact_list.scss index ac55c6691..21749aa09 100644 --- a/css/_contact_list.scss +++ b/css/_contact_list.scss @@ -2,12 +2,11 @@ cursor: default; > ul#contacts { - position: absolute; - top: 31px; + font-size: 12px; bottom: 0px; - width: 100%; margin: 0px; padding: 0px; + width: 100%; overflow-y: scroll; overflow-x: hidden; } @@ -20,13 +19,13 @@ #contacts { >li { + color: $defaultSideBarFontColor; list-style-type: none; text-align: left; white-space: nowrap; color: #FFF; font-size: 10pt; - padding: 7px 10px; - margin: 2px; + padding: 6px 10%; &:hover, &:active { diff --git a/css/_side_toolbar_container.scss b/css/_side_toolbar_container.scss index 1cee936b1..0cbf02f85 100644 --- a/css/_side_toolbar_container.scss +++ b/css/_side_toolbar_container.scss @@ -12,12 +12,13 @@ background-color: rgba(0,0,0,0.8); z-index: 800; overflow: hidden; + letter-spacing: 1px; /** * Labels inside the side panel. */ label { - color: $defaultSemiDarkColor; + color: $defaultColor; } /** @@ -70,16 +71,16 @@ */ > div.title, div.subTitle { - color: $defaultColor !important; text-align: left; margin: 10px 0px 10px 0px; - padding: 5px 10px 5px 10px; } /** * Main title size. */ > div.title { + color: $defaultColor !important; + text-align: center; font-size: 16px; } @@ -87,10 +88,10 @@ * Subtitle specific properties. */ > div.subTitle { - font-size: 12px; - background: $inputSemiBackground !important; - margin-top: 20px !important; - margin-bottom: 8px !important; + font-size: 11px; + font-weight: 500; + color: $defaultSideBarFontColor !important; + margin-left: 10%; } /** diff --git a/css/_variables.scss b/css/_variables.scss index 4ea67fbad..e8cf2fd64 100644 --- a/css/_variables.scss +++ b/css/_variables.scss @@ -20,7 +20,7 @@ $thumbnailToolbarHeight: 25px; * Color variables. */ $defaultColor: #F1F1F1; -$defaultSemiDarkColor: #ACACAC; +$defaultSideBarFontColor: #44A5FF; $defaultDarkColor: #4F4F4F; $defaultBackground: #474747; $tooltipBg: rgba(0,0,0, 0.7); @@ -72,5 +72,4 @@ $defaultDarkFontColor: #000; $buttonFontColor: #777; $buttonHoverFontColor: #287ade; $linkFontColor: #489afe; -$linkHoverFontColor: #287ade; - +$linkHoverFontColor: #287ade; \ No newline at end of file diff --git a/lang/main.json b/lang/main.json index 32a1fb6f1..38465864f 100644 --- a/lang/main.json +++ b/lang/main.json @@ -1,5 +1,5 @@ { - "contactlist": "ON CALL (__participants__)", + "contactlist": "On Call (__participants__)", "connectionsettings": "Connection Settings", "poweredby": "powered by", "downloadlogs": "Download logs", @@ -110,21 +110,21 @@ }, "settings": { - "title": "SETTINGS", + "title": "Settings", "update": "Update", "name": "Name", "startAudioMuted": "Everyone starts muted", "startVideoMuted": "Everyone starts hidden", - "selectCamera": "Select camera", - "selectMic": "Select microphone", - "selectAudioOutput": "Select audio output", + "selectCamera": "Camera", + "selectMic": "Microphone", + "selectAudioOutput": "Audio output", "followMe": "Everyone follows me", "noDevice": "None", "noPermission": "Permission to use device is not granted", "cameraAndMic": "Camera and microphone", "moderator": "MODERATOR", "password": "SET PASSWORD", - "audioVideo": "AUDIO / VIDEO", + "audioVideo": "AUDIO AND VIDEO", "setPasswordLabel": "Lock your room with a password." }, "profile": { diff --git a/modules/UI/side_pannels/settings/SettingsMenu.js b/modules/UI/side_pannels/settings/SettingsMenu.js index d6e69f717..20f9c536c 100644 --- a/modules/UI/side_pannels/settings/SettingsMenu.js +++ b/modules/UI/side_pannels/settings/SettingsMenu.js @@ -74,10 +74,7 @@ export default { } }); - // Only show the subtitle if this isn't the only setting section. - if (interfaceConfig.SETTINGS_SECTIONS.length > 1) - UIUtil.showElement("deviceOptionsTitle"); - + UIUtil.showElement("deviceOptionsTitle"); UIUtil.showElement("devicesOptions"); } @@ -150,8 +147,7 @@ export default { showStartMutedOptions (show) { 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) + if (!$("#moderatorOptionsTitle").is(":visible")) UIUtil.showElement("moderatorOptionsTitle"); UIUtil.showElement("startMutedOptions");