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

Correct colors, icons and add order links #17

Merged
merged 3 commits into from
Mar 31, 2024
Merged

Correct colors, icons and add order links #17

merged 3 commits into from
Mar 31, 2024

Conversation

dasGoogle
Copy link
Collaborator

Closes #10

image

  • Cash register icon for orders, bolt icon for top-ups
  • uses VerDE Colors for links and header
  • Montserrat as default font for everything (except icons)
  • fixed overflow issues in pairing box and made the two cards the same height
  • Top-Ups show their transaction texts
  • Orders display the number of icons and are now clickable links to the order page for more details

@dasGoogle dasGoogle requested a review from jeriox March 28, 2024 09:33
@dasGoogle
Copy link
Collaborator Author

@jeriox If you can tell me how to easily handle the translations of the plural/singular form of the "Item(s)" string, I'd be happy to fix that but I don't know where to start.

@jeriox
Copy link
Contributor

jeriox commented Mar 28, 2024

@jeriox If you can tell me how to easily handle the translations of the plural/singular form of the "Item(s)" string, I'd be happy to fix that but I don't know where to start.

https://docs.djangoproject.com/en/5.0/ref/templates/builtins/#pluralize

jeriox
jeriox approved these changes Mar 28, 2024
View reviewed changes
pretix_wallet/static/pretix_wallet/css/wallet.css
@@ -0,0 +1,26 @@
@font-face {
font-family: "Montserrat";
src: url('/static/pretix_wallet/webfonts/Montserrat-VariableFont_wght.ttf') format('truetype'),
Copy link
Contributor

Choose a reason for hiding this comment

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

this may break at some point because the static URL is hardcoded instead of using the one from the django settings

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Well, this is ultimately a question of which design crime you want to commit: CSS in the HTML (so it can be templated) or hardcoded URL in the CSS file, isn't it?

Copy link
Contributor

Choose a reason for hiding this comment

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

i guess you could fix that with SCSS that needs to be compiled anyways, but I think its fine for now

@dasGoogle
Copy link
Collaborator Author

Plural thing is fixed, feel free to merge

@jeriox jeriox merged commit 3e7942a into main Mar 31, 2024
1 of 5 checks passed
@jeriox jeriox deleted the ui-enhancements branch March 31, 2024 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeriox jeriox jeriox approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make transaction list pretty
2 participants
@dasGoogle @jeriox