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

Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf

Browse Source
This commit is contained in:
Richard Alam 2017-08-09 07:21:17 -07:00
commit 9a88fbbbe3
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,11 +40,7 @@ global {
fontFamily : "Source Sans Pro", Arial, sans-serif;
fontSize : 13;
color : #2A2D33;
selectionColor : #1070D7;
textSelectedColor : #FFFFFF;
focusColor : #1070D7;
rollOverColor : #0A5EAC;
textRollOverColor : #FFFFFF;
}
.defaultShellStyle {
@ -679,6 +675,28 @@ mx|DataGrid {
icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deny");
}
/*
//------------------------------
// Item renderers
//------------------------------
*/
.itemRendererDefault {
color : #2A2D33;
}
.itemRendererOver {
color : #FFFFFF;
}
.itemRendererSeleted {
color : #FFFFFF;
}
.itemRendererDisabled {
color : #F0F2F6;
}
/*
//------------------------------
// Layout
@ -836,15 +854,15 @@ flexlibcontainers|MDIWindowControlsContainer {
}
.videoDockStyleFocusChatLayout {
borderStyle : none;
borderColor: #42444C;
backgroundColor: #42444C;
borderStyle : none;
borderColor : #42444C;
backgroundColor : #42444C;
}
.videoDockStyleNoFocusChatLayout {
borderStyle : none;
borderColor: #42444C;
backgroundColor: #42444C;
borderStyle : none;
borderColor : #42444C;
backgroundColor : #42444C;
}
/*

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.

6
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
View File

@ -344,7 +344,7 @@
}
]]>
</fx:Script>
<mx:Canvas id="webcamCanvas" width="28" height="20" visible="{webcamImg.visible || webcamBtn.visible}" includeInLayout="{webcamCanvas.visible}">
<mx:Canvas id="webcamCanvas" width="28" height="20" visible="{webcamImg.visible || webcamBtn.visible}">
<mx:Image id="webcamImg" visible="false" source="{getStyle('iconWebcam')}"
horizontalCenter="0" verticalCenter="0"
toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.webcam')}" />
@ -354,7 +354,7 @@
toolTip="{ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.webcamBtn')}" />
</mx:Canvas>
<mx:Canvas id="muteCanvas" width="20" height="20" visible="{muteImg.visible || muteBtn.visible}" includeInLayout="{muteCanvas.visible}">
<mx:Canvas id="muteCanvas" width="20" height="20" visible="{muteImg.visible || muteBtn.visible}">
<mx:Image id="muteImg" visible="false" includeInLayout="true"
horizontalCenter="0" verticalCenter="0" />
<mx:Button id="muteBtn" visible="false" includeInLayout="false" enabled="false" icon="{getStyle('iconAudio')}"
@ -365,7 +365,7 @@
toolTip="{data.muted ? ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.pushToTalk',[data.name]) : ResourceUtil.getInstance().getString('bbb.users.usersGrid.mediaItemRenderer.pushToMute',[data.name])}" />
</mx:Canvas>
<mx:Canvas id="lockCanvas" width="20" height="20" visible="{lockImg.visible || lockBtn.visible}" includeInLayout="{lockCanvas.visible}">
<mx:Canvas id="lockCanvas" width="20" height="20" visible="{lockImg.visible || lockBtn.visible}">
<mx:Image id="lockImg" visible="false" includeInLayout="false"
horizontalCenter="0" verticalCenter="0" />
<mx:Button id="lockBtn" visible="false" includeInLayout="false" enabled="false"

5
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UserItemRenderer.mxml
View File

@ -22,10 +22,13 @@
<mx:Box xmlns:mx="library://ns.adobe.com/flex/mx"
xmlns:fx="http://ns.adobe.com/mxml/2009"
styleName="{data.breakoutRooms.length > 0 ? 'itemRendererDisabled' : 'itemRendererDefault'}"
width="100%"
verticalScrollPolicy="off"
horizontalScrollPolicy="off">
<mx:Label id="nameLabel"
width="100%"
text="{data.name}"
color="{data.breakoutRooms.length > 0 ? 0xcccccc : 0x000000}"
toolTip="{data.name}" />
</mx:Box>