diff --git a/bigbluebutton-client/branding/default/style/css/BBBDefault.css b/bigbluebutton-client/branding/default/style/css/BBBDefault.css index 6a62cbd3500daa2a3928acd2d92175ac89157f1f..83e22841973c4db17e5a64d3e2544668759c9119 100755 --- a/bigbluebutton-client/branding/default/style/css/BBBDefault.css +++ b/bigbluebutton-client/branding/default/style/css/BBBDefault.css @@ -826,8 +826,7 @@ Alert { .lockSettingsDefaultLabelStyle { fontFamily: Arial; - fontSize: 14; - fontWeight: bold; + fontSize: 14; } .lockSettingsWindowTitleStyle { diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index afb9fa426dab79c4144be24f2b133e18bd8dc7bb..45d834f68b25a3f9f8b40b72a29a129df3bbd2e9 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -2,7 +2,7 @@ bbb.mainshell.locale.version = 0.9.0 bbb.mainshell.statusProgress.connecting = Connecting to the server bbb.mainshell.statusProgress.loading = Loading {0} modules bbb.mainshell.statusProgress.cannotConnectServer = Sorry, we cannot connect to the server. -bbb.mainshell.copyrightLabel2 = (c) 2015 BigBlueButton Inc. [build {0}] - For more information visit <a href='event:http://www.bigbluebutton.org/' target='_blank'><u>http://www.bigbluebutton.org</u></a> +bbb.mainshell.copyrightLabel2 = (c) 2016 <a href='event:http://www.bigbluebutton.org/' target='_blank'><u>BigBlueButton Inc.</u></a> (build {0}) bbb.mainshell.logBtn.toolTip = Open Log Window bbb.mainshell.meetingNotFound = Meeting Not Found bbb.mainshell.invalidAuthToken = Invalid Authentication Token diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml old mode 100644 new mode 100755 index e1485ce279265954aeb8e6bfbbcf35557617e6ae..9085ba45d402233daa0b47463d0843d2239e89c1 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml @@ -82,7 +82,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. <mx:Label id="lblName" text="{data.name}" visible="true" color="gray" textAlign="left" left="0"/> <mx:Text id="lblTime" htmlText="{data.time}" textAlign="right" visible="true" - color="gray" right="0" /> + color="gray" right="4" /> </mx:Canvas> <mx:Text id="txtMessage" htmlText="{data.text}" link="onLinkClick(event)" color="{data.senderColor}" keyDown="onKeyDown(event)" paddingLeft="5" width="100%" selectable="true"/> diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml index c7319080258786079db0243e1389f2ecf2dee8f4..8941392a1b78eb676576ed326b76caeedfe241b8 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml @@ -310,7 +310,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>. private function playSound():void { if (chatNoiseEnabled){ - noticeSound.play(); + noticeSound.play(0, 0, new SoundTransform(0.3)); } }