Skip to content
This repository was archived by the owner on May 18, 2026. It is now read-only.

Scratch 3.0をマージしました#28

Merged
takaokouji merged 107 commits into
smalruby:developfrom
t-kazu:merge/scratch-gui
Aug 10, 2018
Merged

Scratch 3.0をマージしました#28
takaokouji merged 107 commits into
smalruby:developfrom
t-kazu:merge/scratch-gui

Conversation

@t-kazu
Copy link
Copy Markdown

@t-kazu t-kazu commented Aug 10, 2018

変更点が結構あったのでマージしました。
npm install すると、以下の差分が出ますが、プログラム的には問題無いため無視して下さい

diff --git a/package.json b/package.json
index efbecbbd..70c618bc 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "lodash.pick": "4.4.0",
     "minilog": "3.1.0",
     "mkdirp": "^0.5.1",
-    "postcss-import": "^11.0.0",
     "postcss-import": "^12.0.0",
     "postcss-loader": "^3.0.0",
     "postcss-simple-vars": "^4.0.0",

hyperobject and others added 30 commits July 19, 2018 09:22
Preview FAQ -> FAQ

Make welcome image in modal match the homepage banners

Preview -> Beta (:D)
…xclude-rtl

[MASTER] Temporarily exclude RTL languages from the menu
…contextmenu-2.9.3

Update react-contextmenu to the latest version 🚀
…driver-2.41.0

Update chromedriver to the latest version 🚀
This bled into normalizing z-indices for the action menus in the z-index.css. The tooltip id was not unique between action menus for ‘suprise’ and ‘paint’, so `mainTooltipId` was used as a prefix to make them unique.
Rename buttons first and last instead of left/right. Add RTL styles.
Move the margin to the other side.
Checked with Moran, and the sound waveform along with play button should stay LTR. So added a `row-reverse` that only applies when `dir=“rtl”`
Correct margins for tabs, tab icons.
Changed left/right to first/last. Added direction aware styles.
Expected change for a className that uses classNames function now, but didn’t before.
Bring in hotfix to beta stuff to develop
Move listeners up to vmListenerHOC, and add listeners for new turbo mode events from scratch-vm#1413
fsih and others added 25 commits August 9, 2018 11:00
…s-import-12.0.0

Update postcss-import to the latest version 🚀
…h-blocks-0.1.0-prerelease.1533592374

Update scratch-blocks to the latest version 🚀
…loader-0.22.1

chore(package): update style-loader to version 0.22.1
…h-paint-0.2.0-prerelease.20180809150043

Update scratch-paint to the latest version 🚀
…s-loader-3.0.0

Update postcss-loader to the latest version 🚀
…develop_fast

Revert "build dist, even when run without NODE_ENV=production"
…h-blocks-0.1.0-prerelease.1533835159

Update scratch-blocks to the latest version 🚀
…h-paint-0.2.0-prerelease.20180809185222

Update scratch-paint to the latest version 🚀
…wedo-steps

Add device connection steps for Lego WeDo 2.0
* Don't show intro modal if hideIntro passed to PreviewModal

* Add hideIntro prop to GUI

* Move intro modal hiding logic into its own function
@t-kazu t-kazu changed the title Merge/scratch gui Scratch3.0をマージしました Aug 10, 2018
@t-kazu t-kazu changed the title Scratch3.0をマージしました Scratch 3.0をマージしました Aug 10, 2018
@takaokouji takaokouji merged commit e98c2cf into smalruby:develop Aug 10, 2018
@t-kazu t-kazu deleted the merge/scratch-gui branch August 10, 2018 06:48
takaokouji added a commit that referenced this pull request Jan 18, 2026
Update operators.test.js to match fix for issue #28.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.