diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css
index 75c56dcae44ddf20a569d42859ac0f4370acf31b..26331eb75c1be9dd98d03b6059018bb64a3c2614 100644
--- a/bigbluebutton-client/branding/default/style/css/V2Theme.css
+++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css
@@ -8,6 +8,7 @@
@namespace layout "org.bigbluebutton.modules.layout.views.*";
@namespace presentation "org.bigbluebutton.modules.present.ui.views.*";
@namespace sharednotes "org.bigbluebutton.modules.sharednotes.views.components.*";
+@namespace chat "org.bigbluebutton.modules.chat.views.*";
/*
//------------------------------
@@ -38,8 +39,8 @@ global {
fontFamily : "Source Sans Pro", Arial, sans-serif;
fontSize : 13;
color : #2A2D33;
- selectionColor : #3B97D3;
- focusColor : #3B97D3;
+ selectionColor : #1070D7;
+ focusColor : #1070D7;
}
.defaultShellStyle {
@@ -92,10 +93,10 @@ mx|Application {
borderAlphaDisabled : 0;
fillColorUp : #EFF5FA;
- borderColorOver : #3797D3;
- borderColorDown : #3797D3;
+ borderColorOver : #1070D7;
+ borderColorDown : #1070D7;
- borderThikness : 5;
+ borderThickness : 5;
cornerRadius : 70;
}
@@ -124,16 +125,10 @@ mx|Application {
*/
mx|ApplicationControlBar {
- cornerRadius : 0;
- dropShadowColor : #ABABAB;
- dropShadowEnabled : true;
- fillAlphas : 1, 1;
- fillColors : #FFFFFF, #FFFFFF;
- backgroundColor : #FFFFFF;
- backgroundAlpha : 1;
- highlightAlphas : 0, 0;
- shadowDistance : 1;
- shadowDirection : center;
+ cornerRadius : 0;
+ fillAlphas : 1, 1;
+ fillColors : #FFFFFF, #FFFFFF;
+ highlightAlphas : 0, 0;
}
.toolbarSeparator {
@@ -169,25 +164,44 @@ mx|ApplicationControlBar {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Settings");
}
-.webcamDefaultButtonStyle, .webcamOnButtonStyle, .webcamOffButtonStyle,
-.deskshareDefaultButtonStyle, .deskshareOnButtonStyle, .deskshareOffButtonStyle,
+.webcamDefaultButtonStyle, .webcamOnButtonStyle, .webcamOffButtonStyle, .webcamOverButtonStyle,
+.deskshareDefaultButtonStyle, .deskshareOverButtonStyle, .deskshareOnButtonStyle, .deskshareOffButtonStyle,
.muteMeDefaultButtonStyle, .muteMeOnButtonStyle, .muteMeOffButtonStyle {
- fillColorSelectedUp : #3B97D3;
- fillColorSelectedOver : #2E8BB8;
- fillColorSelectedDown : #3B97D3;
- borderColorSelectedUp : #3B97D3;
- borderColorSelectedOver : #2E8BB8;
- borderColorSelectedDown : #3B97D3;
+ fillColorOver : #FFFFFF;
+ borderColorOver : #1070D7;
+ fillColorSelectedUp : #1070D7;
+ fillColorSelectedOver : #0A5EAC;
+ fillColorSelectedDown : #1070D7;
+ borderColorSelectedUp : #1070D7;
+ borderColorSelectedOver : #0A5EAC;
+ borderColorSelectedDown : #1070D7;
}
-.voiceConfDefaultButtonStyle, .voiceConfActiveButtonStyle, .voiceConfInactiveButtonStyle {
+.voiceConfDefaultButtonStyle, .voiceConfOverButtonStyle, .voiceConfActiveButtonStyle, .voiceConfInactiveButtonStyle {
+ /* Normal state */
+ fillColorOver : #FFFFFF;
+ borderColorOver : #DE2721;
/* Selected state */
- fillColorSelectedUp : #FF6666;
- fillColorSelectedOver : #FF6666;
- fillColorSelectedDown : #FF6666;
- borderColorSelectedUp : #FF6666;
- borderColorSelectedOver : #FF6666;
- borderColorSelectedDown : #FF6666;
+ backgroundColorOver : #FFFFFF;
+ borderColorOver : #DE2721;
+ fillColorSelectedUp : #DE2721;
+ fillColorSelectedOver : #B4201B;
+ fillColorSelectedDown : #DE2721;
+ borderColorSelectedUp : #DE2721;
+ borderColorSelectedOver : #B4201B;
+ borderColorSelectedDown : #DE2721;
+}
+
+.webcamOnButtonStyle, .webcamOffButtonStyle {
+ fillColorUp : #1070D7;
+ borderColorUp : #1070D7;
+ fillColorOver : #0A5EAC;
+ fillColorDown : #1070D7;
+ borderColorOver : #0A5EAC;
+
+ iconColor : #FFFFFF;
+ iconColorOver : #FFFFFF;
+ iconColorDown : #FFFFFF;
}
.voiceConfDefaultButtonStyle {
@@ -195,8 +209,13 @@ mx|ApplicationControlBar {
disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Audio_Disabled");
}
+.voiceConfOverButtonStyle {
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Audio_Red");
+}
+
.voiceConfActiveButtonStyle {
- icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Audio_On");
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Audio_On");
+ disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Audio_On_Disabled");
}
.voiceConfInactiveButtonStyle {
@@ -208,6 +227,10 @@ mx|ApplicationControlBar {
disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Webcam_Disabled");
}
+.webcamOverButtonStyle {
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Webcam_Blue");
+}
+
.webcamOnButtonStyle {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Webcam_On");
}
@@ -220,6 +243,10 @@ mx|ApplicationControlBar {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deskshare");
}
+.deskshareOverButtonStyle {
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deskshare_Blue");
+}
+
.deskshareOnButtonStyle {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deskshare_White");
}
@@ -243,12 +270,13 @@ mx|ApplicationControlBar {
}
.muteMeDefaultButtonStyle {
- icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone");
- disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Disabled");
+ glowFilterColor : #B4201B;
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone");
+ disabledIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_Disabled");
}
.muteMeOnButtonStyle {
- icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_On");
+ icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone_White");
}
.muteMeOffButtonStyle {
@@ -330,14 +358,14 @@ mx|Button {
paddingTop : 8;
paddingBottom : 8;
cornerRadius : 2;
- color : #5E6D73;
- textRollOverColor : #5E6D73;
- textSelectedColor : #5E6D73;
+ color : #4E5A66;
+ textRollOverColor : #4E5A66;
+ textSelectedColor : #4E5A66;
fontSize : 14;
skin : ClassReference("org.bigbluebutton.skins.ButtonSkin");
/* Normal state */
- fillColorUp : #F0F2F6;
+ fillColorUp : #FFFFFF;
fillColorOver : #CDD4DB;
fillColorDown : #ACB2B7;
fillColorDisabled : #F0F2F6;
@@ -351,7 +379,7 @@ mx|Button {
borderAlphaDown : 1;
borderAlphaDisabled : 1;
- borderThikness : 1;
+ borderThickness : 1;
/* Selected state */
fillColorSelectedUp : #F0F2F6;
@@ -450,9 +478,9 @@ views|ClientStatusItemRenderer {
cornerRadius : 20;
borderStyle : none;
borderThickness : 0;
- fillColorUp : #3B97D3;
- fillColorOver : #2E8BB8;
- fillColorDown : #3B97D3;
+ fillColorUp : #1070D7;
+ fillColorOver : #0A5EAC;
+ fillColorDown : #1070D7;
fillColorDisabled : #F0F2F6;
}
@@ -523,7 +551,7 @@ mx|ComboBox {
iconColor : #5E6C73;
- borderThikness : 1;
+ borderThickness : 1;
skin : ClassReference("org.bigbluebutton.skins.ComboBoxSkin");
}
@@ -558,7 +586,7 @@ mx|DataGrid {
.deskshareWarningLabelStyle {
fontWeight : bold;
fontSize : 18;
- color : #3B97D3;
+ color : #1070D7;
}
.deskshareWarningBackgroundStyle {
@@ -707,6 +735,9 @@ flexlib|MDIWindow {
restoreBtnStyleName : "mdiMaximizeButtonStyle";
minimizeBtnStyleName : "mdiMinimizeButtonStyle";
+ paddingLeft : 0;
+ paddingRight : 0;
+
showHeaderSeparator : true;
}
@@ -813,18 +844,21 @@ views|NetworkStatsWindow {
mx|PopUpButton {
/* Normal state */
- fillColorUp : #F0F2F6;
+ fillColorUp : #FFFFFF;
fillColorOver : #CDD4DB;
fillColorDown : #ACB2B7;
fillColorDisabled : #F0F2F6;
borderColorUp : #CDD4DB;
- borderColorOver : #CDD4DB;
- borderColorDown : #ACB2B7;
+ borderColorOver : #1070D7;
+ borderColorDown : #1070D7;
borderColorDisabled : #CDD4DB;
- borderThikness : 1;
+ /* Icon states */
+ iconColor : #4E5A66;
+ iconColorOver : #1070D7;
+ iconColorDown : #4E5A66;
- iconColor : #5E6C73;
+ borderThickness : 1;
skin : ClassReference("org.bigbluebutton.skins.PopUpButtonSkin");
}
@@ -919,7 +953,7 @@ presentation|UploadedPresentationRenderer {
tickOffset : 2;
tickLength : 5;
tickThickness : 2;
- tickColor : #3B97D3;
+ tickColor : #1070D7;
showTrackHighlight : true;
invertThumbDirection : false;
borderColor : #CDD4DB;
@@ -1000,7 +1034,7 @@ poll|PollChoicesModal {
mx|ProgressBar {
color : #8A9AA7;
- barColor : #3697D3;
+ barColor : #1070D7;
trackColors : #FFFFFF, #FFFFFF;
borderColor : #CDD4DB;
barSkin : ClassReference("org.bigbluebutton.skins.ProgressBarSkin");
@@ -1082,7 +1116,7 @@ mx|TitleWindow {
mx|ToolTip {
borderSkin : ClassReference("org.bigbluebutton.skins.ToolTipSkin");
- backgroundColor : #3B97D3;
+ backgroundColor : #1070D7;
color : #FFFFFF;
fontSize : 13;
backgroundAlpha : 0.9;
@@ -1090,7 +1124,7 @@ mx|ToolTip {
}
.errorTip {
- borderColor : #FF6666;
+ borderColor : #DE2721;
}
/*
@@ -1124,16 +1158,17 @@ users|StatusItemRenderer {
}
users|MediaItemRenderer {
- iconAudioMuted : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio_Muted");
- iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio");
- iconSound : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Sound");
- iconLock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Lock");
- iconUnlock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Unlock");
- iconSettings : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Settings");
- iconWebcam : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Webcam");
- iconDemote : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Demote");
- iconPromote : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Promote");
- iconEject : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Eject");
+ iconAudioMuted : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio_Muted");
+ iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Audio");
+ iconSound : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Sound");
+ iconLock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Lock");
+ iconUnlock : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Unlock");
+ iconSettings : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Settings");
+ iconWebcam : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Webcam");
+ iconDemote : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Demote");
+ iconPromote : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Promote");
+ iconEject : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Eject");
+ glowFilterColor : #B4201B;
}
users|NameItemRenderer {
@@ -1181,7 +1216,7 @@ users|MoodMenu {
/* FIXME - start*/
iconMoodSpeakFaster : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
iconMoodSpeakSlower : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
- iconMoodSpeakLouder : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
+ iconMoodSpeakLouder : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Speak_Louder");
iconMoodSpeakSofter : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
/* FIXME - end */
iconMoodBeRightBack : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_User_Mood_Away");
@@ -1200,13 +1235,13 @@ users|MoodMenu {
videoconf|UserGraphicHolder {
iconPresenter : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Video_Presenter");
iconModerator : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Video_Moderator");
- iconClose : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Video_Moderator");
+ iconClose : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Close_Video");
iconFullScreen : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Fullscreen_White");
iconExitFullScreen : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Exit_Fullscreen_White");
}
.videoToolbarBackgroundTalkingStyle {
- backgroundColor : #3B97D3;
+ backgroundColor : #1070D7;
backgroundAlpha : 0.5;
}
diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
index 399f8632f24503deb1ee8b0d309153e9ca6bbf2d..3c0ce618abd6b98f7d52b54d46919e0d0e63451c 100644
Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla differ
diff --git a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
index 77f4092b0b6f33eca48709f372196b7ff55a2404..ce651110cd584c517aed03c7f3a67a7cbb7e575d 100644
Binary files a/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf and b/bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf differ
diff --git a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ButtonSkin.as b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ButtonSkin.as
index 6144a55424efa98f45ffe1ab06fbd56d2d55d7e1..17869687a4fd46b750df112b26f0d5871aa91337 100644
--- a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ButtonSkin.as
+++ b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ButtonSkin.as
@@ -94,7 +94,7 @@ package org.bigbluebutton.skins {
var borderAlphaDown:uint = getStyle("borderAlphaDown");
var borderAlphaDisabled:uint = getStyle("borderAlphaDisabled");
- var borderThikness:uint = getStyle("borderThikness");
+ var borderThickness:uint = getStyle("borderThickness");
var fillColorUp:uint = getStyle("fillColorUp");
var fillColorOver:uint = getStyle("fillColorOver");
@@ -114,7 +114,7 @@ package org.bigbluebutton.skins {
// Corner radius
var cr:Number = Math.max(0, cornerRadius);
- var cr1:Number = Math.max(0, cornerRadius - borderThikness);
+ var cr1:Number = Math.max(0, cornerRadius - borderThickness);
graphics.clear();
@@ -160,7 +160,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorUp, borderAlphaUp);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
break;
}
@@ -169,7 +169,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorOver, borderAlphaOver);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorOver, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorOver, 1);
break;
}
@@ -178,7 +178,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorDown, borderAlphaDown);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorDown, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDown, 1);
break;
}
@@ -188,7 +188,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorDisabled, borderAlphaDisabled);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorDisabled, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDisabled, 1);
break;
}
diff --git a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ComboBoxSkin.as b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ComboBoxSkin.as
index 435cf4e0d3ee3415c97baa8673bcd1f42c4cd5dc..60cc05bffc9cc7cedf4c600bfd13ccce794c50ec 100644
--- a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ComboBoxSkin.as
+++ b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/ComboBoxSkin.as
@@ -73,7 +73,7 @@ package org.bigbluebutton.skins {
var borderColorDown:uint = getStyle("borderColorDown");
var borderColorDisabled:uint = getStyle("borderColorDisabled");
- var borderThikness:uint = getStyle("borderThikness");
+ var borderThickness:uint = getStyle("borderThickness");
var fillColorUp:uint = getStyle("fillColorUp");
var fillColorOver:uint = getStyle("fillColorOver");
@@ -90,7 +90,7 @@ package org.bigbluebutton.skins {
var cornerRadius1:Number = Math.max(cornerRadius - 1, 0);
var cr:Object = {tl: 0, tr: cornerRadius, bl: 0, br: cornerRadius};
- var cr1:Object = {tl: 0, tr: cornerRadius - borderThikness, bl: 0, br: cornerRadius - borderThikness};
+ var cr1:Object = {tl: 0, tr: cornerRadius - borderThickness, bl: 0, br: cornerRadius - borderThickness};
var arrowOnly:Boolean = true;
@@ -114,7 +114,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
if (!arrowOnly) {
// line
@@ -131,7 +131,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorOver, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorOver, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorOver, 1);
if (!arrowOnly) {
// line
@@ -148,7 +148,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorDown, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorDown, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDown, 1);
if (!arrowOnly) {
// line
@@ -165,7 +165,7 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorDisabled, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorDisabled, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDisabled, 1);
if (!arrowOnly) {
// line
diff --git a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as
index 0af5c6a741a791ce4ccf4627b5db0a719c9ea81f..38c590e3155b89ea0d806d4df87f829778868c74 100644
--- a/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as
+++ b/bigbluebutton-client/branding/default/style/css/org/bigbluebutton/skins/PopUpButtonSkin.as
@@ -38,7 +38,7 @@
package org.bigbluebutton.skins {
import flash.display.DisplayObject;
-
+
import mx.core.IFlexDisplayObject;
import mx.core.IProgrammaticSkin;
import mx.core.UIComponent;
@@ -115,7 +115,7 @@ package org.bigbluebutton.skins {
var borderColorDown:uint = getStyle("borderColorDown");
var borderColorDisabled:uint = getStyle("borderColorDisabled");
- var borderThikness:uint = getStyle("borderThikness");
+ var borderThickness:uint = getStyle("borderThickness");
var fillColorUp:uint = getStyle("fillColorUp");
var fillColorOver:uint = getStyle("fillColorOver");
@@ -124,6 +124,9 @@ package org.bigbluebutton.skins {
// User-defined styles.
var arrowColor:uint = getStyle("iconColor");
+ var arrowColorOver:uint = getStyle("iconColorOver");
+ var arrowColorDown:uint = getStyle("iconColorDown");
+
var cornerRadius:Number = getStyle("cornerRadius");
var popUpIcon:IFlexDisplayObject = IFlexDisplayObject(getChildByName("popUpIcon"));
@@ -136,7 +139,7 @@ package org.bigbluebutton.skins {
DisplayObject(popUpIcon).visible = true;
}
- var arrowButtonWidth:Number = Math.max(getStyle("arrowButtonWidth"), popUpIcon.width + 3 + borderThikness);
+ var arrowButtonWidth:Number = Math.max(getStyle("arrowButtonWidth"), popUpIcon.width + 3 + borderThickness);
var dividerPosX:Number = w - arrowButtonWidth;
@@ -144,7 +147,7 @@ package org.bigbluebutton.skins {
// Corner radius
var cr:Number = Math.max(0, cornerRadius);
- var cr1:Number = Math.max(0, cornerRadius - borderThikness);
+ var cr1:Number = Math.max(0, cornerRadius - borderThickness);
graphics.clear();
@@ -154,10 +157,10 @@ package org.bigbluebutton.skins {
drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// Separator
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), cr, borderColorUp, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), cr, borderColorUp, 1);
break;
}
@@ -166,29 +169,31 @@ package org.bigbluebutton.skins {
// button border/edge
drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), 0, borderColorOver, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), 0, borderColorOver, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// left/main button fill
- drawRoundRect(borderThikness, borderThikness, w - arrowButtonWidth - (borderThikness * 2), h - (borderThikness * 2), getRadius(cr1, true), fillColorOver, 1);
+ drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, true), fillColorOver, 1);
break;
}
case "popUpOverSkin": // for hover on the arrow-button (right) side
{
+ arrowColor = arrowColorOver;
+
// button border/edge
drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), 0, borderColorOver, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), 0, borderColorOver, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), getRadius(cr1, true), fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, true), fillColorUp, 1);
// right button fill
- drawRoundRect(dividerPosX + borderThikness, borderThikness, arrowButtonWidth - (borderThikness * 2), h - (borderThikness * 2), getRadius(cr1, false), fillColorOver, 1);
+ drawRoundRect(dividerPosX + borderThickness, borderThickness, arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, false), fillColorOver, 1);
break;
}
@@ -196,31 +201,33 @@ package org.bigbluebutton.skins {
case "downSkin": // for press on the main button (left) side
{
// button border/ddge
- drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
+ drawRoundRect(0, 0, w, h, cr, borderColorDown, 1);
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), 0, borderColorDown, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), 0, borderColorUp, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// left/main button fill
- drawRoundRect(borderThikness, borderThikness, w - arrowButtonWidth - (borderThikness * 2), h - (borderThikness * 2), getRadius(cr1, true), fillColorDown, 1);
+ drawRoundRect(borderThickness, borderThickness, w - arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, true), fillColorDown, 1);
break;
}
case "popUpDownSkin": // for press on the arrow-button (right) side
{
+ arrowColor = arrowColorDown;
+
// button border/edge
drawRoundRect(0, 0, w, h, cr, borderColorUp, 1);
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), 0, fillColorDown, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), 0, fillColorDown, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorUp, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorUp, 1);
// right button fill
- drawRoundRect(dividerPosX + borderThikness, borderThikness, arrowButtonWidth - (borderThikness * 2), h - (borderThikness * 2), getRadius(cr1, false), fillColorDown, 1);
+ drawRoundRect(dividerPosX + borderThickness, borderThickness, arrowButtonWidth - (borderThickness * 2), h - (borderThickness * 2), getRadius(cr1, false), fillColorDown, 1);
break;
}
@@ -231,10 +238,10 @@ package org.bigbluebutton.skins {
// outer edge
drawRoundRect(0, 0, w, h, cornerRadius, fillColorDisabled, 1);
- drawRoundRect(dividerPosX, borderThikness, borderThikness, h - (borderThikness * 2), 0, borderColorDisabled, 1);
+ drawRoundRect(dividerPosX, borderThickness, borderThickness, h - (borderThickness * 2), 0, borderColorDisabled, 1);
// button fill
- drawRoundRect(borderThikness, borderThikness, w - (borderThikness * 2), h - (borderThikness * 2), cr1, fillColorDisabled, 1);
+ drawRoundRect(borderThickness, borderThickness, w - (borderThickness * 2), h - (borderThickness * 2), cr1, fillColorDisabled, 1);
break;
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
index 33f41659cb856fdc1a577aef53a75a8b1189589e..197f1f70629ac1111e4610cf10112f6eef78051f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -88,7 +88,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.main.events.UserJoinedEvent;
import org.bigbluebutton.main.events.UserLeftEvent;
import org.bigbluebutton.main.model.users.events.ChangeMyRole;
- import org.bigbluebutton.modules.chat.ChatConstants;
import org.bigbluebutton.modules.chat.ChatUtil;
import org.bigbluebutton.modules.chat.events.ChatEvent;
import org.bigbluebutton.modules.chat.events.ChatHistoryEvent;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml
index 59ebf88f0bcb7c12be94b4272917a38123f8eb4e..55ac14ac646565ef0de4b1b4b5552d20a3ea764f 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml
@@ -57,11 +57,10 @@ $Id: $
<fx:Script>
<![CDATA[
import flash.filters.BitmapFilterQuality;
+ import flash.filters.GlowFilter;
import mx.core.mx_internal;
- import spark.filters.GlowFilter;
-
import org.as3commons.logging.api.ILogger;
import org.as3commons.logging.api.getClassLogger;
import org.bigbluebutton.common.IBbbToolbarComponent;
@@ -97,7 +96,7 @@ $Id: $
//rest rolledOver when the data changes because onRollOut wont be called if the row moves
if (UsersUtil.isMe(e.message.userID)) {
if (e.message.talking) {
- currentIcon.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
+ currentIcon.filters = [new GlowFilter(getStyle("glowFilterColor"), 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
} else {
currentIcon.filters = [];
}
@@ -168,7 +167,7 @@ $Id: $
toolTip = ResourceUtil.getInstance().getString("bbb.users.muteMeBtnTxt.muted");
} else {
selected = false;
- styleName = "muteMeOnButtonStyle";
+ styleName = "muteMeDefaultButtonStyle";
}
}
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
index a5eb5bcc6aa6a8ca82632bb54f4dafc744db6e6a..9ffd0f2faf377c262867a029d908e450b25003af 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
@@ -101,7 +101,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if (_currentState == ACTIVE_STATE)
this.styleName = "voiceConfInactiveButtonStyle";
else
- this.styleName = "voiceConfActiveButtonStyle";
+ this.styleName = "voiceConfOverButtonStyle";
}
private function mouseOutHandler(event:MouseEvent):void {
@@ -150,7 +150,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
}
}
-
private function onUserJoinedConference():void {
PhoneOptions.firstAudioJoin = false;
@@ -237,7 +236,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
this.enabled = true;
LOGGER.debug("onClosedAudioSelection enabled=[{0}] selected=[{1}]", [enabled, selected]);
_currentState = DEFAULT_STATE;
- this.styleName = "voiceConfDefaultButtonStyle";
+ this.styleName = "voiceConfDefaultButtonStyle";
this.toolTip = ResourceUtil.getInstance().getString('bbb.toolbar.phone.toolTip.start');
joinDefaultListenOnlyMode();
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ToolbarButton.mxml
index 5fc6fbfd366d237436e7e4405757bb195e3c12d5..610692d8531d5a1ab9e30f02b5052cae1f772f47 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ToolbarButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ToolbarButton.mxml
@@ -105,7 +105,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if(_currentState == ON_STATE)
styleName="deskshareOffButtonStyle"
else
- styleName="deskshareOnButtonStyle"
+ styleName="deskshareOverButtonStyle"
}
private function mouseOutHandler(event:MouseEvent):void {
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
index f8654f226bb00dd1d76034cb20cf8ec1900f1605..34a7b98d814832e4c4bb144cb954b287ea37bed5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
@@ -203,7 +203,7 @@
muteBtn.enabled = true;
if(data.talking && !rolledOver){
- muteImg.filters = [new GlowFilter(0x000000, 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
+ muteImg.filters = [new GlowFilter(getStyle("glowFilterColor"), 1, 6, 6, 2, BitmapFilterQuality.HIGH, false, false)];
}else{
muteImg.filters = [];
}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
index ec1c3964d2fc9b159490650e37c49fd6ac22f24f..bcfa0b19b9986c2e5dfa05bd93e524dc0d89089b 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
@@ -218,7 +218,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
if(_currentState == ON_STATE)
this.styleName = "webcamOffButtonStyle";
else
- this.styleName = "webcamOnButtonStyle";
+ this.styleName = "webcamOverButtonStyle";
this.selected = false;
}