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.

Sign up for GitHub

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

hover tag animation #731

Merged
merged 7 commits into from
Nov 15, 2022
Merged

hover tag animation #731

merged 7 commits into from
Nov 15, 2022

Conversation

caseyhans
Copy link
Collaborator

@caseyhans caseyhans commented Nov 10, 2022 •
edited
Loading

  • Changes the hover style for literature tags on the screening page.
  • Corrects vertical alignment for the plus/minus expansion buttons on the tagtree
  • Swaps out a custom css class for a bootstrap class

Before:
image

After:
image

shapiromatron
shapiromatron approved these changes Nov 14, 2022
View reviewed changes
Copy link
Owner

@shapiromatron shapiromatron left a comment •
edited
Loading

Choose a reason for hiding this comment

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

The animation is really smooth and looks good. Bumping up that little plus sign is really nice too, and the way you've implemented animation is really well done. My concern is that it may be distracting to people when they're focusing on assigning the tags.

We can try it out and see what people think.

If we want to remove the animation, I bumped it up to --bg-h: 4px; to make it a little stronger and I thought it looked pretty good.

@shapiromatron
Copy link
Owner

Also, I don't think it' s a dealbreaker, but saw a few cases where if the tag is long it overlaps:

image

@caseyhans caseyhans merged commit 298e7ff into literature-conflict-resolution Nov 15, 2022
@caseyhans caseyhans deleted the hover-tag-animation branch November 15, 2022 23:14
shapiromatron added a commit that referenced this pull request Nov 22, 2022
@shapiromatron @caseyhans
@munnsmunns @rabstejnek
Literature conflict resolution (#739)
b46231b 
* Literature Conflict Resolution Database Models (#708)

* database models

* reorder

* updates to database models

* reorganize views

* update form url

* update admin

* fix user reference tags

* fix tests

* fix integration test

* no message

* fix broken build

Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* Create UserReferenceTag objects (#716)

* Save user reference tag object when tags are changed

* revert unused changes

* add conflict resolution case in update_tags

* add assessment for testing conflict resolution

* fix tests

* remove unused import

* add test

* add prefetch

* lint

* Add resolved field to user tags and has_conflict property to refs

* updates from review

* tune database

* restore all API actions

* change argument order

Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* Reorganize Screening Page Layout (#714)

* redo screening page layout

* move remove all tags btn

* updates

* integration test

* updates

* use mobx for slideAway

* show full tag toggle

* prop validation

* add screening instructions

* instructions updates

* style changes

* keyword highlighting

* lint

* undo style change addressed in #726

* fix for no references

* updates

* fix padding for prime flavor

* random updates

* fix linting

* use LocalStorage class to handle these

* apply highlighting to title

* pull out of class to make function

* rename to string instead of int-looking string

* fix n+1 query issue

* fix common edge case where there are no keywords

Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* Stub new lit views (#721)

* stub new lit views

* format

* minor updates

Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* hover tag animation (#731)

* change tag hover style

* minor animation and padding tweaks

* change to gray

* frontend lint fix?

* tests fix

>

* update github-actions (#730)

* update backend

* update action versions

* try using built-in postgres

* add debugging

* fix statement

* add settings

* fix? run on main/next branch anytime

* cleanup/standardize

* fix yarn cache dir

* Tagging filters (#736)

* Make universal tagging view w/ filter form

* Combine tagging views

* Removed v2 from current implementation

* Removed path for deleted view

* Formatted js files

* Fix tests

* Fix query parameters

* Updated reference search page with changes to reference filterset

* improve queryset performance; reorder form

* fix css when abstracts are short

* use args instead of kwargs for simple reverse statements

Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* User tag screening (#735)

* Make universal tagging view w/ filter form

* add user tag distinction to screening view

* lint

* Combine tagging views

* Removed v2 from current implementation

* Removed path for deleted view

* Formatted js files

* Fix tests

* Fix query parameters

* Updated reference search page with changes to reference filterset

* style and test fix

* updates

* improve queryset performance; reorder form

* fix css when abstracts are short

* use args instead of kwargs for simple reverse statements

* remove prefetch

Co-authored-by: Daniel Rabstejnek <rabstejnek@gmail.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* literature tag conflict resolution view (#734)

* Add view/template from wf

* make conflict resolution view display tag conflicts correctly

* remove tags diff highlighting for fewer queries

* add api endpoint for and hx-post for resolving conflict

* wip fix resolve_user_tag_conflicts method

* add form tag and hx-target

* create reference conflict template

* refine view and css

* add template rendering to api endpoint

* add reference tags to view (if they exist)

* remove unnecessary method

* change tag style

* add tag diffs

* fix view inheritance

* remove column for frontend filter

* add distinct to queryset

* style updates

* Added filter form to conflict resolution view, added filter for choosing tag types to filter against, updated other filter forms with new filter

* updates

* remove queryset additions

* cleanup css

* update css

* updates from final review

* lint

Co-authored-by: casey1173 <caseyhansen1999@gmail.com>
Co-authored-by: Daniel Rabstejnek <rabstejnek@gmail.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

* Reference List Overflow (#738)

* Add view/template from wf

* make conflict resolution view display tag conflicts correctly

* remove tags diff highlighting for fewer queries

* add api endpoint for and hx-post for resolving conflict

* wip fix resolve_user_tag_conflicts method

* add form tag and hx-target

* create reference conflict template

* refine view and css

* add template rendering to api endpoint

* add reference tags to view (if they exist)

* remove unnecessary method

* change tag style

* add tag diffs

* fix view inheritance

* remove column for frontend filter

* add distinct to queryset

* style updates

* fix for reference overflow

* revert merge diffs

* remove height

* take 2?

* fix edge case with tags

Co-authored-by: munnsmunns <mmunns16@gmail.com>
Co-authored-by: Andy Shapiro <shapiromatron@gmail.com>

Co-authored-by: Casey Hansen <42587248+casey1173@users.noreply.github.com>
Co-authored-by: Matt Munns <mmunns16@gmail.com>
Co-authored-by: Daniel Rabstejnek <rabstejnek@gmail.com>
Co-authored-by: casey1173 <caseyhansen1999@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shapiromatron shapiromatron shapiromatron approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@caseyhans @shapiromatron