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 #3020 from LLK/develop

Browse source 
[RELEASE] 2019-05-29
This commit is contained in:
Colby Gutierrez-Kraybill 2019-05-29 17:29:01 -04:00 committed by GitHub
commit 687336dee8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -101,7 +101,7 @@
"react-responsive": "3.0.0", "react-responsive": "3.0.0",
"react-slick": "0.16.0", "react-slick": "0.16.0",
"react-string-replace": "0.4.1", "react-string-replace": "0.4.1",
"scratch-gui": "0.1.0-prerelease.20190522232752", "scratch-gui": "0.1.0-prerelease.20190529191233",
"react-telephone-input": "4.3.4", "react-telephone-input": "4.3.4",
"redux": "3.5.2", "redux": "3.5.2",
"redux-thunk": "2.0.1", "redux-thunk": "2.0.1",

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

@ -425,6 +425,11 @@ $stage-width: 480px;
flex-wrap: nowrap; flex-wrap: nowrap;
align-items: center; align-items: center;
justify-content: flex-start; justify-content: flex-start;
/*
Necessary to force Mac Safari to apply padding to the height of the
child elements. See https://stackoverflow.com/a/52273082/2308190
*/
min-height: max-content;
@media #{$medium-and-smaller} { @media #{$medium-and-smaller} {
flex-direction: row; flex-direction: row;
@ -444,6 +449,12 @@ $stage-width: 480px;
height: 100%; height: 100%;
flex-direction: column; flex-direction: column;
align-items: flex-start; align-items: flex-start;
/*
necessary to fix flexbox sizing issue that caused instructions
to flow over the top and bottom of the project notes section.
see https://stackoverflow.com/a/36247448
*/
min-height: 0;
} }
.project-textlabel { .project-textlabel {