Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/components/ui/DaoCreator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ export const CustomFormikTextField = withStyles({
"& .MuiInputBase-root": {
textWeight: 300
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/ui/InputText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ const InputText = withStyles(theme => ({
opacity: 1
}
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none"
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/StyledTextField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const StyledTextField = styled(TextField)({
"& label.Mui-focused": {
color: "#fff"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottomColor: "#fff"
},
"& .MuiOutlinedInput-root": {
Expand All @@ -36,7 +36,7 @@ export const StyledTextField = styled(TextField)({
"& .MuiInputLabel-root": {
color: "rgba(255, 255, 255, 0.7)"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottomColor: "#ccc"
}
})
19 changes: 11 additions & 8 deletions src/modules/common/SmallButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ export const SmallButton = styled(Button)({
"transition": ".15s ease-out",
"textTransform": "capitalize",
"borderRadius": 8,
"backgroundColor": "#81feb7 !important",
"backgroundColor": "#81feb7",
"color": "#1c1f23",
"padding": "8px 16px",

"&$disabled": {
boxShadow: "none"
"&.Mui-disabled": {
boxShadow: "none",
backgroundColor: "#474E55",
color: "#7d8c8b"
},

"&:hover": {
boxShadow: "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
backgroundColor: "#62eda5 !important",
backgroundColor: "#62eda5",
transition: ".15s ease-in"
}
})
Expand All @@ -29,19 +31,20 @@ export const SmallButtonDialog = styled(Button)({
"transition": ".15s ease-out",
"textTransform": "capitalize",
"borderRadius": 8,
"backgroundColor": "#81feb7 !important",
"backgroundColor": "#81feb7",
"color": "#1c1f23",
"padding": "8px 16px",

"&$disabled": {
"&.Mui-disabled": {
boxShadow: "none",
backgroundColor: "#474E55 !important",
backgroundColor: "#474E55",
color: "#7d8c8b",
border: "none"
},

"&:hover": {
boxShadow: "0px 0px 7px -2px rgba(0, 0, 0, 0.2)",
backgroundColor: "#62eda5 !important",
backgroundColor: "#62eda5",
transition: ".15s ease-in"
}
})
6 changes: 3 additions & 3 deletions src/modules/creator/token/ui/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ export const CustomFormikTextField = withStyles({
"& .MuiInputBase-input": {
textAlign: "initial"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const StyledTextField = styled(TextField)(({ theme }) => ({
padding: 0,
cursor: "pointer"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none"
},
"& .MuiInput-underline:hover:not(.Mui-disabled):before": {
"& .MuiInput-root:hover:not(.Mui-disabled):before": {
borderBottom: "none"
}
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const StyledTextField = styled(TextField)(({ theme }) => ({
padding: 0,
cursor: "pointer"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none"
},
"& .MuiInput-underline:hover:not(.Mui-disabled):before": {
"& .MuiInput-root:hover:not(.Mui-disabled):before": {
borderBottom: "none"
}
}))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,13 @@ const CustomFormikTextField = withStyles({
"& .MuiInputBase-input": {
textAlign: "initial"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
}
}
Expand Down
11 changes: 4 additions & 7 deletions src/modules/explorer/components/FilterNFTDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,16 @@ const CustomTextField = withStyles({
"& .MuiInputBase-root": {
textWeight: 300
},
"& .MuiInput-underline": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:not(.Mui-disabled):before": {
"& .MuiInput-root:hover:not(.Mui-disabled):before": {
borderBottom: "none !important"
}
}
Expand Down
11 changes: 4 additions & 7 deletions src/modules/explorer/components/FiltersTokensDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,16 @@ const CustomTextField = withStyles({
"& .MuiInputBase-root": {
textWeight: 300
},
"& .MuiInput-underline": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:not(.Mui-disabled):before": {
"& .MuiInput-root:hover:not(.Mui-disabled):before": {
borderBottom: "none !important"
}
}
Expand Down
11 changes: 4 additions & 7 deletions src/modules/explorer/components/FiltersTransactionsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,16 @@ const CustomTextField = withStyles({
"& .MuiInputBase-root": {
textWeight: 300
},
"& .MuiInput-underline": {
"& .MuiInput-root:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:hover:before": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:after": {
borderBottom: "none !important"
},
"& .MuiInput-underline:hover:not(.Mui-disabled):before": {
"& .MuiInput-root:hover:not(.Mui-disabled):before": {
borderBottom: "none !important"
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/modules/explorer/components/ProposalActionsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ export type ProposalFormDefaultValues = RecursivePartial<Values>

// TODO: Move this to a shared component
const OptionContainer = styled(Grid)(({ theme }) => ({
"minHeight": 80,
"minHeight": 110,
"height": "100%",
"boxSizing": "border-box",
"background": theme.palette.primary.main,
"borderRadius": 8,
"padding": "35px 42px",
"padding": "28px 42px",
"marginBottom": 16,
"cursor": "pointer",
"height": 110,
"&:hover:enabled": {
background: theme.palette.secondary.dark,
scale: 1.01,
Expand Down
6 changes: 3 additions & 3 deletions src/modules/explorer/pages/DAOList/components/Searchbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const StyledInput = withStyles((theme: Theme) => ({
outline: "none"
}
},
"& .MuiInput-underline:before": {
"& .MuiInput-root:before": {
borderBottomColor: "transparent"
},
"& .MuiInput-underline:hover:before": {
"& .MuiInput-root:hover:before": {
borderBottomColor: "transparent"
},
"& .MuiInput-underline:after": {
"& .MuiInput-root:after": {
borderBottomColor: "transparent"
}
}
Expand Down
Loading
Loading