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

chore: Update font-sizes in DatabaseModal #19616

Merged
merged 2 commits into from
Apr 28, 2022
Merged

chore: Update font-sizes in DatabaseModal #19616

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b703a3
Remove hacky font-sizes
geido Apr 8, 2022
7d3a086
Merge branch 'master' of https://github.com/apache/superset into chor…
geido Apr 27, 2022
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
44 changes: 22 additions & 22 deletions superset-frontend/src/views/CRUD/data/database/DatabaseModal/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ export const StyledFormHeader = styled.header`
.helper-top {
padding-bottom: 0;
color: ${({ theme }) => theme.colors.grayscale.base};
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
margin: 0;
}

.helper-bottom {
padding-top: 0;
color: ${({ theme }) => theme.colors.grayscale.base};
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
margin: 0;
}

Expand Down Expand Up @@ -169,22 +169,22 @@ export const antDAlertStyles = (theme: SupersetTheme) => css`

.ant-alert-message {
color: ${theme.colors.info.dark2};
font-size: ${theme.typography.sizes.s + 1}px;
font-size: ${theme.typography.sizes.m}px;
font-weight: ${theme.typography.weights.bold};
}

.ant-alert-description {
color: ${theme.colors.info.dark2};
font-size: ${theme.typography.sizes.s + 1}px;
line-height: ${theme.gridUnit * 4}px;
font-size: ${theme.typography.sizes.m}px;
line-height: ${theme.gridUnit * 5}px;

a {
text-decoration: underline;
}

.ant-alert-icon {
margin-right: ${theme.gridUnit * 2.5}px;
font-size: ${theme.typography.sizes.l + 1}px;
font-size: ${theme.typography.sizes.l}px;
position: relative;
top: ${theme.gridUnit / 4}px;
}
Expand All @@ -203,15 +203,15 @@ export const antDErrorAlertStyles = (theme: SupersetTheme) => css`
margin: ${theme.gridUnit * 8}px ${theme.gridUnit * 4}px;
color: ${theme.colors.error.dark2};
.ant-alert-message {
font-size: ${theme.typography.sizes.s + 1}px;
font-size: ${theme.typography.sizes.m}px;
font-weight: ${theme.typography.weights.bold};
}
.ant-alert-description {
font-size: ${theme.typography.sizes.s + 1}px;
line-height: ${theme.gridUnit * 4}px;
font-size: ${theme.typography.sizes.m}px;
line-height: ${theme.gridUnit * 5}px;
.ant-alert-icon {
margin-right: ${theme.gridUnit * 2.5}px;
font-size: ${theme.typography.sizes.l + 1}px;
font-size: ${theme.typography.sizes.l}px;
position: relative;
top: ${theme.gridUnit / 4}px;
}
Expand Down Expand Up @@ -251,7 +251,7 @@ export const formHelperStyles = (theme: SupersetTheme) => css`
display: block;
padding: ${theme.gridUnit}px 0;
color: ${theme.colors.grayscale.light1};
font-size: ${theme.typography.sizes.s - 1}px;
font-size: ${theme.typography.sizes.s}px;
text-align: left;
}
`;
Expand Down Expand Up @@ -281,23 +281,23 @@ export const formStyles = (theme: SupersetTheme) => css`
}
.control-label {
color: ${theme.colors.grayscale.dark1};
font-size: ${theme.typography.sizes.s - 1}px;
font-size: ${theme.typography.sizes.s}px;
}
.helper {
color: ${theme.colors.grayscale.light1};
font-size: ${theme.typography.sizes.s - 1}px;
font-size: ${theme.typography.sizes.s}px;
margin-top: ${theme.gridUnit * 1.5}px;
}
.ant-tabs-content-holder {
overflow: auto;
max-height: 475px;
max-height: 480px;
}
`;

export const validatedFormStyles = (theme: SupersetTheme) => css`
label {
color: ${theme.colors.grayscale.dark1};
font-size: ${theme.typography.sizes.s - 1}px;
font-size: ${theme.typography.sizes.s}px;
margin-bottom: 0;
}
`;
Expand All @@ -314,7 +314,7 @@ export const StyledInputContainer = styled.div`

.control-label {
color: ${theme.colors.grayscale.dark1};
font-size: ${theme.typography.sizes.s - 1}px;
font-size: ${theme.typography.sizes.s}px;
margin-bottom: ${theme.gridUnit * 2}px;
}

Expand Down Expand Up @@ -444,7 +444,7 @@ export const TabHeader = styled.div`

.helper {
color: ${({ theme }) => theme.colors.grayscale.base};
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
margin: 0px;
}
`;
Expand All @@ -462,7 +462,7 @@ export const CreateHeaderSubtitle = styled.div`

export const EditHeaderTitle = styled.div`
color: ${({ theme }) => theme.colors.grayscale.light1};
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
text-transform: uppercase;
`;

Expand Down Expand Up @@ -541,7 +541,7 @@ export const SelectDatabaseStyles = styled.div`
.available {
margin: ${({ theme }) => theme.gridUnit * 4}px;
.available-label {
font-size: ${({ theme }) => theme.typography.sizes.l * 1.1}px;
font-size: ${({ theme }) => theme.typography.sizes.l}px;
font-weight: ${({ theme }) => theme.typography.weights.bold};
margin: ${({ theme }) => theme.gridUnit * 6}px 0;
}
Expand All @@ -552,12 +552,12 @@ export const SelectDatabaseStyles = styled.div`

.label-available-select {
text-transform: uppercase;
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
}

.control-label {
color: ${({ theme }) => theme.colors.grayscale.dark1};
font-size: ${({ theme }) => theme.typography.sizes.s - 1}px;
font-size: ${({ theme }) => theme.typography.sizes.s}px;
margin-bottom: ${({ theme }) => theme.gridUnit * 2}px;
}
`;
Expand All @@ -581,7 +581,7 @@ export const StyledCatalogTable = styled.div`
}

.gsheet-title {
font-size: ${({ theme }) => theme.typography.sizes.l * 1.1}px;
font-size: ${({ theme }) => theme.typography.sizes.l}px;
font-weight: ${({ theme }) => theme.typography.weights.bold};
margin: ${({ theme }) => theme.gridUnit * 10}px 0 16px;
}
Expand Down