Removed "style" suffix from style names and added minor imporvements.

bigbluebutton · Dec 8, 2016 · 500d48d · 500d48d
1 parent 55c1e11
commit 500d48d
Show file tree

Hide file tree

Showing 39 changed files with 406 additions and 386 deletions.
diff --git a/clients/flash/air-client/src/Default.css b/clients/flash/air-client/src/Default.css
@@ -1,74 +1,88 @@
-/* CSS file */
 @namespace s "library://ns.adobe.com/flex/spark";
 @namespace mx "library://ns.adobe.com/flex/mx";
 @namespace libChat "org.bigbluebutton.lib.chat.views.*";
+@namespace main "org.bigbluebutton.air.main.views.*";
 
 @font-face { 
-	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	bold; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Semibold.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	bold;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	italic; 
-	fontWeight:	normal; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Italic.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	italic;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf"); 
-	fontFamily:	SourceSansPro; 
-	fontStyle:	normal; 
-	fontWeight:	heavy; 
+	src:		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Bold.ttf");
+	fontFamily:	SourceSansPro;
+	fontStyle:	normal;
+	fontWeight:	heavy;
 	embedAsCFF:	true;
 }
 
 @font-face { 
-	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf"); 
-	fontFamily:	SourceSansProMX; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/SourceSansPro/SourceSansPro-Regular.ttf");
+	fontFamily:	SourceSansProMX;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	false;
 }
 
 @font-face {
-	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
-	fontFamily:	BBBIcons; 
-	fontStyle:	normal; 
-	fontWeight:	normal; 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	fontFamily:	BBBIcons;
+	fontStyle:	normal;
+	fontWeight:	normal;
 	embedAsCFF:	true;
 }
 
 @font-face {
-	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf"); 
-	fontFamily:	BBBIcons; 
-	fontStyle:	normal; 
-	fontWeight:	bold; 
+	src: 		url("../../shared/assets/fonts/BBBIcons/bbb-icons.ttf");
+	fontFamily:	BBBIcons;
+	font:	normal;
+	fontWeight:	bold;
 	embedAsCFF:	true;
 }
 
+/* Shared s */
+
 global
 {
 	font-family:	SourceSansPro;
 }
 
+/* Classes s */
+
 s|Application
 {
 	backgroundColor: PropertyReference("bbbBlack");	
 }
 
+/* Loading screen */
+
+main|LoadingScreen {
+	color           : PropertyReference("bbbWhite");	
+	backgroundColor : PropertyReference("bbbBlack");
+	fontSize        : 34;
+	textAlign       : center;
+}
+
+
 s|TextInput
 {
 	fontFamily:		SourceSansPro;
@@ -85,51 +99,61 @@ libChat|NewMessagesIndicator
 	skinClass:			ClassReference("org.bigbluebutton.lib.chat.views.skins.NewMessagesIndicatorSkin");
 }
 
-.mainViewStyle
+.mainView
 {
 	backgroundColor:	PropertyReference("bbbBlack");	
 }
 
-.subViewContentStyle
+.subViewContent
 {
 	backgroundColor:	PropertyReference("bbbWhite");
 }
 
-.titleLabelStyle
+.titleLabel
 {
 	color: 		PropertyReference("bbbWhite");
 	fontSize:	24;
+	left: 90;
+	right: 90;
 }
 
-.topButtonStyle
+.topButton
 {
-	iconSize				: 30;
-	iconColor				: PropertyReference("bbbWhite");
-	iconFont				: BBBIcons;
-	skinClass:			ClassReference("org.bigbluebutton.lib.main.views.skins.TopButtonSkin");
+	iconSize  : 30;
+	iconColor : PropertyReference("bbbWhite");
+	iconFont  : BBBIcons;
+	skinClass : ClassReference("org.bigbluebutton.lib.main.views.skins.TopButtonSkin");
+}
+
+.topLeftButton {
+	left: 30;
+}
+
+.topRightButton {
+	right: 30;
 }
 
-.participantsButtonStyle
+.participantsButton
 {
 	icon: "\ue906";
 }
 
-.settingsButtonStyle
+.settingsButton
 {
 	icon: "\ue902";
 }
 
-.presentationButtonStyle
+.presentationButton
 {
 	icon: "\ue90c";
 }
 
-.backButtonStyle
+.backButton
 {
 	icon: "\ue90e";
 }
 
-.menuButtonStyle
+.menuButton
 {
 	backgroundColor         : PropertyReference("bbbBlue");
 	selectedBackgroundColor : PropertyReference("bbbGrey");
@@ -141,46 +165,46 @@ libChat|NewMessagesIndicator
 	skinClass               : ClassReference("org.bigbluebutton.lib.main.views.skins.MenuButtonSkin");
 }
 
-.micOnButtonStyle
+.micOnButton
 {
 	icon : "\ue91b";
 }
 
-.micOffButtonStyle
+.micOffButton
 {
 	icon : "\ue91c";
 }
 
-.camOnButtonStyle
+.camOnButton
 {
 	icon : "\ue921";
 }
 
-.camOffButtonStyle
+.camOffButton
 {
 	icon : "\ue905";
 }
 
