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.

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

Share files from browser support #1736

Merged
merged 38 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
63c9443
redesign
Tbaut Nov 9, 2021
7a281e6
copy buttons
Tbaut Nov 9, 2021
0a2a3ea
lingui extract
actions-user Nov 9, 2021
bcaf160
Merge branch 'fix/tbaut-link-design-1630' of github.com:ChainSafe/ui-…
Tbaut Nov 11, 2021
0891cf2
merge upstream
Tbaut Nov 11, 2021
8b3e2c4
dynamic dropdown
Tbaut Nov 11, 2021
424f427
copy working
Tbaut Nov 11, 2021
7d439ac
remove label
Tbaut Nov 11, 2021
76bf31c
styling suggestions
Tbaut Nov 11, 2021
507822e
Merge branch 'dev' into fix/tbaut-link-design-1630
Tbaut Nov 11, 2021
b1d970e
lingui extract
actions-user Nov 11, 2021
8cb3dc1
Merge branch 'dev' into fix/tbaut-link-design-1630
Tbaut Nov 11, 2021
dd6e9f1
Merge branch 'dev' into fix/tbaut-link-design-1630
Tbaut Nov 11, 2021
f28ada0
landing modal alignments
tanmoyAtb Nov 12, 2021
6d5afeb
lingui extract
actions-user Nov 12, 2021
ab51461
Merge branch 'fix/tbaut-link-design-1630' of github.com:ChainSafe/ui-…
tanmoyAtb Nov 12, 2021
a07707f
modal config
tanmoyAtb Nov 12, 2021
5dcfee7
messages merge
tanmoyAtb Nov 12, 2021
82aefd0
lingui extract
actions-user Nov 12, 2021
f371191
manage shared folder code refactor
tanmoyAtb Nov 12, 2021
16dd92a
Merge branch 'feat/share-from-browser-1631' of github.com:ChainSafe/u…
tanmoyAtb Nov 12, 2021
982af6e
lingui extract
actions-user Nov 12, 2021
4fe7ce5
modals progress working
tanmoyAtb Nov 12, 2021
481eb3d
Merge branch 'feat/share-from-browser-1631' of github.com:ChainSafe/u…
tanmoyAtb Nov 12, 2021
fd6ad1c
added posthog event
tanmoyAtb Nov 15, 2021
09c58ce
lingui extract
actions-user Nov 15, 2021
4acbd1a
changing widths
tanmoyAtb Nov 15, 2021
14e6e7c
Merge branch 'feat/share-from-browser-1631' of github.com:ChainSafe/u…
tanmoyAtb Nov 15, 2021
9f1c5b5
added width breaks
tanmoyAtb Nov 15, 2021
5ae9299
removed extra styled
tanmoyAtb Nov 16, 2021
3207ae7
Merge branch 'dev' of github.com:ChainSafe/ui-monorepo into feat/shar…
tanmoyAtb Nov 16, 2021
ef0762e
resolved with dev
tanmoyAtb Nov 16, 2021
f66a881
compile translations
tanmoyAtb Nov 16, 2021
0efe53d
Merge branch 'dev' into feat/share-from-browser-1631
tanmoyAtb Nov 16, 2021
a9c26fc
Merge branch 'dev' into feat/share-from-browser-1631
FSM1 Nov 17, 2021
97c0fda
added status checks
tanmoyAtb Nov 17, 2021
a5439a4
close instead of cancel
tanmoyAtb Nov 17, 2021
cc98395
Merge branch 'dev' into feat/share-from-browser-1631
FSM1 Nov 17, 2021
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
16 changes: 15 additions & 1 deletion packages/common-components/src/Button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,20 @@ const useStyles = makeStyles(
},
...overrides?.Button?.variants?.secondary?.root
},
text: {
backgroundColor: "transparent",
color: palette.additional["gray"][9],
"&:hover": {
...overrides?.Button?.variants?.text?.hover
},
"&:focus": {
...overrides?.Button?.variants?.text?.focus
},
"&:active": {
...overrides?.Button?.variants?.text?.active
},
...overrides?.Button?.variants?.text?.root
},
tertiary: {
backgroundColor: palette.additional["gray"][3],
color: palette.common.black.main,
Expand Down Expand Up @@ -293,7 +307,7 @@ interface IButtonProps extends Omit<ReactButton, "size"> {
className?: string
children?: ReactNode | ReactNode[]
fullsize?: boolean
variant?: "link" | "primary" | "secondary" |"tertiary" | "outline" | "dashed" | "danger"
variant?: "link" | "primary" | "secondary" |"tertiary" | "outline" | "dashed" | "danger" | "text"
iconButton?: boolean
size?: "large" | "medium" | "small"
type?: "button" | "submit" | "reset"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const useStyles = makeStyles(
root: {
cursor: "pointer",
display: "flex",
alignItems: "center",
...overrides?.CheckboxInput?.root
},
checkbox: {
Expand Down
1 change: 1 addition & 0 deletions packages/common-components/src/Modal/Modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const useStyles = makeStyles(
margin: "auto",
maxHeight: "100%",
overflow: "auto",
alignItems: "center",
"&.xs": {
width: `calc(100% - ${constants.generalUnit * 2}px)`,
maxWidth: breakpoints.width("xs"),
Expand Down
1 change: 0 additions & 1 deletion packages/common-components/src/SelectInput/SelectInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ const useStyles = makeStyles(
({ animation, constants, palette, overrides }: ITheme) =>
createStyles({
root: {
margin: 5,
display: "block",
...overrides?.SelectInput?.root
},
Expand Down
4 changes: 3 additions & 1 deletion packages/common-components/src/stories/Button.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ export const actionsData = {
onClick: action("onClickButton")
}

type VariantOption = "primary" | "secondary" | "tertiary" | "outline" | "dashed" | "danger" | undefined;
type VariantOption = "primary" | "secondary" | "tertiary" | "link" | "text" | "outline" | "dashed" | "danger" | undefined;
const variantOptions: VariantOption[] = [
"primary",
"outline",
"dashed",
"danger",
"link",
"text",
undefined
]

Expand Down
12 changes: 12 additions & 0 deletions packages/common-theme/src/Overrides/Button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ export interface IButtonOverride {
focus?: Record<string, any>
active?: Record<string, any>
}
link?: {
root?: Record<string, any>
hover?: Record<string, any>
focus?: Record<string, any>
active?: Record<string, any>
}
text?: {
root?: Record<string, any>
hover?: Record<string, any>
focus?: Record<string, any>
active?: Record<string, any>
}
}
state?: {
danger?: {
Expand Down
6 changes: 4 additions & 2 deletions packages/files-ui/src/Components/Elements/CustomModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const useStyles = makeStyles(({ constants, breakpoints }: CSFTheme) =>
},
inner: {
backgroundColor: constants.modalDefault.backgroundColor,
color: constants.modalDefault.color
color: constants.modalDefault.color,
width: "100%"
},
mobileStickyBottom: {
[breakpoints.down("md")]: {
Expand Down Expand Up @@ -51,7 +52,8 @@ const CustomModal = ({ className, children, injectedClass, mobileStickyBottom =
className={clsx(classes.root, className)}
injectedClass={{
closeIcon: clsx(classes.closeIcon, injectedClass?.closeIcon),
inner: clsx(classes.inner, mobileStickyBottom ? classes.mobileStickyBottom : undefined, injectedClass?.inner)
inner: clsx(classes.inner, mobileStickyBottom ? classes.mobileStickyBottom : undefined, injectedClass?.inner),
subModalInner: injectedClass?.subModalInner
}}
{...rest}
>
Expand Down
Loading