Skip to content
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.

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

Jump to bottom

Fix up Pixel Viewer and RGB mixer plus modernise CMY mixer #1309

Merged
merged 8 commits into from Sep 3, 2020
Merged

Fix up Pixel Viewer and RGB mixer plus modernise CMY mixer #1309

merged 8 commits into from Sep 3, 2020

Conversation

eAlasdair
Copy link
Contributor

@eAlasdair eAlasdair commented Aug 5, 2020 •
edited

  • Fix indentation style problems in PV
  • Fix style of RGB Mixer URL parameters
    • pixelmania-2 redirects to a different url but the same functionality
    • The original mode=pixelmania option is deprecated but still works
    • New parameters: hide-selector=true|false for the rgb/hex radio options & pixelmania for the logo
  • Modernise CMY Mixer:
    • New URL parameter hide-selector=true|false for the rgb/hex radio options
      • No pixelmania parameter because it wasn't used for Pixelmania
    • Layout and css rules brought inline with RGB Mixer
    • Display of cmy colour code in colour box
      • There is no equivalent hex code for CMY so it is left blank also cmy colour code but using hex values

Resolves #1306

@eAlasdair eAlasdair self-assigned this Aug 5, 2020
courtneycb
courtneycb suggested changes Aug 5, 2020
View changes
Copy link
Contributor

@courtneycb courtneycb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Just me being picky and a question.

csfieldguide/static/interactives/cmy-mixer/js/cmy-mixer.js Outdated Show resolved Hide resolved
csfieldguide/static/interactives/cmy-mixer/scss/cmy-mixer.scss Outdated Show resolved Hide resolved
@eAlasdair eAlasdair merged commit 6c518c2 into develop Sep 3, 2020
3 checks passed
@eAlasdair eAlasdair deleted the issue/1306 branch September 3, 2020 01:41
@eAlasdair eAlasdair mentioned this pull request Jan 10, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@courtneycb courtneycb courtneycb approved these changes

Assignees

@eAlasdair eAlasdair

Labels
interactives
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make CMY Mixer consistent with the RGB Mixer
2 participants
@eAlasdair @courtneycb