haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #897 from jitsi/settings-css-adjustments 

Some css and lang adjustments to settings and contact list.
This commit is contained in:
Дамян Минков 2016-09-20 10:48:57 -05:00 committed by GitHub
parent efbc84d18b aacb39a439
commit 0c1120c1a8
5 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
css/_contact_list.scss
View File

@ -2,12 +2,11 @@
cursor: default; cursor: default;
> ul#contacts { > ul#contacts {
position: absolute; font-size: 12px;
top: 31px;
bottom: 0px; bottom: 0px;
width: 100%;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
width: 100%;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
@ -20,13 +19,13 @@
#contacts { #contacts {
>li { >li {
color: $defaultSideBarFontColor;
list-style-type: none; list-style-type: none;
text-align: left; text-align: left;
white-space: nowrap; white-space: nowrap;
color: #FFF; color: #FFF;
font-size: 10pt; font-size: 10pt;
padding: 7px 10px; padding: 6px 10%;
margin: 2px;
&:hover, &:hover,
&:active { &:active {

15
css/_side_toolbar_container.scss
View File

@ -12,12 +12,13 @@
background-color: rgba(0,0,0,0.8); background-color: rgba(0,0,0,0.8);
z-index: 800; z-index: 800;
overflow: hidden; overflow: hidden;
letter-spacing: 1px;
/** /**
* Labels inside the side panel. * Labels inside the side panel.
*/ */
label { label {
color: $defaultSemiDarkColor; color: $defaultColor;
} }
/** /**
@ -70,16 +71,16 @@
*/ */
> div.title, > div.title,
div.subTitle { div.subTitle {
color: $defaultColor !important;
text-align: left; text-align: left;
margin: 10px 0px 10px 0px; margin: 10px 0px 10px 0px;
padding: 5px 10px 5px 10px;
} }
/** /**
* Main title size. * Main title size.
*/ */
> div.title { > div.title {
color: $defaultColor !important;
text-align: center;
font-size: 16px; font-size: 16px;
} }
@ -87,10 +88,10 @@
* Subtitle specific properties. * Subtitle specific properties.
*/ */
> div.subTitle { > div.subTitle {
font-size: 12px; font-size: 11px;
background: $inputSemiBackground !important; font-weight: 500;
margin-top: 20px !important; color: $defaultSideBarFontColor !important;
margin-bottom: 8px !important; margin-left: 10%;
} }
/** /**

5
css/_variables.scss
View File

@ -20,7 +20,7 @@ $thumbnailToolbarHeight: 25px;
* Color variables. * Color variables.
*/ */
$defaultColor: #F1F1F1; $defaultColor: #F1F1F1;
$defaultSemiDarkColor: #ACACAC; $defaultSideBarFontColor: #44A5FF;
$defaultDarkColor: #4F4F4F; $defaultDarkColor: #4F4F4F;
$defaultBackground: #474747; $defaultBackground: #474747;
$tooltipBg: rgba(0,0,0, 0.7); $tooltipBg: rgba(0,0,0, 0.7);
@ -72,5 +72,4 @@ $defaultDarkFontColor: #000;
$buttonFontColor: #777; $buttonFontColor: #777;
$buttonHoverFontColor: #287ade; $buttonHoverFontColor: #287ade;
$linkFontColor: #489afe; $linkFontColor: #489afe;
$linkHoverFontColor: #287ade; $linkHoverFontColor: #287ade;

12
lang/main.json
View File

@ -1,5 +1,5 @@
{ {
"contactlist": "ON CALL (__participants__)", "contactlist": "On Call (__participants__)",
"connectionsettings": "Connection Settings", "connectionsettings": "Connection Settings",
"poweredby": "powered by", "poweredby": "powered by",
"downloadlogs": "Download logs", "downloadlogs": "Download logs",
@ -110,21 +110,21 @@
}, },
"settings": "settings":
{ {
"title": "SETTINGS", "title": "Settings",
"update": "Update", "update": "Update",
"name": "Name", "name": "Name",
"startAudioMuted": "Everyone starts muted", "startAudioMuted": "Everyone starts muted",
"startVideoMuted": "Everyone starts hidden", "startVideoMuted": "Everyone starts hidden",
"selectCamera": "Select camera", "selectCamera": "Camera",
"selectMic": "Select microphone", "selectMic": "Microphone",
"selectAudioOutput": "Select audio output", "selectAudioOutput": "Audio output",
"followMe": "Everyone follows me", "followMe": "Everyone follows me",
"noDevice": "None", "noDevice": "None",
"noPermission": "Permission to use device is not granted", "noPermission": "Permission to use device is not granted",
"cameraAndMic": "Camera and microphone", "cameraAndMic": "Camera and microphone",
"moderator": "MODERATOR", "moderator": "MODERATOR",
"password": "SET PASSWORD", "password": "SET PASSWORD",
"audioVideo": "AUDIO / VIDEO", "audioVideo": "AUDIO AND VIDEO",
"setPasswordLabel": "Lock your room with a password." "setPasswordLabel": "Lock your room with a password."
}, },
"profile": { "profile": {

8
modules/UI/side_pannels/settings/SettingsMenu.js
View File

@ -74,10 +74,7 @@ export default {
} }
}); });
// Only show the subtitle if this isn't the only setting section. UIUtil.showElement("deviceOptionsTitle");
if (interfaceConfig.SETTINGS_SECTIONS.length > 1)
UIUtil.showElement("deviceOptionsTitle");
UIUtil.showElement("devicesOptions"); UIUtil.showElement("devicesOptions");
} }
@ -150,8 +147,7 @@ export default {
showStartMutedOptions (show) { showStartMutedOptions (show) {
if (show && UIUtil.isSettingEnabled('moderator')) { if (show && UIUtil.isSettingEnabled('moderator')) {
// Only show the subtitle if this isn't the only setting section. // Only show the subtitle if this isn't the only setting section.
if (!$("#moderatorOptionsTitle").is(":visible") if (!$("#moderatorOptionsTitle").is(":visible"))
&& interfaceConfig.SETTINGS_SECTIONS.length > 1)
UIUtil.showElement("moderatorOptionsTitle"); UIUtil.showElement("moderatorOptionsTitle");
UIUtil.showElement("startMutedOptions"); UIUtil.showElement("startMutedOptions");