Scratch3.0 をマージしました

package.json

@@ -29,8 +29,8 @@
     "react-dom": "^16.0.0"
   },
   "devDependencies": {
-    "arraybuffer-loader": "^1.0.3",
-    "autoprefixer": "^8.1.0",
+    "arraybuffer-loader": "^1.0.6",
+    "autoprefixer": "^9.0.1",
     "babel-core": "^6.23.1",
     "babel-eslint": "^8.0.1",
     "babel-loader": "^7.1.0",
@@ -40,12 +40,12 @@
     "babel-preset-env": "^1.6.1",
     "babel-preset-react": "^6.22.0",
     "base64-loader": "1.0.0",
-    "bowser": "1.9.3",
+    "bowser": "1.9.4",
     "chromedriver": "2.40.0",
     "classnames": "2.2.6",
     "copy-webpack-plugin": "^4.5.1",
     "core-js": "2.5.7",
-    "css-loader": "^0.28.11",
+    "css-loader": "^1.0.0",
     "enzyme": "^3.1.0",
     "enzyme-adapter-react-16": "1.1.1",
     "es6-object-assign": "1.1.0",
@@ -59,6 +59,7 @@
     "gh-pages": "github:rschamp/gh-pages#publish-branch-to-subfolder",
     "html-webpack-plugin": "^3.2.0",
     "immutable": "3.8.2",
+    "intl": "1.2.5",
     "jest": "^21.0.0",
     "keymirror": "0.1.1",
     "lodash.bindall": "4.4.0",
@@ -82,27 +83,27 @@
     "react-draggable": "3.0.5",
     "react-ga": "2.5.3",
     "react-intl": "2.4.0",
-    "react-modal": "3.4.4",
+    "react-modal": "3.5.1",
     "react-popover": "0.5.7",
     "react-redux": "5.0.7",
-    "react-responsive": "4.1.0",
+    "react-responsive": "5.0.0",
     "react-style-proptype": "3.2.1",
     "react-tabs": "2.2.2",
     "react-test-renderer": "16.2.0",
     "react-tooltip": "3.6.1",
-    "react-virtualized": "9.20.0",
+    "react-virtualized": "9.20.1",
     "redux": "3.7.2",
     "redux-mock-store": "^1.2.3",
     "redux-throttle": "0.1.1",
     "rimraf": "^2.6.1",
     "scratch-audio": "0.1.0-prerelease.20180625202813",
-    "scratch-blocks": "0.1.0-prerelease.1530135682",
-    "scratch-l10n": "3.0.20180703181510",
-    "scratch-paint": "0.2.0-prerelease.20180706154930",
-    "scratch-render": "0.1.0-prerelease.20180618173030",
+    "scratch-blocks": "0.1.0-prerelease.1532446271",
+    "scratch-l10n": "3.0.20180719145856",
+    "scratch-paint": "0.2.0-prerelease.20180718183615",
+    "scratch-render": "0.1.0-prerelease.20180724152606",
     "scratch-storage": "0.5.1",
-    "scratch-svg-renderer": "0.2.0-prerelease.20180618172917",
-    "scratch-vm": "0.1.0-prerelease.1529940524",
+    "scratch-svg-renderer": "0.2.0-prerelease.20180712223402",
+    "scratch-vm": "0.2.0-prerelease.20180724192502",
     "selenium-webdriver": "3.6.0",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.21.0",

src/components/action-menu/action-menu.css

@@ -28,7 +28,7 @@ button::-moz-focus-inner {
 }
 
 .button:hover {
-    background: $pen-primary;
+    background: $extensions-primary;
 }
 
 .button:active {
@@ -126,15 +126,15 @@ button::-moz-focus-inner {
     is not very easy to style.
 */
 .tooltip {
-    background-color: $pen-primary !important;
+    background-color: $extensions-primary !important;
     opacity: 1 !important;
     border: 1px solid hsla(0, 0%, 0%, .1) !important;
     box-shadow: 0 0 .5rem hsla(0, 0%, 0%, .25) !important;
     font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
 }
 
 .tooltip:after {
-    background-color: $pen-primary;
+    background-color: $extensions-primary;
 }
 
 .coming-soon-tooltip {

src/components/asset-panel/selector.css

@@ -49,6 +49,8 @@ $fade-out-distance: 100px;
     overflow-y: scroll;
     display: flex;
     flex-direction: column;
+    /* Make sure there is room to scroll beyond the last tile */
+    padding-bottom: 70px;
 }
 
 .list-item {
@@ -70,5 +72,5 @@ $fade-out-distance: 100px;
 
 .list-item.placeholder {
     background: black;
-    filter: opacity(15%) brightness(20%);
+    filter: opacity(15%) brightness(0%);
 }

src/components/blocks/blocks.css

@@ -40,6 +40,14 @@
     box-sizing: content-box;
 }
 
+.blocks :global(.blocklyBlockDragSurface) {
+    /*
+        Fix an issue where the drag surface was preventing hover events for sharing blocks.
+        This does not prevent user interaction on the blocks themselves.
+    */
+    pointer-events: none;
+}
+
 /*
     Shrink category font to fit "My Blocks" for now.
     Probably will need different solutions for language support later, so

src/components/camera-modal/camera-modal.css

@@ -93,7 +93,7 @@ $main-button-size: 2.75rem;
 }
 
 .main-button:hover {
-    background: $pen-primary;
+    background: $extensions-primary;
     box-shadow: 0 0 0 6px $motion-transparent;
 }
 

src/components/cards/card.css

@@ -14,21 +14,21 @@
     top: 5%;
     background: $ui-white;
     border: 1px solid $ui-tertiary;
-    width: 10px;
+    width: .75rem;
     z-index: 10;
     opacity: 0.9;
     overflow: hidden;
 }
 
 .left-card {
-    left: -10px;
+    left: -.75rem;
     border-right: 0;
     border-top-left-radius: 0.75rem;
     border-bottom-left-radius: 0.75rem;
 }
 
 .right-card {
-    right: -10px;
+    right: -.75rem;
     border-left: 0;
     border-top-right-radius: 0.75rem;
     border-bottom-right-radius: 0.75rem;
@@ -39,9 +39,9 @@
     position: absolute;
     top: 0;
     left: 0;
-    height: 1.8rem;
+    height: 2.5rem;
     width: 100%;
-    background: $motion-primary;
+    background: $extensions-primary;
 }
 
 .left-button, .right-button {
@@ -51,14 +51,24 @@
     z-index: 20;
     user-select: none;
     cursor: pointer;
-    background: $motion-primary;
-    box-shadow: 0 0 0 4px $motion-transparent;
-    height: 40px;
-    width: 40px;
+    background: $extensions-primary;
+    box-shadow: 0 0 0 4px $extensions-transparent;
+    height: 44px;
+    width: 44px;
     border-radius: 100%;
     display: flex;
     justify-content: center;
     align-items: center;
+    transition: all 0.25s ease;
+}
+
+.left-button:hover, .right-button:hover {
+    box-shadow: 0 0 0 6px $extensions-transparent;
+    transform: scale(1.125);
+}
+
+.left-button img, .right-button img{
+    width: 1.75rem;
 }
 
 .left-button {
@@ -88,10 +98,10 @@
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
-    background: $motion-primary;
-    border-bottom: 1px solid $motion-tertiary;
-    padding: 0.5rem;
+    background: $extensions-primary;
+    border-bottom: 1px solid $extensions-tertiary;
     font-size: 0.625rem;
+    font-weight: bold;
 }
 
 .remove-button, .all-button {
@@ -101,6 +111,11 @@
     flex-direction: row;
     justify-content: center;
     align-items: center;
+    padding: 0.75rem;
+}
+
+.remove-button:hover, .all-button:hover {
+    background-color: $ui-black-transparent;
 }
 
 .step-title {
@@ -138,7 +153,7 @@
     display: flex;
     flex-direction: row;
     justify-content: space-around;
-    padding: 0 0.5rem 0.5rem;
+    padding: 0 1rem 0.5rem;
 }
 
 .deck {
@@ -152,7 +167,7 @@
 }
 
 .deck-image {
-    width: 130px;
+    width: 200px;
     height: 100px;
     object-fit: cover;
 }
@@ -161,14 +176,15 @@
     color: $motion-primary;
     font-weight: bold;
     font-size: 0.85rem;
-    margin: 14px 0px;
+    margin: .625rem 0px;
     text-align: center;
     font-weight: bold;
     text-align: center;
+    max-width: 200px;
 }
 
 .help-icon, .close-icon {
-    height: 0.75rem;
+    height: 1rem;
 }
 
 .help-icon {
@@ -198,9 +214,9 @@
     display: flex;
     align-items: center;
     color: $ui-white;
-    font-size: 12px;
+    font-size: .75rem;
     font-weight: bold;
-    line-height: 15px;
+    line-height: 1rem;
     text-align: center;
 }
 
@@ -228,10 +244,10 @@
     height: 0.5rem;
     margin: 0 0.25rem;
     border-radius: 100%;
-    background: transparent;
-    border: 2px solid $ui-white-transparent;
+    background: $ui-white-transparent;
 }
 
 .active-step-pip {
-    background: white;
+    background: $ui-white;
+    box-shadow: 0px 0px 0px 2px $ui-black-transparent;
 }

src/components/cards/cards.jsx

@@ -8,7 +8,7 @@ import styles from './card.css';
 import nextIcon from './icon--next.svg';
 import prevIcon from './icon--prev.svg';
 
-import helpIcon from './icon--help.svg';
+import helpIcon from '../../lib/assets/icon--tutorials.svg';
 import closeIcon from '../close-button/icon--close.svg';
 
 const CardHeader = ({onCloseCards, onShowAll, totalSteps, step}) => (
@@ -22,9 +22,9 @@ const CardHeader = ({onCloseCards, onShowAll, totalSteps, step}) => (
                 src={helpIcon}
             />
             <FormattedMessage
-                defaultMessage="All How-Tos"
-                description="Title for button to return to how-to library"
-                id="gui.cards.all-how-tos"
+                defaultMessage="Tutorials"
+                description="Title for button to return to tutorials library"
+                id="gui.cards.all-tutorials"
             />
         </div>
         {totalSteps > 1 ? (
@@ -43,7 +43,7 @@ const CardHeader = ({onCloseCards, onShowAll, totalSteps, step}) => (
             onClick={onCloseCards}
         >
             <FormattedMessage
-                defaultMessage="Remove"
+                defaultMessage="Close"
                 description="Title for button to close how-to card"
                 id="gui.cards.remove"
             />
@@ -152,7 +152,7 @@ const PreviewsStep = ({deckIds, content, onActivateDeckFactory, onShowAll}) => (
             />
         </div>
         <div className={styles.decks}>
-            {deckIds.map(id => (
+            {deckIds.slice(0, 2).map(id => (
                 <div
                     className={styles.deck}
                     key={`deck-preview-${id}`}