Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

This commit is contained in:
Richard Alam 2013-01-08 20:05:11 +00:00
commit a78929af0c

View File

@ -53,7 +53,7 @@ Button {
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
borderColor: #b9babc;
themeColor: #aaaaaa;
themeColor: haloBlue;
fontFamily: Arial;
fontSize: 12;
}
@ -67,7 +67,7 @@ Button {
textRollOverColor: #ffffff;
textSelectedColor: #262626;
borderColor: #000000;
themeColor: #000000;
themeColor: haloBlue;
fontFamily: Arial;
fontSize: 12;
}
@ -81,7 +81,7 @@ Button {
textRollOverColor: #ffffff;
textSelectedColor: #262626;
borderColor: #000000;
themeColor: #000000;
themeColor: haloBlue;
fontFamily: Arial;
fontSize: 12;
}
@ -89,7 +89,7 @@ Button {
.helpLinkButtonStyle {
rollOverColor: #cccccc;
selectionColor: #999999;
color: #504f3d;
color: #ffffff;
textRollOverColor: #504f3d;
textSelectedColor: #504f3d;
}
@ -130,7 +130,7 @@ DataGrid {
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
borderColor: #b9babc;
themeColor: #aaaaaa;
themeColor: haloBlue;
fontFamily: Arial;
fontSize: 12;
}
@ -187,7 +187,7 @@ DataGrid {
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
borderColor: #b9babc;
themeColor: #aaaaaa;
themeColor: haloBlue;
fontFamily: Arial;
fontSize: 12;
}
@ -224,7 +224,7 @@ DataGrid {
invertThumbDirection: false;
borderColor: #b9babc;
trackColors: #aaaaaa, #aaaaaa;
themeColor: #aaaaaa;
themeColor: haloBlue;
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
labelStyleName: "presentationZoomSliderLabelStyle";
@ -274,13 +274,13 @@ DataGrid {
}
MDIWindow {
resizeCursorHorizontalXOffset: 2;
}
.mdiWindowFocus, .mdiWindowNoFocus, .presentationWindowStyleNoFocus, .presentationWindowStyleFocus, .videoDockStyleNoFocus, .videoDockStyleFocus
.mdiWindowFocus, .presentationWindowStyleFocus, .videoDockStyleFocus
{
headerHeight: 26;
roundedBottomCorners: false;
roundedBottomCorners: true;
backgroundAlpha: 1;
backgroundColor: #b9babc;
backgroundSize: '100%';
@ -308,6 +308,37 @@ MDIWindow {
controlButtonGap: 4;
}
.mdiWindowNoFocus, .presentationWindowStyleNoFocus, .videoDockStyleNoFocus
{
headerHeight: 26;
roundedBottomCorners: false;
backgroundAlpha: 0.5;
backgroundColor: #b9babc;
backgroundSize: '100%';
borderStyle: solid;
borderColor: #b9babc;
borderAlpha: 0.5;
borderThickness: 1;
borderThicknessLeft: 1;
borderThicknessTop: 1;
borderThicknessBottom: 1;
borderThicknessRight: 1;
cornerRadius: 0;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
cornerResizeImg: Embed(source="assets/swf/Blue.swf", symbol="Corner_Resize");
cornerResizeWidth: 2;
cornerResizeHeight: 2;
cornerResizePaddingRight: 2;
cornerResizePaddingBottom: 2;
controlButtonWidth: 10;
controlButtonHeight: 10;
controlButtonGap: 4;
}
.presentationSlideViewStyle {
backgroundColor: #b9babc;
}
@ -325,7 +356,7 @@ MDIWindow {
.videoViewStyleNoFocus
{
borderColor: #b9babc;
borderAlpha: 1;
borderAlpha: 0.5;
borderThicknessLeft: 5;
borderThicknessTop: 5;
borderThicknessBottom: 5;
@ -334,6 +365,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 0.5;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}
@ -350,6 +382,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 1;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}
@ -357,7 +390,7 @@ MDIWindow {
.videoPublishStyleNoFocus
{
borderColor: #b9babc;
borderAlpha: 1;
borderAlpha: 0.5;
borderThicknessLeft: 5;
borderThicknessTop: 5;
borderThicknessBottom: 5;
@ -366,6 +399,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 0.5;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}
@ -382,6 +416,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 1;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}
@ -389,7 +424,7 @@ MDIWindow {
.videoAvatarStyleNoFocus
{
borderColor: #b9babc;
borderAlpha: 1;
borderAlpha: 0.5;
borderThicknessLeft: 5;
borderThicknessTop: 5;
borderThicknessBottom: 5;
@ -398,6 +433,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 0.5;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}
@ -414,6 +450,7 @@ MDIWindow {
cornerRadius: 5;
headerHeight: 20;
backgroundColor: #b9babc;
backgroundAlpha: 1;
dropShadowEnabled: false;
titleStyleName: "mypanelTitle";
}