scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 07:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2624 from apple502j/patch-7

Browse source 
Raise z-index of navbar
This commit is contained in:
Benjamin Wheeler 2019-01-16 11:17:00 -05:00 committed by GitHub
commit db6e0ed88f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/views/preview/presentation.jsx
View file

@ -292,7 +292,12 @@ const PreviewPresentation = ({
</MediaQuery> </MediaQuery>
</FlexRow> </FlexRow>
<FlexRow className="preview-row"> <FlexRow className="preview-row">
<div className="guiPlayer"> <div
className={classNames(
'guiPlayer',
{fullscreen: isFullScreen}
)}
>
{showCloudDataAlert && ( {showCloudDataAlert && (
<FlexRow className="project-info-alert"> <FlexRow className="project-info-alert">
<FormattedMessage id="project.cloudDataAlert" /> <FormattedMessage id="project.cloudDataAlert" />

5
src/views/preview/preview.scss
View file

@ -347,6 +347,7 @@ $stage-width: 480px;
display: inline-block; display: inline-block;
position: relative; position: relative;
width: $player-width; width: $player-width;
z-index: 1;
$alert-bg: rgba(255, 255, 255, .85); $alert-bg: rgba(255, 255, 255, .85);
.project-info-alert { .project-info-alert {
@ -360,6 +361,10 @@ $stage-width: 480px;
font-size: .95rem; font-size: .95rem;
} }
&.fullscreen {
z-index: 200;
}
@media #{$small} { @media #{$small} {
width: 100%; width: 100%;
} }

2
src/views/preview/project-view.jsx
View file

@ -641,7 +641,7 @@ class Preview extends React.Component {
extensions={this.state.extensions} extensions={this.state.extensions}
faved={this.state.clientFaved} faved={this.state.clientFaved}
favoriteCount={this.state.favoriteCount} favoriteCount={this.state.favoriteCount}
isFullScreen={this.state.isFullScreen} isFullScreen={this.props.fullScreen}
isLoggedIn={this.props.isLoggedIn} isLoggedIn={this.props.isLoggedIn}
isNewScratcher={this.props.isNewScratcher} isNewScratcher={this.props.isNewScratcher}
isProjectLoaded={this.state.isProjectLoaded} isProjectLoaded={this.state.isProjectLoaded}