BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Separators color in settings view get their colour from the Default.css

Browse Source
This commit is contained in:
Ghazi Triki 2017-03-09 14:24:44 +01:00
parent 57c39b35ed
commit 119338aff3
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clients/flash/air-client/src/Default.css
View File

@ -88,6 +88,7 @@ participants|ParticipantsViewBase, users|UsersViewBase {
settings|SettingsViewBase, audio|AudioSettingsViewBase, chat|ChatSettingsViewBase, lock|LockSettingsViewBase, camera|CameraSettingsViewBase {
color : PropertyReference("regentGrey");
headerBackground : PropertyReference("shakespeare");
separatorColor : PropertyReference("lightGrey");
}
participants|ParticipantsViewBase s|List{

4
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/chat/views/skins/NewMessagesIndicatorSkin.mxml
View File

@ -41,9 +41,7 @@
bottom="1"
radiusX="2">
<s:fill>
<s:SolidColor id="backgroundFill"
color="0xFF0000"
alpha="1" />
<s:SolidColor id="backgroundFill" />
</s:fill>
</s:Rect>

21
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/settings/views/audio/AudioSettingsViewBase.as
View File

@ -19,6 +19,10 @@ package org.bigbluebutton.lib.settings.views.audio {
private var _gainSlider:HSlider;
private var _audioSeparator:Line;
private var _microphoneSeparator:Line;
public function get audioToggle():ToggleButtonBase {
return _audioToggle;
}
@ -52,10 +56,9 @@ package org.bigbluebutton.lib.settings.views.audio {
_audioToggle = new toggleButtonClass();
audioGroup.addElement(_audioToggle);
var audioSeparator:Line = new Line();
audioSeparator.percentWidth = 100;
audioSeparator.stroke = new SolidColorStroke(0xF2F2F2);
addElement(audioSeparator);
_audioSeparator = new Line();
_audioSeparator.percentWidth = 100;
addElement(_audioSeparator);
// Mirohpone group
var microphoneGroup:HGroup = new HGroup();
@ -71,10 +74,9 @@ package org.bigbluebutton.lib.settings.views.audio {
_microphoneToggle = new toggleButtonClass();
microphoneGroup.addElement(_microphoneToggle);
var microphoneSeparator:Line = new Line();
microphoneSeparator.percentWidth = 100;
microphoneSeparator.stroke = new SolidColorStroke(0xF2F2F2);
addElement(microphoneSeparator);
_microphoneSeparator = new Line();
_microphoneSeparator.percentWidth = 100;
addElement(_microphoneSeparator);
// Gain group
var gainGroup:VGroup = new VGroup();
@ -127,6 +129,9 @@ package org.bigbluebutton.lib.settings.views.audio {
_microphoneToggle.parent["padding"] = getStyle("padding");
_gainSlider.parent["padding"] = getStyle("padding") * 0.5;
_gainSlider.parent.parent["padding"] = getStyle("padding");
_audioSeparator.stroke = new SolidColorStroke(getStyle("separatorColor"));
_microphoneSeparator.stroke = new SolidColorStroke(getStyle("separatorColor"));
}
}
}

21
clients/flash/common-library/src/main/actionscript/org/bigbluebutton/lib/settings/views/chat/ChatSettingsViewBase.as
View File

@ -22,6 +22,10 @@ package org.bigbluebutton.lib.settings.views.chat {
private var _decreaseFontSizeButton:Button;
private var _microphoneSeparator:Line;
private var _audioSeparator:Line;
public function get audioToggle():ToggleButtonBase {
return _audioToggle;
}
@ -59,10 +63,9 @@ package org.bigbluebutton.lib.settings.views.chat {
_pushToggle = new toggleButtonClass();
audioGroup.addElement(_pushToggle);
var microphoneSeparator:Line = new Line();
microphoneSeparator.percentWidth = 100;
microphoneSeparator.stroke = new SolidColorStroke(0xF2F2F2);
addElement(microphoneSeparator);
_microphoneSeparator = new Line();
_microphoneSeparator.percentWidth = 100;
addElement(_microphoneSeparator);
// Audio group
var notificationGroup:HGroup = new HGroup();
@ -78,10 +81,9 @@ package org.bigbluebutton.lib.settings.views.chat {
_audioToggle = new toggleButtonClass();
notificationGroup.addElement(_audioToggle);
var audioSeparator:Line = new Line();
audioSeparator.percentWidth = 100;
audioSeparator.stroke = new SolidColorStroke(0xF2F2F2);
addElement(audioSeparator);
_audioSeparator = new Line();
_audioSeparator.percentWidth = 100;
addElement(_audioSeparator);
// Settings title
var _settingsTitle:Label = new Label();
@ -120,6 +122,9 @@ package org.bigbluebutton.lib.settings.views.chat {
_audioToggle.parent["padding"] = getStyle("padding");
_pushToggle.parent["padding"] = getStyle("padding");
_fontSizeLabel.parent["padding"] = getStyle("padding");
_microphoneSeparator.stroke = new SolidColorStroke(getStyle("separatorColor"));
_audioSeparator.stroke = new SolidColorStroke(getStyle("separatorColor"));
}
}
}

2
clients/flash/shared/ColorPalette.as
View File

@ -27,3 +27,5 @@ private const shakespeare:uint = 0x4998D0;
private const white:uint = 0xFFFFFF;
private const shamrock:uint = 0x36CC84;
private const lightGrey:uint = 0xF2F2F2;