Skip to content

Fix drop targets on background element + disable opacity for backgrounds#885

Merged
wassgha merged 4 commits intomasterfrom
fix/background-mask
Mar 31, 2020
Merged

Fix drop targets on background element + disable opacity for backgrounds#885
wassgha merged 4 commits intomasterfrom
fix/background-mask

Conversation

@wassgha
Copy link
Copy Markdown
Contributor

@wassgha wassgha commented Mar 31, 2020

Closes #882
Re-opens #796

Changes

  • Reverts part of Disallow masking for background. #827 by allowing rectangles to be a valid background mask to temporarily re-enable drop targets
  • Disables opacity controls for shapes, images and videos that are background elements
  • Prevents "Remove as background element" on the default background object (white rectangle)
  • Fixes a duplicate ID issue that caused an e2e test to fail

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Mar 31, 2020

Size Change: +110 B (0%)

Total Size: 504 kB

Filename Size Change
assets/js/edit-story.js 434 kB +110 B (0%)
ℹ️ View Unchanged
Filename Size Change
assets/css/edit-story.css 3.01 kB 0 B
assets/css/stories-dashboard.css 206 B 0 B
assets/js/stories-dashboard.js 67.2 kB 0 B

compressed-size-action

@wassgha wassgha merged commit 263c663 into master Mar 31, 2020
@wassgha wassgha deleted the fix/background-mask branch March 31, 2020 01:58
@miina
Copy link
Copy Markdown
Contributor

miina commented Mar 31, 2020

@wassgha Could we add some tests perhaps for the drop targets that would prevent this kind of breaking in the future?

@swissspidy swissspidy added the Type: Bug Something isn't working label Mar 31, 2020
obetomuniz added a commit that referenced this pull request Apr 1, 2020
* master: (43 commits)
  Bump @storybook/react from 5.3.17 to 5.3.18 (#902)
  Bump @storybook/addon-backgrounds from 5.3.17 to 5.3.18 (#903)
  updating import path for typeahead menu options
  Bump @storybook/addon-knobs from 5.3.17 to 5.3.18 (#899)
  Bump lint-staged from 10.1.0 to 10.1.1 (#898)
  Bump @storybook/addon-docs from 5.3.17 to 5.3.18 (#896)
  Bump @testing-library/dom from 7.1.4 to 7.2.0 (#890)
  Bump eslint-plugin-testing-library from 3.0.0 to 3.0.1 (#887)
  Fix drop targets on background element + disable opacity for backgrounds (#885)
  Enables snap to common element distances and removes workaround (#884)
  Shape previews in the layers panel (#853)
  [ImgBot] Optimize images
  Learn more helper dialog for background fit (#854)
  Restore defaultBackground migration
  fix output test for font-size
  minor lints
  New aspect ratio 2:3
  Fix: run the default-background migration (#880)
  Fixes background element selection (#847)
  Bump browserslist from 4.11.0 to 4.11.1
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Type: Bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Drop targets broken on the background

5 participants