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

Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme

Browse Source
This commit is contained in:
Richard Alam 2017-08-23 12:58:19 -07:00
commit cab3d97cdf
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bigbluebutton-client/branding/default/style/css/V2Theme.css
View File

@ -11,6 +11,7 @@
@namespace sharednotes "org.bigbluebutton.modules.sharednotes.views.components.*";
@namespace chat "org.bigbluebutton.modules.chat.views.*";
@namespace skins "org.bigbluebutton.skins.*";
@namespace phonecomponents "org.bigbluebutton.modules.phone.views.components.*";
/*
//------------------------------
@ -128,6 +129,10 @@ mx|ApplicationControlBar {
highlightAlphas : 0, 0;
}
phonecomponents|MuteMeButton {
glowFilterColor : #1070D7;
}
.toolbarSeparator {
strokeWidth : 1;
strokeColor : #CDD4DB;
@ -163,7 +168,8 @@ mx|ApplicationControlBar {
.webcamDefaultButtonStyle, .webcamOnButtonStyle, .webcamOffButtonStyle, .webcamOverButtonStyle,
.deskshareDefaultButtonStyle, .deskshareOverButtonStyle, .deskshareOnButtonStyle, .deskshareOffButtonStyle,
.muteMeDefaultButtonStyle, .muteMeOnButtonStyle, .muteMeOffButtonStyle {
.muteMeDefaultButtonStyle, .muteMeOnButtonStyle, .muteMeOffButtonStyle,
.recordButtonStyleNormal, .recordButtonStyleStop, .recordButtonStyleStart {
fillColorOver : #FFFFFF;
borderColorOver : #1070D7;
fillColorSelectedUp : #1070D7;
@ -262,7 +268,10 @@ mx|ApplicationControlBar {
}
.recordButtonStyleStart {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Record_On");
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Record_On_Blue");
selectedUpIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Record_On");
selectedOverIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Record_On");
selectedDownIcon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Record_On");
}
.recordButtonStyleStop {
@ -270,7 +279,6 @@ mx|ApplicationControlBar {
}
.muteMeDefaultButtonStyle {
glowFilterColor : #1070D7;
iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Microphone");
}

BIN
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
View File

Binary file not shown.

BIN
bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
View File

Binary file not shown.

2
bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/MuteMeButton.mxml
View File

@ -206,7 +206,7 @@ $Id: $
muteMeBtnImg.source = getStyle("iconAudio");
} else {
selected = false;
styleName = "muteMeOnButtonStyle";
styleName = "muteMeDefaultButtonStyle";
muteMeBtnImg.source = getStyle("iconAudio");
}