-.handStatusButtonStyle
+.handStatusButton
 {
 	icon : "\ue910";
 }
 
-.participantIconStyle
+.participantIcon
 {
 	circleColor : PropertyReference("bbbBlack");
 	width  : 32;
 	height : 32;
 	fontSize : 12;
 }
 
-.chatMessageStyle
+.chatMessage
 {
 	nameFontSize: 		16;
 	timeFontSize:		16;
 }
 
-.sendButtonStyle
+.sendButton
 {
 	color:		PropertyReference("bbbGrey");
 	fontFamily:	BBBIcons;
@@ -191,29 +215,29 @@ libChat|NewMessagesIndicator
 	skinClass:	ClassReference("org.bigbluebutton.lib.chat.views.skins.SendButtonSkin");
 }
 
-.messageInputStyle
+.messageInput
 {
 	fontFamily: SourceSansProMX;
 	contentBackgroundAlpha: 0;
 	skinClass:	ClassReference("org.bigbluebutton.air.chat.views.skins.MessageInputSkin");
 }
 
-.contentStyle
+.content
 {
 	fontSize:	14;
 	color:		PropertyReference("bbbBlack");
 }
 
 /*
-.panelStyle
+.panel
 {
 	backgroundColor:	PropertyReference("bbbWhite");
 	backgroundAlpha:	1;
 	padding:			6;
 	skinClass:			ClassReference("org.bigbluebutton.web.common.skins.PanelSkin");
 }
 
-.panelTitleStyle
+.panelTitle
 {
 	fontSize:		18;
 	fontWeight:		bold;
@@ -223,7 +247,7 @@ libChat|NewMessagesIndicator
 
 */
 
-.iconStyle
+.icon
 {
 	fontSize:	20;
 	fontFamily:	BBBIcons;

diff --git a/clients/flash/air-client/src/Main.mxml b/clients/flash/air-client/src/Main.mxml
@@ -4,8 +4,9 @@
 			   applicationComplete="applicationCompleteHandler(event)"
 			   preinitialize="preinitializeHandler(event)"
 			   runtimeDPIProvider="CustomRuntimeDPIProvider"
-			   styleName="mainshellStyle"
+			   styleName="mainshell"
 			   xmlns:main="org.bigbluebutton.air.main.views.*">
+	<fx:Style source="../../shared/assets/css/common.css" />
 	<fx:Style source="Default.css" />
 
 	<fx:Declarations>
@@ -92,17 +93,14 @@
 	<main:LoadingScreen width="100%"
 						height="100%" />
 
-	<s:Group width="100%"
-			 height="100%"
-			 id="mainshell"
-			 visible="false">
-		<s:layout>
-			<s:VerticalLayout gap="0"
-							  horizontalAlign="center" />
-		</s:layout>
-
+	<s:VGroup width="100%"
+			  height="100%"
+			  id="mainshell"
+			  visible="false"
+			  gap="0"
+			  horizontalAlign="center">
 		<main:PagesNavigatorView id="pagesNavigatorView"
 								 width="100%"
 								 height="100%" />
-	</s:Group>
+	</s:VGroup>
 </s:Application>
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/ChatRoomView.as
@@ -8,7 +8,7 @@ package org.bigbluebutton.air.chat.views {
 	public class ChatRoomView extends NoTabView {
 		public function ChatRoomView() {
 			super();
-			styleName = "mainViewStyle";
+			styleName = "mainView";
 
 			var l:VerticalLayout = new VerticalLayout();
 			l.gap = 0;
@@ -21,7 +21,7 @@ package org.bigbluebutton.air.chat.views {
 			addElement(topToolbar);
 
 			var skinnableWrapper:SkinnableContainer = new SkinnableContainer();
-			skinnableWrapper.styleName = "subViewContentStyle";
+			skinnableWrapper.styleName = "subViewContent";
 			skinnableWrapper.percentWidth = 100;
 			skinnableWrapper.percentHeight = 100;
 

diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as b/clients/flash/air-client/src/org/bigbluebutton/air/chat/views/TopToolbarChat.as
@@ -5,8 +5,8 @@ package org.bigbluebutton.air.chat.views {
 		public function TopToolbarChat() {
 			super();
 
-			leftButton.styleName = "backButtonStyle topButtonStyle";
-			rightButton.styleName = "presentationButtonStyle topButtonStyle";
+			leftButton.styleName = "backButton topButton";
+			rightButton.styleName = "presentationButton topButton";
 		}
 	}
 }
diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/NoTabView.as
@@ -1,6 +1,5 @@
 package org.bigbluebutton.air.common.views {
 
-	import flash.events.StageOrientationEvent;
 	import spark.components.View;
 
 	public class NoTabView extends View {

diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml b/clients/flash/air-client/src/org/bigbluebutton/air/common/views/ParticipantIcon.mxml
@@ -1,7 +1,7 @@
 <s:Group xmlns:fx="http://ns.adobe.com/mxml/2009"
 		 xmlns:s="library://ns.adobe.com/flex/spark"
 		 xmlns:mx="library://ns.adobe.com/flex/mx"
-		 styleName="participantIconStyle">
+		 styleName="participantIcon">
 
 	<s:Label id="firstLetters"
 			 styleName="nameIconText"