diff --git a/clients/flash/air-client/src/Default.css b/clients/flash/air-client/src/Default.css
index cb7f3c9cfc3d3d8c0395c7f3e190c3459a3370ad..407aac06a309cc37b51ea35b07d19b618a86dbab 100755
--- a/clients/flash/air-client/src/Default.css
+++ b/clients/flash/air-client/src/Default.css
@@ -219,7 +219,7 @@ chat|NewMessagesIndicator {
}
chat|ChatItemRenderer {
- color : PropertyReference("grey700");
+ color : PropertyReference("bbbDarkGrey");
nameColor : PropertyReference("blue900");
}
@@ -290,7 +290,6 @@ settings|SettingsItemRenderer {
fontFamily : SourceSansPro;
backgroundColor : PropertyReference("bbbBlue");
selectedBackgroundColor : PropertyReference("darkBlue");
- color : PropertyReference("white");
iconFont : BBBIcons;
iconColor : PropertyReference("white");
skinClass : ClassReference("org.bigbluebutton.air.main.views.skins.MenuButtonSkin");
diff --git a/clients/flash/air-client/src/css/hdpi.css b/clients/flash/air-client/src/css/hdpi.css
index 00d3df54134a071e4199082cf32a3a319654bd62..fa38a8dd073a8aee512c87a9e46308fbcea84434 100755
--- a/clients/flash/air-client/src/css/hdpi.css
+++ b/clients/flash/air-client/src/css/hdpi.css
@@ -38,7 +38,7 @@
}
main|MainView {
- menuHeight: 120.00;
+ menuHeight: 82.50;
}
main|MenuButtons {
@@ -46,9 +46,7 @@
}
skins|MenuButtonSkin {
- fontSize: 18.00;
- iconSize: 27.00;
- labelPadding: 9.00;
+ iconSize: 30.00;
}
chat|NewMessagesIndicator {
@@ -60,8 +58,8 @@
padding: 10.50;
gap: 6.00;
leftIndent: 33.00;
- fontSize: 21.00;
- nameFontSize: 21.00;
+ fontSize: 23.00;
+ nameFontSize: 23.00;
timeFontSize: 21.00;
}
@@ -128,7 +126,8 @@
}
.sendButton {
- diameter: 42.00;
+ diameter: 48.00;
+ fontSize: 22.00;
}
.titleGroup {
@@ -202,12 +201,6 @@
padding: 22.50;
}
- .sendButton {
- fontSize: 15.00;
- borderWeight: 1.50;
- cornerRadius: 3.00;
- }
-
.echoTestLabel {
padding: 24.00;
}
diff --git a/clients/flash/air-client/src/css/ldpi.css b/clients/flash/air-client/src/css/ldpi.css
index 215ed93a288476636ea7aef722ed3d4b9f9407d7..434e6c58bbf693473a05a66c1f5a6405e27cc236 100755
--- a/clients/flash/air-client/src/css/ldpi.css
+++ b/clients/flash/air-client/src/css/ldpi.css
@@ -38,7 +38,7 @@
}
main|MainView {
- menuHeight: 60.000;
+ menuHeight: 41.250;
}
main|MenuButtons {
@@ -46,9 +46,7 @@
}
skins|MenuButtonSkin {
- fontSize: 9.000;
- iconSize: 13.500;
- labelPadding: 4.500;
+ iconSize: 15.000;
}
chat|NewMessagesIndicator {
@@ -60,8 +58,8 @@
padding: 5.250;
gap: 3.000;
leftIndent: 16.500;
- fontSize: 10.500;
- nameFontSize: 10.500;
+ fontSize: 12.000;
+ nameFontSize: 12.000;
timeFontSize: 10.500;
}
@@ -129,6 +127,7 @@
.sendButton {
diameter: 21.000;
+ fontSize: 11.250;
}
.titleGroup {
@@ -202,12 +201,6 @@
padding: 11.250;
}
- .sendButton {
- fontSize: 7.500;
- borderWeight: .750;
- cornerRadius: 1.500;
- }
-
.echoTestLabel {
padding: 12.000;
}
diff --git a/clients/flash/air-client/src/css/mdpi.css b/clients/flash/air-client/src/css/mdpi.css
index a67a638ffe55b00004f17651753e7932a67275a2..c1bcf253007df234df38ede84c82c55d0748dce8 100755
--- a/clients/flash/air-client/src/css/mdpi.css
+++ b/clients/flash/air-client/src/css/mdpi.css
@@ -38,7 +38,7 @@
}
main|MainView {
- menuHeight: 80.0;
+ menuHeight: 55.0;
}
main|MenuButtons {
@@ -46,9 +46,7 @@
}
skins|MenuButtonSkin {
- fontSize: 12.0;
- iconSize: 18.0;
- labelPadding: 6.0;
+ iconSize: 20.0;
}
chat|NewMessagesIndicator {
@@ -60,8 +58,8 @@
padding: 7.0;
gap: 4.0;
leftIndent: 22.0;
- fontSize: 14.0;
- nameFontSize: 14.0;
+ fontSize: 16.0;
+ nameFontSize: 16.0;
timeFontSize: 14.0;
}
@@ -129,6 +127,7 @@
.sendButton {
diameter: 28.0;
+ fontSize: 15;
}
.titleGroup {
@@ -202,12 +201,6 @@
padding: 15.0;
}
- .sendButton {
- fontSize: 10.0;
- borderWeight: 1.0;
- cornerRadius: 2.0;
- }
-
.echoTestLabel {
padding: 16.0;
}
diff --git a/clients/flash/air-client/src/css/xhdpi.css b/clients/flash/air-client/src/css/xhdpi.css
index 432547ca997e2f364836a97371daa0d3c59f10a4..9cd37502810926965fde59625365f5f7ff24bc41 100755
--- a/clients/flash/air-client/src/css/xhdpi.css
+++ b/clients/flash/air-client/src/css/xhdpi.css
@@ -26,7 +26,7 @@
}
main|MainView {
- menuHeight : 160;
+ menuHeight : 110;
}
main|MenuButtons {
@@ -34,9 +34,7 @@
}
skins|MenuButtonSkin {
- fontSize : 24;
- iconSize : 36;
- labelPadding : 12;
+ iconSize : 40;
}
chat|NewMessagesIndicator {
@@ -48,8 +46,8 @@
padding : 14;
gap : 8;
leftIndent : 44;
- fontSize : 28;
- nameFontSize : 28;
+ fontSize : 32;
+ nameFontSize : 32;
timeFontSize : 28;
}
@@ -117,6 +115,7 @@
.sendButton {
diameter : 56;
+ fontSize : 30;
}
.titleGroup {
@@ -190,12 +189,6 @@
padding : 30;
}
- .sendButton {
- fontSize : 20;
- borderWeight : 2;
- cornerRadius : 4;
- }
-
.echoTestLabel {
padding : 32;
}
diff --git a/clients/flash/air-client/src/css/xxhdpi.css b/clients/flash/air-client/src/css/xxhdpi.css
index 200a30d00df45c242c8e95286e972d0525a9eab4..31eada62e2d657fd923e37fdafd0688da103be3b 100755
--- a/clients/flash/air-client/src/css/xxhdpi.css
+++ b/clients/flash/air-client/src/css/xxhdpi.css
@@ -38,7 +38,7 @@
}
main|MainView {
- menuHeight: 240.0;
+ menuHeight: 165.0;
}
main|MenuButtons {
@@ -46,9 +46,7 @@
}
skins|MenuButtonSkin {
- fontSize: 36.0;
- iconSize: 54.0;
- labelPadding: 18.0;
+ iconSize: 60.0;
}
chat|NewMessagesIndicator {
@@ -60,8 +58,8 @@
padding: 21.0;
gap: 12.0;
leftIndent: 66.0;
- fontSize: 42.0;
- nameFontSize: 42.0;
+ fontSize: 48.0;
+ nameFontSize: 48.0;
timeFontSize: 42.0;
}
@@ -129,6 +127,7 @@
.sendButton {
diameter: 84.0;
+ fontSize: 45;
}
.titleGroup {
@@ -202,12 +201,6 @@
padding: 45.0;
}
- .sendButton {
- fontSize: 30.0;
- borderWeight: 3.0;
- cornerRadius: 6.0;
- }
-
.echoTestLabel {
padding: 48.0;
}
diff --git a/clients/flash/air-client/src/css/xxxhdpi.css b/clients/flash/air-client/src/css/xxxhdpi.css
index 24cf693ebcbd5018273ac19f146efc2f4344ea37..84370c4fbb46e714755cfd779123ab53b41c058d 100755
--- a/clients/flash/air-client/src/css/xxxhdpi.css
+++ b/clients/flash/air-client/src/css/xxxhdpi.css
@@ -38,7 +38,7 @@
}
main|MainView {
- menuHeight: 320;
+ menuHeight: 220;
}
main|MenuButtons {
@@ -46,9 +46,7 @@
}
skins|MenuButtonSkin {
- fontSize: 48;
- iconSize: 72;
- labelPadding: 24;
+ iconSize: 80;
}
chat|NewMessagesIndicator {
@@ -60,8 +58,8 @@
padding: 28;
gap: 16;
leftIndent: 88;
- fontSize: 56;
- nameFontSize: 56;
+ fontSize: 64;
+ nameFontSize: 64;
timeFontSize: 56;
}
@@ -129,6 +127,7 @@
.sendButton {
diameter: 112;
+ fontSize: 60;
}
.titleGroup {
@@ -202,12 +201,6 @@
padding: 60;
}
- .sendButton {
- fontSize: 40;
- borderWeight: 4;
- cornerRadius: 8;
- }
-
.echoTestLabel {
padding: 64;
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml
index 051033e9693c5e24fc738633fbb2e6d92392d2d7..a3d4530053b2b47ebaec677fd426114c70536bee 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/skins/SendButtonSkin.mxml
@@ -18,6 +18,7 @@
backgroundFill.color = getStyle("backgroundColor");
labelDisplay.text = getStyle("icon");
+ //labelDisplay.setStyle("fontSize", getStyle("fontSize"));
super.updateDisplayList(unscaledWidth, unscaledHeight);
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as
index d756df16a3205f2734c2697f031585a35f7b42d2..6df4cbd8a391a26605ce3c02b8ae380949897e07 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtons.as
@@ -4,6 +4,7 @@ package org.bigbluebutton.air.main.views {
import spark.components.SkinnableContainer;
import spark.layouts.HorizontalAlign;
import spark.layouts.HorizontalLayout;
+ import spark.layouts.VerticalAlign;
[Style(name = "bottom", inherit = "no", type = "Number")]
[Style(name = "gap", inherit = "no", type = "Number")]
@@ -39,26 +40,23 @@ package org.bigbluebutton.air.main.views {
super();
bLayout = new HorizontalLayout();
- bLayout.horizontalAlign = HorizontalAlign.CENTER
+ bLayout.horizontalAlign = HorizontalAlign.CENTER;
+ bLayout.verticalAlign = VerticalAlign.MIDDLE;
layout = bLayout;
_micButton = new Button();
- _micButton.label = "Mic on";
_micButton.styleName = "icon-unmute menuButton";
addElement(_micButton);
_audioButton = new Button();
- _audioButton.label = "Join";
_audioButton.styleName = "icon-audio-on menuButton";
addElement(_audioButton);
_camButton = new Button();
- _camButton.label = "Cam on";
_camButton.styleName = "icon-video menuButton";
addElement(_camButton);
_statusButton = new Button();
- _statusButton.label = "Status";
_statusButton.styleName = "icon-hand menuButton";
addElement(_statusButton);
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
index 03ad8f983549925f71debb889a6a8c2d4dd178de..41d4e5bf29d7208274591112cdfcd5154410793f 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/MenuButtonsMediator.as
@@ -149,30 +149,23 @@ package org.bigbluebutton.air.main.views {
private function updateButtons():void {
if (meetingData.webcams.findWebcamsByUserId(conferenceParameters.internalUserID).length > 0) {
- view.camButton.label = "Cam off"; // ResourceManager.getInstance().getString('resources', 'menuButtons.camOff');
view.camButton.styleName = "icon-video-off menuButton"
} else {
- view.camButton.label = "Cam on"; // ResourceManager.getInstance().getString('resources', 'menuButtons.camOn');
view.camButton.styleName = "icon-video menuButton"
}
if (meetingData.voiceUsers.me) {
view.micButton.visible = view.micButton.includeInLayout = !meetingData.voiceUsers.me.listenOnly;
view.audioButton.styleName = "icon-audio-off menuButtonRed";
- view.audioButton.label = "Hang Up";
if (meetingData.voiceUsers.me.muted) {
- view.micButton.label = "Mic off"; // ResourceManager.getInstance().getString('resources', 'menuButtons.micOff');
view.micButton.styleName = "icon-mute menuButton";
} else if (meetingData.voiceUsers.me.talking) {
- view.micButton.label = "Mic on"; // ResourceManager.getInstance().getString('resources', 'menuButtons.micOn');
view.micButton.styleName = "icon-mute-filled menuButton"
} else {
- view.micButton.label = "Mic on"; // ResourceManager.getInstance().getString('resources', 'menuButtons.micOn');
view.micButton.styleName = "icon-unmute menuButton"
}
} else {
- view.audioButton.label = "Join";
view.audioButton.styleName = "icon-audio-on menuButton";
view.micButton.visible = view.micButton.includeInLayout = false;
}
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml
index 2891117ca75f35fa5ef46ea65fac15505197a0a7..a4409aad42b78a12a3cb33fc54dfbb8512c9e1bc 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/main/views/skins/MenuButtonSkin.mxml
@@ -17,9 +17,6 @@
icon.setStyle("fontFamily", getStyle("iconFont"));
icon.setStyle("color", getStyle("iconColor"));
- iconLabel.text = hostComponent.label;
- iconLabel.y = backgroundEllipse.y + backgroundEllipse.height + getStyle('labelPadding');
-
super.updateDisplayList(unscaledWidth, unscaledHeight);
}
]]>
@@ -45,7 +42,4 @@
<s:Label id="icon"
horizontalCenter="0"
verticalCenter="0" />
- <s:Label id="iconLabel"
- horizontalCenter="0" />
-
</s:Skin>