Skip to content

feat(tup-cms): svg decals for layered images#168

Merged
wesleyboar merged 126 commits intomainfrom
task/svg-snippets
Mar 21, 2023
Merged

feat(tup-cms): svg decals for layered images#168
wesleyboar merged 126 commits intomainfrom
task/svg-snippets

Conversation

@wesleyboar
Copy link
Copy Markdown
Member

@wesleyboar wesleyboar commented Feb 24, 2023

Overview & Changes

Allow designers to add TACC-specific decals to images.

Related

Changes

  • added SVG snippet templates

Testing & UI

icon.on.tacc.mov

Notes

I accidentally merged dev/tup-cms into here. I fixed it by merging #167 into main, then main into dev/tup-cms and dev/tup-cms into here (again). VCS is fun.

Known Issues

  1. Multiple iconsets cause problems with the icon selector widget django-cms/djangocms-icon#9
Video
djangocms_icon.dual.svg.set.bug.mov

@wesleyboar wesleyboar changed the title feat(tup-cms): snippets, sprial-big feat(tup-cms): snippets, spiral-big Feb 24, 2023
@wesleyboar wesleyboar changed the title feat(tup-cms): snippets, spiral-big feat(tup-cms): snippets, spiral-big 🧪 Feb 27, 2023
Copy link
Copy Markdown

@taoteg taoteg left a comment

Choose a reason for hiding this comment

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

Looks good.
Do we care about the unused assignment annotation warnings in Sidebar.tsk, ProjectDetails.tsx and Dashboard.tsx?
They appear to be unchanged, but flagged files in the PR.
Approving regardless.

@wesleyboar
Copy link
Copy Markdown
Member Author

@taoteg Annotation are unrelated. We care, but I have active work on tup-ui. When someone get's a cycle, someone will commit or open a PR will fix those.

@wesleyboar
Copy link
Copy Markdown
Member Author

@taoteg Oh, never mind. There's some odd stuff in this diff. I must have accidentally merged dev/tup-cms into here. Yay, new task.

@wesleyboar wesleyboar marked this pull request as draft March 21, 2023 01:12
@wesleyboar wesleyboar changed the title feat(tup-cms): svg decals for layered images feat(tup-cms): svg decals for layered images ⚠️ Mar 21, 2023
@wesleyboar wesleyboar changed the base branch from main to dev/tup-cms March 21, 2023 01:29
@wesleyboar wesleyboar changed the base branch from dev/tup-cms to main March 21, 2023 01:30
@wesleyboar wesleyboar changed the title feat(tup-cms): svg decals for layered images ⚠️ feat(tup-cms): svg decals for layered images Mar 21, 2023
@wesleyboar
Copy link
Copy Markdown
Member Author

wesleyboar commented Mar 21, 2023

Fixed. And I added some more symbols in the SVG.

@wesleyboar wesleyboar marked this pull request as ready for review March 21, 2023 01:37
@wesleyboar
Copy link
Copy Markdown
Member Author

Cleaned up confusing comment. Designer has tested, and it works.*

* They want to do more tricky things (different styles for different shapes within the same symbol), that ideally use inline SVG, but I gave two options that don't require that (a: layer two Icons; b: use fill and add stroke in one symbol in a way that works with one set of styles). I'll revisit Core-CMS if I want to go with an inline SVG solution.

@wesleyboar wesleyboar merged commit 2f03a2c into main Mar 21, 2023
@wesleyboar wesleyboar deleted the task/svg-snippets branch March 21, 2023 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants