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

Fix editable text style #6799

Merged
merged 13 commits into from
Feb 8, 2023
Merged

Fix editable text style #6799

merged 13 commits into from
Feb 8, 2023

Conversation

hotzenklotz
Copy link
Member

@hotzenklotz hotzenklotz commented Feb 1, 2023 •
edited
Loading

This PR mainly fixes some small line breaks in the some places in the UI that I found annoying.

Changes:

  • Annotation Info Tab
    • Ensure annotation name and pencil icon are on the same line
    • Ensure annotation description and pencil icon are on the same line
  • Segments Tab
    • Ensure each list entry is on one line
  • Refactored some typescript typing and removed suppressions/increased coverage

Before:
image

After:
image

Before:
image

After:
image

Layout/CSS tested in Safari 16.03, Chrome 109.0.5414.119, Firefox 109.0.1 on MacOS.

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • Check that the line breaks work in your browser
  • Double-check where else the changed components might be use, .e.g. dataset list on dashboard

Issues:

  • None

(Please delete unneeded items, merge only when none are left open)

@hotzenklotz hotzenklotz self-assigned this Feb 1, 2023
@hotzenklotz
fixed lined breaks in segments list
3802f86
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into fix…
1fe3d63 
…_editable_text_style

* 'master' of github.com:scalableminds/webknossos:
  Fix proofreading when mag 1 doesn't exist for segmentation layer (#6795)
philippotto
philippotto requested changes Feb 2, 2023
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Thank you for doing this! Only got some smaller things. Will test after these are resolved.

frontend/javascripts/oxalis/view/components/input_component.tsx Outdated Show resolved Hide resolved
frontend/javascripts/oxalis/view/components/input_component.tsx Show resolved Hide resolved
frontend/javascripts/oxalis/view/components/input_component.tsx Outdated Show resolved Hide resolved
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into fix…
81139eb 
…_editable_text_style

* 'master' of github.com:scalableminds/webknossos:
  Fix spacing (#6802)
  Release 23.02.0 (#6801)
  Fix logo in Readme (#6805)
  Enforce Pricing for Team Sharing (#6776)
  applied PR feedback
  prevent proof reading tool from being unsed through keyboard shortcut
  disable proof reading tool
  use isFeatureAllowedByPricingPlan for SecuredRoute
  enforce pricing for creating precomputed meshes
  add isFeatureAllowedByPricingPlan helper function
  re-styled pricing alert
  Update frontend/javascripts/components/pricing_enforcers.tsx
  updated changelog
  add new blur component around certain paid features
@hotzenklotz
applied PR feedback
e57eb32
@philippotto
Copy link
Member

Works great 👍 However, I found one problem (not sure whether it's new but definitely related): When editing the description of an annotation, the "enter" key does not produce line breaks. If this is fixed, the PR should be good to go :)

@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into fix…
b1a2f0b 
…_editable_text_style

* 'master' of github.com:scalableminds/webknossos:
  Rewrite database tooling and support for postgres passwords (#6803)
  Fix saving allowed teams in dataset settings (#6817)
  Prevent Deactivaing Orga Owner (#6816)
  Fix some login problems (#6810)
@hotzenklotz
fix ENTER key for multiline text inputs
973339a
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into fix…
9ed4660 
…_editable_text_style

* 'master' of github.com:scalableminds/webknossos:
  Fix error message when trying to join an orga you are already in (#6824)
  Access Google Cloud Storage via NIO (#6775)
@hotzenklotz
Copy link
Member Author

@philippotto I think I fixed the behavior of the ENTER key for the multiline text area. Please see my commit: 973339a

@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into fix…
e490748 
…_editable_text_style

* 'master' of github.com:scalableminds/webknossos:
  fixes loki log batching (#6828)
@hotzenklotz
Merge branch 'master' into fix_editable_text_style
b83d7c0
@hotzenklotz hotzenklotz enabled auto-merge (squash) February 8, 2023 08:50
@hotzenklotz hotzenklotz merged commit 8a996ac into master Feb 8, 2023
@hotzenklotz hotzenklotz deleted the fix_editable_text_style branch February 8, 2023 09:07
hotzenklotz added a commit that referenced this pull request Feb 8, 2023
@hotzenklotz
Merge branch 'master' of github.com:scalableminds/webknossos into org…
5dd39a2 
…a_owner

* 'master' of github.com:scalableminds/webknossos:
  Loki batched insert (#6831)
  Fix editable text style (#6799)
  Fix dbtool schema scheck stderr capturing (#6830)
  Release 23.02.1 (#6827)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philippotto philippotto philippotto approved these changes

Assignees

@hotzenklotz hotzenklotz

Labels
frontend
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hotzenklotz @philippotto