BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5762 from riadvice/chrome-hardware-acceleration

Browse Source 
Update hardware acceleration warning style and help page
This commit is contained in:
Fred Dixon 2018-06-27 16:36:31 -04:00 committed by GitHub
commit 6c82c18904
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bigbluebutton-client/branding/default/style/css/V2Theme.css
View File

@ -1442,7 +1442,7 @@ mx|Panel {
textDecoration : underline;
}
.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle, .breakoutTipBox, .pollingTipBox {
.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle, .breakoutTipBox, .pollingTipBox, .screenshareSelectHintBoxStyle {
backgroundColor : #CDD4DB;
horizontalAlign : center;
paddingTop : 8;
@ -1604,15 +1604,6 @@ mx|ScrollBar {
//------------------------------
*/
.screenshareSelectHintBoxStyle {
horizontalAlign : center;
paddingTop : 7;
paddingBottom : 7;
paddingLeft : 5;
paddingRight : 5;
verticalAlign : middle;
}
.screenshareTypeTitle {
color : #363B43;
fontSize : 14;

24
bigbluebutton-client/resources/prod/help/webrtc-screenshare-help.html
View File

File diff suppressed because one or more lines are too long

16
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareSelectionWindow.mxml
View File

@ -122,6 +122,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
text="{ResourceUtil.getInstance().getString('bbb.screenshareSelection.title')}"
styleName="titleWindowStyle"
maxWidth="{this.width - 40}" />
<mx:Box id="webrtcProblemHintBox"
width="100%"
verticalScrollPolicy="off" horizontalScrollPolicy="off"
visible="false" includeInLayout="false"
styleName="screenshareSelectHintBoxStyle">
<mx:Text id="webrtcProblemHintLbl" width="100%" textAlign="center" link="onHelpLinkClicked(event)"/>
</mx:Box>
<mx:HBox width="100%" height="100%" styleName="screenshareSelectionsStyle" verticalAlign="middle" horizontalAlign="center">
<mx:VBox id="vboxWebrtc" horizontalAlign="center" verticalAlign="middle" paddingLeft="20" paddingRight="20">
<mx:Button id="btnWebrtc" buttonMode="true" styleName="btnScreenshareSelectStyle" width="140" height="140"
@ -142,13 +151,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
styleName="screenshareTypeTitle" />
</mx:VBox>
</mx:HBox>
<mx:Box id="webrtcProblemHintBox"
width="100%"
verticalScrollPolicy="off" horizontalScrollPolicy="off"
visible="false" includeInLayout="false"
styleName="screenshareSelectHintBoxStyle">
<mx:Text id="webrtcProblemHintLbl" width="100%" textAlign="center" styleName="screenshareSelectHintTextStyle" link="onHelpLinkClicked(event)"/>
</mx:Box>
</mx:VBox>
<mx:Button id="closeButton" click="onCancelClicked()" styleName="titleWindowCloseButton"
toolTip="{ResourceUtil.getInstance().getString('bbb.screenshareSelection.cancel')}"

1
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ToolbarButton.mxml
View File

@ -42,7 +42,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
import org.bigbluebutton.main.events.ShortcutEvent;
import org.bigbluebutton.main.views.MainToolbar;
import org.bigbluebutton.modules.screenshare.events.RequestToStartSharing;
import org.bigbluebutton.modules.screenshare.events.RequestToStopSharing;
import org.bigbluebutton.modules.screenshare.events.ScreenshareSelectionWindowEvent;
import org.bigbluebutton.modules.screenshare.events.ShareWindowEvent;