Merge branch 'develop' into feature/navwarning
Showing
- package.json 1 addition, 1 deletionpackage.json
- src/components/asset-panel/selector.css 12 additions, 0 deletionssrc/components/asset-panel/selector.css
- src/components/close-button/close-button.jsx 2 additions, 0 deletionssrc/components/close-button/close-button.jsx
- src/components/icon-button/icon-button.jsx 1 addition, 0 deletionssrc/components/icon-button/icon-button.jsx
- src/components/language-selector/language-selector.css 4 additions, 0 deletionssrc/components/language-selector/language-selector.css
- src/components/sprite-info/sprite-info.css 10 additions, 0 deletionssrc/components/sprite-info/sprite-info.css
- src/components/sprite-info/sprite-info.jsx 8 additions, 2 deletionssrc/components/sprite-info/sprite-info.jsx
- src/containers/blocks.jsx 14 additions, 7 deletionssrc/containers/blocks.jsx
- src/containers/sound-tab.jsx 6 additions, 8 deletionssrc/containers/sound-tab.jsx
- src/containers/sprite-info.jsx 17 additions, 1 deletionsrc/containers/sprite-info.jsx
- src/css/units.css 4 additions, 0 deletionssrc/css/units.css
- src/lib/layout-constants.js 2 additions, 1 deletionsrc/lib/layout-constants.js
- src/lib/make-toolbox-xml.js 47 additions, 30 deletionssrc/lib/make-toolbox-xml.js
- src/reducers/toolbox.js 2 additions, 2 deletionssrc/reducers/toolbox.js
- test/helpers/selenium-helper.js 9 additions, 2 deletionstest/helpers/selenium-helper.js
- test/integration/test.js 10 additions, 5 deletionstest/integration/test.js
- test/unit/components/__snapshots__/icon-button.test.jsx.snap 1 addition, 0 deletionstest/unit/components/__snapshots__/icon-button.test.jsx.snap
- test/unit/components/__snapshots__/sound-editor.test.jsx.snap 7 additions, 0 deletions.../unit/components/__snapshots__/sound-editor.test.jsx.snap
- test/unit/components/__snapshots__/sprite-selector-item.test.jsx.snap 2 additions, 0 deletions...mponents/__snapshots__/sprite-selector-item.test.jsx.snap
Loading
Please register or sign in to comment