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

Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into refactor-akka-fsesl-for-new-messages

Browse Source
This commit is contained in:
Richard Alam 2017-06-13 18:10:25 -07:00
commit 91c14fae53
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigbluebutton-client/.actionScriptProperties
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties analytics="false" mainApplicationPath="BigBlueButton.mxml" projectUUID="f330b47a-ef44-431d-8c83-1768892be326" version="11">
<compiler additionalCompilerArguments="-locale en_US&#13;&#10;-define=GIT::version,27" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="11.2.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
<compiler additionalCompilerArguments="-locale en_US&#13;&#10;-show-unused-type-selector-warnings=false" autoRSLOrdering="true" copyDependentFiles="true" fteInMXComponents="false" generateAccessible="true" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="11.2.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="0">
<libraryPathEntry kind="4" path="">

23
bigbluebutton-client/branding/default/style/css/BBBBlack.css
View File

@ -1,8 +1,13 @@
Application {
@namespace mx "library://ns.adobe.com/flex/mx";
@namespace flexlib "http://code.google.com/p/flexlib/";
@namespace users "org.bigbluebutton.modules.users.views.*";
@namespace poll "org.bigbluebutton.modules.polling.views.*";
mx|Application {
backgroundColor: #000000;
}
ApplicationControlBar {
mx|ApplicationControlBar {
highlightAlphas: 0.1, 0;
fillAlphas: 0, 0;
fillColors: #000000, #000000;
@ -15,7 +20,7 @@ ApplicationControlBar {
dropShadowColor: #000000;
}
Panel {
mx|Panel {
borderColor: #000000;
borderAlpha: 1;
shadowDistance: 1;
@ -23,7 +28,7 @@ Panel {
titleStyleName: "mypanelTitle";
}
ToolTip {
mx|ToolTip {
borderSkin : ClassReference("org.bigbluebutton.skins.ToolTipSkin");
backgroundAlpha : 0.9;
cornerRadius : 3;
@ -46,7 +51,7 @@ ToolTip {
paddingRight: 3;
}
Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
mx|Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
textIndent: 0;
paddingLeft: 10;
paddingRight: 10;
@ -73,7 +78,7 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle {
textSelectedColor: #504f3d;
}
DataGrid {
mx|DataGrid {
backgroundColor: #000000;
rollOverColor: #f3f3f3;
textRollOverColor: #5e5f63;
@ -353,7 +358,7 @@ DataGrid {
titleStyleName: "micSettingsWindowTitleStyle";
}
.micSettingsWindowTitleStyle, webcamSettingsWindowTitleStyle {
.micSettingsWindowTitleStyle, .webcamSettingsWindowTitleStyle {
fontFamily: Arial;
fontSize: 20;
fontWeight: bold;
@ -401,7 +406,7 @@ DataGrid {
icon: Embed('assets/images/questionmark.png');
}
MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/
flexlib|MDIWindow { /*None of the following properties are overridden by the MDIWindow class*/
backgroundSize: '100%';
cornerRadius: 5;
@ -643,4 +648,4 @@ MDIWindow { /*None of the following properties are overridden by the MDIWindow c
fontFamily: Arial;
fontSize: 20;
fontWeight: bold;
}
}

10
bigbluebutton-client/build.xml
View File

@ -56,6 +56,7 @@
<echo message="Locale output dir exists. Deleting contents of ${OUTPUT_DIR}/locale" />
<delete>
<fileset dir="${OUTPUT_DIR}/locale">
<exclude name="**/*.swf.cache" />
<include name="**/*" />
</fileset>
</delete>
@ -79,7 +80,7 @@
<target name="branding" depends="init-ant-contrib">
<sequential>
<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" debug="${DEBUG}" incremental="true" swf-version="13" default-background-color="0xFFFFFF" optimize="true">
<mxmlc file="${BASE_DIR}/branding/default/style/css/${themeFile}" output="${OUTPUT_DIR}/branding/css/${themeFile}.swf" debug="${DEBUG}" show-unused-type-selector-warnings="false" incremental="true" swf-version="13" default-background-color="0xFFFFFF" optimize="true">
<compiler.library-path dir="." append="true">
<include name="libs" />
</compiler.library-path>
@ -89,7 +90,10 @@
<target name="branding-black" depends="init-ant-contrib">
<sequential>
<mxmlc file="${BASE_DIR}/branding/default/style/css/${blackTheme}" output="${OUTPUT_DIR}/branding/css/${blackTheme}.swf" debug="${DEBUG}" incremental="true" swf-version="13" optimize="true">
<mxmlc file="${BASE_DIR}/branding/default/style/css/${blackTheme}" output="${OUTPUT_DIR}/branding/css/${blackTheme}.swf" debug="${DEBUG}" show-unused-type-selector-warnings="false" incremental="true" swf-version="13" optimize="true">
<compiler.library-path dir="." append="true">
<include name="libs" />
</compiler.library-path>
</mxmlc>
</sequential>
</target>
@ -298,6 +302,7 @@
<load-config filename="@{flex}/frameworks/flex-config.xml" />
<default-background-color>0xFFFFFF</default-background-color>
<source-path path-element="@{flex}/frameworks" />
<show-unused-type-selector-warnings>false</show-unused-type-selector-warnings>
<theme dir="@{flex}/frameworks/themes/Halo">
<include name="halo.swc" />
@ -491,6 +496,7 @@
<delete>
<fileset dir="${OUTPUT_DIR}">
<exclude name="locale/*.swf" />
<exclude name="**/*.swf.cache" />
<exclude name=".gitignore" />
</fileset>
<dirset dir="${OUTPUT_DIR}">