[AIR] increase some button and font sizes

This commit is contained in:
Chad Pilkey 2018-04-11 08:45:44 -07:00
parent 880c5dc48e
commit 45d95092f7
11 changed files with 36 additions and 93 deletions

View File

@ -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");

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -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;
}

View File

@ -18,6 +18,7 @@
backgroundFill.color = getStyle("backgroundColor");
labelDisplay.text = getStyle("icon");
//labelDisplay.setStyle("fontSize", getStyle("fontSize"));
super.updateDisplayList(unscaledWidth, unscaledHeight);
}

View File

@ -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);
}

View File

@ -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;
}

View File

@ -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>