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

Merge pull request #4085 from LLK/release/2020-06-11

Browse source 
[Master] Release/2020-06-11
This commit is contained in:
DD Liu 2020-06-11 14:42:54 -04:00 committed by GitHub
commit d88105f5e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
package-lock.json generated
View file

@ -15721,15 +15721,15 @@
} }
}, },
"scratch-gui": { "scratch-gui": {
"version": "0.1.0-prerelease.20200603203751", "version": "0.1.0-prerelease.20200610225210",
"resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200603203751.tgz", "resolved": "https://registry.npmjs.org/scratch-gui/-/scratch-gui-0.1.0-prerelease.20200610225210.tgz",
"integrity": "sha512-LbCBQZsrNlcNLUHA4gwMLjLIV3tiIwE4BWykV87qXrPVqzVkdO/l9spX+GdTHtjrutg6RB5mk6HbnU8WJbmBSw==", "integrity": "sha512-ZhaJT9tV/cA0+IbSJc0vuj3oLUL2SmHgagtz/tVGIdE1dL9zKfAcFIgTVCm1QVBLJLjvgk/hPDol4c9Li06ISA==",
"dev": true "dev": true
}, },
"scratch-l10n": { "scratch-l10n": {
"version": "3.9.20200603151351", "version": "3.9.20200609200912",
"resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200603151351.tgz", "resolved": "https://registry.npmjs.org/scratch-l10n/-/scratch-l10n-3.9.20200609200912.tgz",
"integrity": "sha512-gepBvXyy8ki8gbVXSD7/bYhat0UBnmz3EOJs14OE/pJVESC15QCDHjYHuO0pi5VO193XkgzJPONxHLsfvXCT1Q==", "integrity": "sha512-i4PPKIT6erMgNizTNHoAx4ziC25FVUBUQkR29ocj0l+11hz8OtIJLsOfVjOVpegMMXPAtwLpz5ZQqyzL/eeLvg==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/cli": "^7.1.2", "@babel/cli": "^7.1.2",

2
package.json
View file

@ -128,7 +128,7 @@
"redux-mock-store": "^1.2.3", "redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20200603203751", "scratch-gui": "0.1.0-prerelease.20200610225210",
"scratch-l10n": "latest", "scratch-l10n": "latest",
"selenium-webdriver": "3.6.0", "selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0", "slick-carousel": "1.6.0",

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

@ -38,9 +38,11 @@ $stage-width: 480px;
.inner { .inner {
margin: 0 auto; margin: 0 auto;
overflow: auto;
@media #{$medium-and-smaller} { @media #{$medium-and-smaller} {
max-width: 90%; // subtract page padding
max-width: calc(100% - 1rem);
} }
@media #{$intermediate} { @media #{$intermediate} {
@ -146,7 +148,8 @@ $stage-width: 480px;
flex-grow: 1; flex-grow: 1;
@media #{$medium-and-smaller} { @media #{$medium-and-smaller} {
min-width: calc(100% - 2rem); // subtract margin and border
min-width: calc(100% - 2rem - 4px);
} }
} }
@ -362,7 +365,7 @@ $stage-width: 480px;
.guiPlayer { .guiPlayer {
display: inline-block; display: inline-block;
position: relative; position: relative;
width: $player-width; max-width: $player-width;
z-index: 1; z-index: 1;
$alert-bg: rgba(255, 255, 255, .85); $alert-bg: rgba(255, 255, 255, .85);
@ -421,7 +424,7 @@ $stage-width: 480px;
border-radius: 8px; border-radius: 8px;
background-color: $ui-blue-10percent; background-color: $ui-blue-10percent;
padding: .75rem; padding: .75rem;
width: calc(100% - 1.5rem); width: calc(100% - 1.5rem - 2px);
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
@ -476,6 +479,7 @@ $stage-width: 480px;
line-height: 1.5rem; line-height: 1.5rem;
flex: 1; flex: 1;
overflow-wrap: break-word; overflow-wrap: break-word;
word-break: break-word;
} }
.project-description:last-of-type { .project-description:last-of-type {