Skip to content

Draft/experimental user dataset upload tab UX improvements #1394

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

Draft
bobular wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Draft/experimental user dataset upload tab UX improvements #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
641f447
remove optional wording
asizemore Apr 21, 2025
d68bd2f
change to related organisms
asizemore Apr 21, 2025
37dcb4e
create wdk styles for coreui buttons
asizemore Apr 21, 2025
a5e9128
add exported wdk button styles
asizemore Apr 22, 2025
42ba4d3
test for hiding and showing metadata fields
asizemore Apr 23, 2025
f3c0c65
Merge branch 'main' into fix-1371-user-upload-fixes
asizemore Apr 25, 2025
db4ca23
hide related organisms from isasimple
asizemore Apr 25, 2025
e7c5235
fixed oopsie
bobular May 8, 2025
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
25 changes: 24 additions & 1 deletion packages/libs/coreui/src/components/buttons/FloatingButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { merge } from 'lodash';
import { useMemo } from 'react';

import useUITheme from '../../theming/useUITheme';
import { blue, gray } from '../../../definitions/colors';
import { blue, gray, mutedBlue } from '../../../definitions/colors';
import SwissArmyButton from '../SwissArmyButton';
import {
ButtonStyleSpec,
Expand Down Expand Up @@ -100,3 +100,26 @@ export default function FloatingButton({
/>
);
}

export const FloatingButtonWDKStyle: ButtonStyleSpec = {
default: {
color: 'transparent',
textColor: '#069',
fontWeight: 600,
},
hover: {
color: mutedBlue[100],
textColor: '#069',
fontWeight: 600,
},
pressed: {
color: mutedBlue[200],
textColor: '#069',
fontWeight: 600,
},
disabled: {
color: 'transparent',
textColor: gray[500],
fontWeight: 600,
},
};
50 changes: 49 additions & 1 deletion packages/libs/coreui/src/components/buttons/OutlinedButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { merge } from 'lodash';
import { useMemo } from 'react';

import useUITheme from '../../theming/useUITheme';
import { blue, gray } from '../../../definitions/colors';
import { blue, gray, mutedBlue } from '../../../definitions/colors';
import SwissArmyButton from '../SwissArmyButton';
import {
ButtonStyleSpec,
Expand Down Expand Up @@ -133,3 +133,51 @@ export default function OutlinedButton({
/>
);
}

// Styled for use in the wdk
export const OutlinedButtonWDKStyle = {
default: {
textColor: '#0F86C1',
fontWeight: 600,
color: 'transparent',
border: {
radius: 5,
color: '#0F86C1',
style: 'solid',
width: 2,
},
},
hover: {
textColor: mutedBlue[600],
fontWeight: 600,
color: 'transparent',
border: {
radius: 5,
color: mutedBlue[600],
style: 'solid',
width: 2,
},
},
pressed: {
textColor: mutedBlue[700],
fontWeight: 600,
color: 'transparent',
border: {
radius: 5,
color: mutedBlue[700],
style: 'solid',
width: 2,
},
},
disabled: {
textColor: gray[500],
fontWeight: 600,
color: 'transparent',
border: {
radius: 5,
color: gray[500],
style: 'solid',
width: 2,
},
},
};
1 change: 0 additions & 1 deletion packages/libs/user-datasets/src/lib/Components/UploadForm.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
display: flex;
flex-direction: column;
gap: 0.5em;
padding-left: 1em;
padding-right: 1em;

> label {
Expand Down
Loading
Loading