Merge pull request #3020 from LLK/develop

[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

View file

@ -101,7 +101,7 @@
"react-responsive": "3.0.0",
"react-slick": "0.16.0",
"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",
"redux": "3.5.2",
"redux-thunk": "2.0.1",

View file

@ -425,6 +425,11 @@ $stage-width: 480px;
flex-wrap: nowrap;
align-items: center;
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} {
flex-direction: row;
@ -444,6 +449,12 @@ $stage-width: 480px;
height: 100%;
flex-direction: column;
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 {