Skip to content

[Master] Release/2019-05-29 #3022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 30, 2019
Merged

[Master] Release/2019-05-29 #3022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2fb6d67
Merge pull request #3004 from LLK/release/05-23-2019
benjiwheeler May 23, 2019
308af1e
Merge pull request #3009 from LLK/hotfix/update-scratch-desktop
benjiwheeler May 23, 2019
6d8441d
fix firefox instructions height overflow issue
benjiwheeler May 25, 2019
4f77910
set min-height of remix credit to max-content
benjiwheeler May 25, 2019
0524b21
Merge pull request #3012 from benjiwheeler/fix-firefox-instructions
benjiwheeler May 29, 2019
c16cb25
Merge pull request #3014 from benjiwheeler/fix-safari-remix-credit
benjiwheeler May 29, 2019
e788d2d
Update scratch-gui
colbygk May 29, 2019
fc1e8e5
Merge pull request #3019 from colbygk/release/2019-05-29
colbygk May 29, 2019
687336d
Merge pull request #3020 from LLK/develop
colbygk May 29, 2019
b2a22c6
update gui version with 4 reversions
benjiwheeler May 30, 2019
d32dc86
updated to correct scratch-gui release
benjiwheeler May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.20190530174801",
"react-telephone-input": "4.3.4",
"redux": "3.5.2",
"redux-thunk": "2.0.1",
Expand Down
11 changes: 11 additions & 0 deletions src/views/preview/preview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down