Skip to content

Commit

Permalink
Merge pull request #219 from zimmerman-team/feat/DX-1678
Browse files Browse the repository at this point in the history
feat: DX-1678 - update fonts fallback
  • Loading branch information
okorie2 authored Aug 27, 2024
2 parents 4d03ffb + 914ac07 commit db32d54
Show file tree
Hide file tree
Showing 81 changed files with 229 additions and 203 deletions.
8 changes: 4 additions & 4 deletions src/app/components/Dialogs/CookieDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ const BaseSnackbar = styled((props) => (
height: 32px;
}
& [class*="MuiTypography-root"] {
font-weight: bold;
font-weight: 400;
font-size: 18px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
> a {
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
}
}
Expand All @@ -54,7 +54,7 @@ const BaseSnackbar = styled((props) => (
& [class*="MuiSnackbarContent-action"] {
padding-left: 64px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
}
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ export default function ChartContainer(props: {
p:nth-of-type(1) {
color: #e75656;
text-align: center;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
font-size: 18px;
margin-top: 16px;
margin-bottom: 0;
}
p:nth-of-type(2) {
color: #e75656;
text-align: center;
font-family: "GothamNarrow-Book", sans-serif;
font-family: "GothamNarrow-Book", "Helvetica Neue", sans-serif;
font-size: 14px;
margin-top: 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Dialogs/EmbedChartDialog/copyButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default function CopyButton(props: {
align-items: center;
color: #fff;
text-transform: uppercase;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
font-size: 14px;
border: none;
outline: none;
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/Dialogs/EmbedChartDialog/embedOptions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default function EmbedOptions(props: {
<p
css={`
color: #231d2c;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
font-size: 16px;
margin: 0;
margin-bottom: 14px;
Expand All @@ -59,7 +59,7 @@ export default function EmbedOptions(props: {
<p
css={`
color: #231d2c;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 14px;
`}
>
Expand All @@ -84,7 +84,7 @@ export default function EmbedOptions(props: {
<p
css={`
color: #231d2c;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 14px;
`}
>
Expand All @@ -111,7 +111,7 @@ export default function EmbedOptions(props: {
height: 41px;
display: flex;
align-items: end;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 14px;
`}
>
Expand Down
8 changes: 5 additions & 3 deletions src/app/components/Dialogs/EmbedChartDialog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default function EmbedChartDialog(props: {
width: 73%;
> p {
color: #231d2c;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
font-size: 14px;
overflow: hidden;
text-overflow: ellipsis;
Expand Down Expand Up @@ -210,14 +210,16 @@ export default function EmbedChartDialog(props: {
margin: 0;
span:nth-of-type(1) {
color: #70777e;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue",
sans-serif;
font-size: 12px;
margin: 0;
line-height: 14.52px;
}
span:nth-of-type(2) {
color: #231d2c;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue",
sans-serif;
font-size: 12px;
margin: 0;
line-height: 14.52px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function LinkOptions(props: {
justify-content: center;
align-items: center;
p {
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 14px;
}
`}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function ShareContent(props: {
border-radius: 8px;
line-height: 16px;
background: #f5f5f7;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
color: #000;
font-size: 14px;
`}
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Dialogs/TourGuide/rowFrameIntro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default function RowFrameIntro(props: {
border-radius: 8px;
background: #231d2c;
color: #fff;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 12px;
font-style: normal;
font-weight: 350;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Dialogs/TourGuide/selectStructure.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function SelectStructure(props: {
border-radius: 8px;
background: #231d2c;
color: #fff;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-size: 12px;
font-style: normal;
font-weight: 350;
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Dialogs/TourGuide/tourEnd.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function TourEnd({
border-radius: 8px;
background: #231d2c;
color: #fff;
font-family: "GothamNarrow-Medium", sans-serif;
font-family: "GothamNarrow-Medium", "Helvetica Neue", sans-serif;
font-style: normal;
font-weight: 350;
line-height: 16px;
Expand Down
6 changes: 3 additions & 3 deletions src/app/components/Styled/tabs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const Tab = {
font-weight: ${(props) => (props.active ? "bold" : "normal")};
font-family: ${(props) =>
props.active ? "GothamNarrow-Bold" : "GothamNarrow-Book"},
sans-serif;
"Helvetica Neue", sans-serif;
::after {
content: "";
Expand All @@ -44,7 +44,7 @@ export const Tab = {
font-weight: ${(props) => (props.active ? "bold" : "normal")};
font-family: ${(props) =>
props.active ? "GothamNarrow-Bold" : "GothamNarrow-Book"},
sans-serif;
"Helvetica Neue", sans-serif;
::after {
content: "";
Expand All @@ -69,7 +69,7 @@ export const Tab = {
font-weight: ${(props) => (props.active ? "700" : "normal")};
font-family: ${(props) =>
props.active ? "GothamNarrow-Bold" : "GothamNarrow-Book"},
sans-serif;
"Helvetica Neue", sans-serif;
::after {
content: "";
Expand Down
2 changes: 1 addition & 1 deletion src/app/components/Table/Preview-table/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const previewTablecss = css`
height: 35px;
font-weight: 400;
font-size: 14px;
font-family: "GothamNarrow-Book";
font-family: "GothamNarrow-Book", "Helvetica Neue", sans-serif;
}
tr {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,8 @@ export function ChartSubheaderToolbar(props: Readonly<SubheaderToolbarProps>) {
<p
css={`
color: #70777e;
font-family: "GothamNarrow-Book", sans-serif;
font-family: "GothamNarrow-Book", "Helvetica Neue",
sans-serif;
font-size: 12px;
font-weight: 325;
margin: 0px;
Expand Down Expand Up @@ -401,7 +402,8 @@ export function ChartSubheaderToolbar(props: Readonly<SubheaderToolbarProps>) {
<p
css={`
color: #70777e;
font-family: "GothamNarrow-Book", sans-serif;
font-family: "GothamNarrow-Book", "Helvetica Neue",
sans-serif;
font-size: 12px;
font-weight: 325;
margin: 0px;
Expand Down Expand Up @@ -450,7 +452,8 @@ export function ChartSubheaderToolbar(props: Readonly<SubheaderToolbarProps>) {
css={`
color: #000;
font-family: "GothamNarrow-Book", sans-serif;
font-family: "GothamNarrow-Book", "Helvetica Neue",
sans-serif;
font-size: 12px;
font-style: normal;
font-weight: 325;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const styles = {
align-items: center;
height: 32px;
padding: 10px 20px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
gap: 10px;
outline: none;
border: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function ErrorComponent(props: {
font-size: 14px;
line-height: 20px;
font-weight: bold;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
text-align: center;
button {
outline: none;
Expand All @@ -44,7 +44,7 @@ export default function ErrorComponent(props: {
margin-top: 34px;
white-space: pre-line;
line-height: 11px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
}
`}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function WarningDialog(props: { isMappingValid: boolean }) {
font-size: 14px;
line-height: 20px;
font-weight: bold;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
text-align: center;
button {
outline: none;
Expand Down
50 changes: 25 additions & 25 deletions src/app/modules/chart-module/components/exporter/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,43 +13,43 @@ export const styles = {
flex-direction: row;
> input {
width: 140px;
height: 32px;
font-size 14px;
background: #fff;
padding-left: 16px;
border-style: none;
border-radius: 16px 0px 0px 16px;
width: 140px;
height: 32px;
font-size: 14px;
background: #fff;
padding-left: 16px;
border-style: none;
border-radius: 16px 0px 0px 16px;
}
> button {
color: #fff;
width: 60px;
height: 32px;
font-size 14px;
cursor: pointer;
border-style: none;
background: #262C34;
border-radius: 0px 16px 16px 0px;
color: #fff;
width: 60px;
height: 32px;
font-size: 14px;
cursor: pointer;
border-style: none;
background: #262c34;
border-radius: 0px 16px 16px 0px;
> svg {
top: -2px;
margin-left: 5px;
position: relative;
transition: all 0.2s ease-in-out;
transform: rotate(${open ? 0 : 180}deg);
> svg {
top: -2px;
margin-left: 5px;
position: relative;
transition: all 0.2s ease-in-out;
transform: rotate(${open ? 0 : 180}deg);
> path {
fill: #fff;
}
> path {
fill: #fff;
}
}
}
`,
downloadBtn: css`
color: #fff;
width: 120px;
height: 32px;
font-size 14px;
font-size: 14px;
cursor: pointer;
font-weight: bold;
border-style: none;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export function ChartToolBoxSteps(props: ChartToolBoxStepsProps) {
align-items: center;
justify-content: center;
font-size: 14px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
cursor: ${props.isClickable ? "pointer" : "not-allowed"};
/* pointer-events: ${props.isClickable ? "auto" : "none"}; */
:nth-child(1) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ export function ChartToolBoxChartType() {
font-size: 14px;
margin: 0px;
line-height: 20px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue",
sans-serif;
`}
>
{fChartType.label}
Expand Down Expand Up @@ -158,7 +159,8 @@ export function ChartToolBoxChartType() {
/>
<p
css={`
font-family: "GothamNarrow-Book", sans-serif;
font-family: "GothamNarrow-Book", "Helvetica Neue",
sans-serif;
font-size: 10px;
line-height: normal;
padding-bottom: 17px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ const NonStaticDimensionContainer = (props: {
<div
css={`
font-size: 14px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
color: #262c34;
`}
Expand Down Expand Up @@ -1058,7 +1058,7 @@ const StaticDimensionContainer = (props: { dimension: any }) => {
css={`
font-size: 14px;
color: #262c34;
font-family: "GothamNarrow-Bold", sans-serif; ;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
`}
>
{props.dimension.name}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ function ChartToolBoxSelectDataset(props: { deselectDataset: () => void }) {
margin-top: -8px;
color: #231d2c;
font-size: 14px;
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
}
> label {
Expand Down Expand Up @@ -203,7 +203,7 @@ const ConnectData = () => {
cursor: pointer;
}
p {
font-family: "GothamNarrow-Bold", sans-serif;
font-family: "GothamNarrow-Bold", "Helvetica Neue", sans-serif;
margin-bottom: 4px;
margin-top: -8px;
font-size: 14px;
Expand Down
Loading

0 comments on commit db32d54

Please sign in to comment.