From 4fdc77f2a5b89e8ada3c47c3943a0f68cf84c2d4 Mon Sep 17 00:00:00 2001 From: Ghazi Triki Date: Sat, 9 Jun 2018 00:07:37 +0100 Subject: [PATCH] Make sytle consistent for popups and buttons. --- .../branding/default/style/css/V2Theme.css | 56 +++++++++--------- .../locale/en_US/bbbResources.properties | 6 +- .../main/views/InactivityWarningWindow.mxml | 14 +++-- .../main/views/LogoutWindow.mxml | 22 ++++--- .../main/views/ReconnectionPopup.mxml | 57 +++++++++++-------- .../main/views/RecordWindow.mxml | 2 +- .../modules/caption/views/TextTab.as | 1 + .../layout/views/CustomLayoutNameWindow.mxml | 22 +++++-- .../polling/views/PollChoicesModal.mxml | 5 ++ .../views/SharedNotesNameWindow.mxml | 40 +++++++------ .../users/views/BreakoutRoomSettings.mxml | 2 +- 11 files changed, 139 insertions(+), 88 deletions(-) diff --git a/bigbluebutton-client/branding/default/style/css/V2Theme.css b/bigbluebutton-client/branding/default/style/css/V2Theme.css index 69a1af9338..2eca9318c3 100755 --- a/bigbluebutton-client/branding/default/style/css/V2Theme.css +++ b/bigbluebutton-client/branding/default/style/css/V2Theme.css @@ -378,6 +378,7 @@ mx|Alert { borderColor : #FFFFFF; backgroundColor : #FFFFFF; borderAlpha : 1; + backgroundAlpha : 1; dropShadowEnabled : false; color : #6C6C6C; titleStyleName : "alertTitleStyle"; @@ -490,13 +491,6 @@ users|RoomActionsRenderer { paddingBottom : 20; } -.breakoutTipBox { - backgroundColor : #CDD4DB; - paddingLeft : 10; - paddingRight : 10; - horizontalAlign : center; -} - .breakoutRoomsBox { paddingTop : 12; horizontalAlign : center; @@ -674,19 +668,19 @@ chat|ChatMessageRenderer { } .unreadMessagesBar { - backgroundColor : #1070D7; - cornerRadius : 4; - borderStyle : none; - color : #FFFFFF; - fontSize : 13; + backgroundColor : #1070D7; + cornerRadius : 4; + borderStyle : none; + color : #FFFFFF; + fontSize : 13; } .unreadMessagesBarText { - textAlign : center; + textAlign : center; paddingBottom : 6; - paddingTop : 6; - paddingLeft : 12; - paddingRight : 12; + paddingTop : 6; + paddingLeft : 12; + paddingRight : 12; } /* @@ -863,6 +857,17 @@ views|BBBSettings { icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deny"); } +/* +//------------------------------ +// Item InactivityWarningWindow +//------------------------------ +*/ + +views|InactivityWarningWindow { + fontSize : 14; + headerHeight : 0; +} + /* //------------------------------ // Item renderers @@ -934,7 +939,7 @@ views|LoadingBar { */ views|LogoutWindow, views|LoggedOutWindow { - headerHeight : 32; + headerHeight : 0; horizontalAlign : center; paddingBottom : 8; paddingLeft : 8; @@ -1167,16 +1172,10 @@ flexlib|MDIWindow { //------------------------------ */ -.micSettingsWindowHearFromHeadsetLabelStyle, .micSettingsWindowSpeakIntoMicLabelStyle, .permissionSettingsTextStyle, .inactivityWarningTextStyle { +.micSettingsWindowHearFromHeadsetLabelStyle, .micSettingsWindowSpeakIntoMicLabelStyle, .permissionSettingsTextStyle { fontSize : 14; } -.inactivityWarningWindowCancelButtonStyle { - color : #CDD4DB; - textRollOverColor : #CDD4DB; - textSelectedColor : #CDD4DB; -} - /* //------------------------------ // Network Stats @@ -1435,7 +1434,7 @@ mx|Panel { textDecoration : underline; } -.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle { +.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle, .breakoutTipBox, .pollingTipBox { backgroundColor : #CDD4DB; horizontalAlign : center; paddingTop : 8; @@ -1570,6 +1569,11 @@ views|ReconnectionPopup { iconRefresh : Embed(source="assets/swf/refreshing.swf"); } +.reconnectionTitleWindowStyle { + textAlign : center; + fontSize : 16; +} + /* //------------------------------ // Scrollbar @@ -1794,7 +1798,7 @@ toast|ToastMessageRenderer { iconSuccess : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Notification_Success"); iconError : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Notification_Error"); iconWarning : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Notification_Warning"); - + iconAudio : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Notification_Audio"); iconDesktop : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Notification_Desktop"); } diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index c68bcc073f..bfe3069687 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -465,6 +465,7 @@ bbb.toolbar.sharednotes.toolTip = Open Shared Notes bbb.toolbar.video.toolTip.start = Share Your Webcam bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam bbb.layout.addButton.label = Add +bbb.layout.cancelButton.label = Cancel bbb.layout.addButton.toolTip = Add the custom layout to the list bbb.layout.overwriteLayoutName.title = Overwrite layout bbb.layout.overwriteLayoutName.text = Name already in use. Do you want to overwrite? @@ -475,6 +476,7 @@ bbb.layout.saveButton.toolTip = Save layouts to a file bbb.layout.lockButton.toolTip = Lock layout bbb.layout.combo.prompt = Apply a layout bbb.layout.combo.custom = * Custom layout +bbb.layout.combo.name = Layout name bbb.layout.combo.customName = Custom layout bbb.layout.combo.remote = Remote bbb.layout.window.name = Layout name @@ -556,7 +558,7 @@ bbb.notes.saveBtn.toolTip = Save Note bbb.sharedNotes.title = Shared notes bbb.sharedNotes.quickLink.label = Shared notes Window bbb.sharedNotes.createNoteWindow.label = Note name -bbb.sharedNotes.createNoteWindow.close.tooltip = Close +bbb.sharedNotes.createNoteWindow.cancel = cancel bbb.sharedNotes.createNoteWindow.close.accessibilityName = Close create new note window bbb.sharedNotes.typing.single = {0} is typing... bbb.sharedNotes.typing.double = {0} and {1} are typing... @@ -567,6 +569,7 @@ bbb.sharedNotes.save.ioerror = Notes were not saved. Try saving again. bbb.sharedNotes.save.htmlLabel = Formatted text (.html) bbb.sharedNotes.save.txtLabel = Plain text (.txt) bbb.sharedNotes.new.label = Create +bbb.sharedNotes.new.name = Note name bbb.sharedNotes.new.toolTip = Create additional note bbb.sharedNotes.limit.label = Notes limit reached bbb.sharedNotes.clear.label = Clear this note @@ -783,6 +786,7 @@ bbb.polling.pollModal.hint = Leave this window open to allow others to respond t bbb.polling.pollModal.voteGrid.userHeading = Users bbb.polling.pollModal.voteGrid.answerHeading = Responses bbb.polling.customChoices.title = Enter Polling Choices +bbb.polling.customChoices.hint = Enter the polling choices below bbb.polling.respondersLabel.novotes = Waiting for responses bbb.polling.respondersLabel.text = {0} Users Responded bbb.polling.respondersLabel.finished = Done diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml index 00fb9445e9..c1c4187bc5 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml @@ -20,16 +20,15 @@ with BigBlueButton; if not, see . --> - @@ -97,7 +96,12 @@ with BigBlueButton; if not, see . ]]> + + + - + - \ No newline at end of file + \ No newline at end of file diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml index e0086ceef3..5530b6ccf9 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml @@ -22,13 +22,14 @@ with BigBlueButton; if not, see . + layout="vertical" + minWidth="400"> . private function onCreationComplete():void { cancelButton.setFocus(); endMeetingButton.visible = endMeetingButton.includeInLayout = UsersUtil.amIModerator() && !UsersUtil.isBreakout(); + if (endMeetingButton.visible) { + endMeetingButton.styleName = "mainActionButton"; + } else { + confimButton.styleName = "mainActionButton"; + } } private function endMeetingClickHandler():void { @@ -74,14 +80,16 @@ with BigBlueButton; if not, see . ]]> - + + - - - + + + - diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/ReconnectionPopup.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/ReconnectionPopup.mxml index 94f7ddc242..d8ff126788 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/ReconnectionPopup.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/ReconnectionPopup.mxml @@ -20,16 +20,17 @@ with BigBlueButton; if not, see . --> - - + + . } ]]> - - - - - - - - + + + + + + + + + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml index b5ec662f8e..ac8089460c 100644 --- a/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml @@ -98,7 +98,7 @@ - + . layout="absolute" showCloseButton="false" creationComplete="onCreationComplete()" - width="280"> + minWidth="320"> @@ -91,11 +91,21 @@ with BigBlueButton; if not, see . - - + + + + + + + + + + + . text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.title')}" styleName="titleWindowStyle" /> + + + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml index 432a3b1bb3..91c8ced23a 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml @@ -23,14 +23,15 @@ with BigBlueButton; if not, see . + keyUp="keyUpHandler(event)"> . - - + + + + + + + + + + diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml index b4f530320b..a495d7d836 100755 --- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml +++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml @@ -323,7 +323,7 @@ with BigBlueButton; if not, see . - +