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 NML uploader styling #7641

Merged
merged 4 commits into from
Feb 22, 2024
Merged

Fix NML uploader styling #7641

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c95b0a
fix NML uploader styling
hotzenklotz Feb 20, 2024
554f784
updated changelog
hotzenklotz Feb 20, 2024
26963bc
restore background mask for DnD uploader
hotzenklotz Feb 20, 2024
ca7572e
Merge branch 'master' into fix-nml-upload
hotzenklotz Feb 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Fixed small styling errors as a follow up to the antd v5 upgrade [#7612](https://github.com/scalableminds/webknossos/pull/7612)
- Fixed deprecation warnings caused by Antd <Collapse> components. [#7610](https://github.com/scalableminds/webknossos/pull/7610)
- Fixed small styling error with a welcome notification for new users on webknossos.org. [7623](https://github.com/scalableminds/webknossos/pull/7623)
- Fixed small styling error with NML drag and drop uploading. [7641](https://github.com/scalableminds/webknossos/pull/7641)


### Removed

Expand Down
2 changes: 1 addition & 1 deletion frontend/javascripts/oxalis/view/nml_upload_zone_container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function NmlDropArea({
<InboxOutlined
style={{
fontSize: 180,
color: "var(color-primary)",
color: "var(--ant-color-primary)",
}}
/>
</div>
Expand Down
4 changes: 2 additions & 2 deletions frontend/stylesheets/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ button.narrow {
top: 100px;
width: 400px;
height: 250px;
background: var(--ant-modal-content-bg);
border-radius: 4px;
background: var(--ant-color-bg-container);
Copy link
Member Author

Choose a reason for hiding this comment

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

The ant modal background color vars are not available globally but only for <Modal /> components. :-/

border-radius: var(--ant-border-radius);
margin: 0 auto;
}
.dataset-upload-dropzone {
Expand Down