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

Adapt viewport and crosshair colors to new color scheme #6760

Merged
merged 9 commits into from
Jan 19, 2023
Merged

Adapt viewport and crosshair colors to new color scheme #6760

merged 9 commits into from
Jan 19, 2023

Conversation

philippotto
Copy link
Member

image
vs
image

  • Ready for review

@philippotto philippotto self-assigned this Jan 18, 2023
daniel-wer
daniel-wer approved these changes Jan 18, 2023
View reviewed changes
Copy link
Member

@daniel-wer daniel-wer left a comment

Choose a reason for hiding this comment

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

LGTM 👍

I second, that the logo should be smaller and include the webknossos text. I saw that you are already working on this :)

@philippotto
Copy link
Member Author

I second, that the logo should be smaller and include the webknossos text. I saw that you are already working on this :)

Done!

I also updated the screenshots so that the nightly should succeed again 🎉

daniel-wer
daniel-wer approved these changes Jan 18, 2023
View reviewed changes
Copy link
Member

@daniel-wer daniel-wer left a comment

Choose a reason for hiding this comment

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

🎉

@philippotto philippotto enabled auto-merge (squash) January 19, 2023 08:10
@philippotto philippotto merged commit ac84ae1 into master Jan 19, 2023
@philippotto philippotto deleted the crosshair-colors branch January 19, 2023 08:29
hotzenklotz added a commit that referenced this pull request Jan 19, 2023
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into enf…
b627c5b 
…orce_plan

* 'master' of github.com:scalableminds/webknossos:
  Make voxelytics sql queries compatible with postgres 10 (#6763)
  Adapt viewport and crosshair colors to new color scheme (#6760)
  minor logo fix (#6762)
  Fix superuser organization switching (#6756)
bulldozer-boy bot pushed a commit that referenced this pull request Jan 23, 2023
@hotzenklotz
Enforce Pricing for Task/Project Management Features (#6767)
d195800 
* enforce pricing plan for features (WIP)
* enforce pricing for navbar links
* Merge branch 'master' of github.com:scalableminds/webknossos into enforce_plan

* 'master' of github.com:scalableminds/webknossos:
  Update VoxelyticsDAO.scala
  Show voxel size in details sidebar in new datasets tab (#6755)
  Fix font import (#6754)
  Fix breadcrumbs (II) (#6753)
* add organization to store
* fix type errors for activeOrganization
* Merge branch 'master' of github.com:scalableminds/webknossos into enforce_plan

* 'master' of github.com:scalableminds/webknossos:
  Make voxelytics sql queries compatible with postgres 10 (#6763)
  Adapt viewport and crosshair colors to new color scheme (#6760)
  minor logo fix (#6762)
  Fix superuser organization switching (#6756)
* naming stuff is hard
* Merge branch 'master' of github.com:scalableminds/webknossos into enforce_plan
* 'master' of github.com:scalableminds/webknossos:
  Fix antd deprecation warning for <Modal open/visible> (#6765)
  Fix exploring remote datasets with no credentials (#6764)
* added new page for when features are not available due to pricing limits
* prevent folder creation on dashboard
* Merge branch 'master' into enforce_plan
* applied PR feedback
* applied even more PR feedback
* Update frontend/javascripts/components/pricing_enforcers.tsx

Co-authored-by: Philipp Otto <[email protected]>
* Update frontend/javascripts/components/pricing_enforcers.tsx

Co-authored-by: Philipp Otto <[email protected]>
* Merge branch 'master' into enforce_plan
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daniel-wer daniel-wer daniel-wer approved these changes

Assignees

@philippotto philippotto

Labels
automerge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@philippotto @daniel-wer