Skip to content

Commit

Permalink
Merge pull request #372 from act-org/ic-3759
Browse files Browse the repository at this point in the history 
feat: Add Museo Sans to themeEncouraClassic
  • Loading branch information
@annaPerdomo
annaPerdomo authored Feb 22, 2024
2 parents 52a19d4 + 5918d43 commit 85576f3
Show file tree
Hide file tree
Showing 32 changed files with 85 additions and 104 deletions.
33 changes: 7 additions & 26 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,38 +137,19 @@ reference in the `head` of your React app:
/>
```

#### Museo
#### Museo Sans

The `ENCOURA_CLASSIC` theme assumes that the
[Museo](https://github.com/act-org/dls/tree/master/public/fonts/Museo) font
is available in the browser. Therefore, it is recommended that you include the
following font reference in the `head` of your React app:
[Museo Sans](https://fonts.adobe.com/fonts/museo-sans) font
is available in the browser. Include this embed code in the `head`
of your React app after obtaining the licensed font URL from Marketing:

```html
<style type="text/css">
@font-face {
font-family: 'Museo';
src: url('path/to/Museo300.otf');
font-style: normal;
font-weight: 300;
}
@font-face {
font-family: 'Museo';
src: url('path/to/Museo500.otf');
font-style: normal;
font-weight: 500;
}
@font-face {
font-family: 'Museo';
src: url('path/to/Museo700.otf');
font-style: normal;
font-weight: 700;
}
<style>
@import url("licensed-font-url");
</style>
```

The Museo font files can be downloaded
[here](https://github.com/act-org/dls/tree/main/public/fonts/Museo).
```

#### Work Sans, Roboto, Roboto Mono

Expand Down
Binary file removed public/fonts/Museo/Museo300.otf
View file
Binary file not shown.
Binary file removed public/fonts/Museo/Museo500.otf
View file
Binary file not shown.
Binary file removed public/fonts/Museo/Museo700.otf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions src/components/Alert/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ exports[`Alert ACT_ET theme matches the snapshot 1`] = `
exports[`Alert ENCOURA_CLASSIC theme matches the snapshot 1`] = `
<div>
<div
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiAlert-root MuiAlert-standardInfo MuiAlert-standard css-1pgvigm-MuiPaper-root-MuiAlert-root"
class="MuiPaper-root MuiPaper-elevation MuiPaper-rounded MuiPaper-elevation0 MuiAlert-root MuiAlert-standardInfo MuiAlert-standard css-8j40ql-MuiPaper-root-MuiAlert-root"
role="alert"
>
<div
Expand All @@ -95,7 +95,7 @@ exports[`Alert ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiAlert-message css-1pxa9xg-MuiAlert-message"
>
<div
class="MuiTypography-root MuiTypography-body1 MuiTypography-gutterBottom MuiAlertTitle-root css-1hza8ki-MuiTypography-root-MuiAlertTitle-root"
class="MuiTypography-root MuiTypography-body1 MuiTypography-gutterBottom MuiAlertTitle-root css-umsef6-MuiTypography-root-MuiAlertTitle-root"
>
Title Here
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/AppBarNavigation/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ exports[`AppBarNavigation ENCOURA_CLASSIC theme matches the snapshot 1`] = `
to="#"
>
<p
class="MuiTypography-root MuiTypography-body1 css-m6mbsq-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-1moh6tp-MuiTypography-root"
>
Home
</p>
Expand All @@ -145,7 +145,7 @@ exports[`AppBarNavigation ENCOURA_CLASSIC theme matches the snapshot 1`] = `
to="#"
>
<p
class="MuiTypography-root MuiTypography-body1 css-1s8y3wl-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-1oevd2i-MuiTypography-root"
>
Other Page
</p>
Expand Down
72 changes: 36 additions & 36 deletions src/components/DataTable/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,7 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableContainer-root css-rorn0c-MuiTableContainer-root"
>
<table
class="MuiTable-root css-1r654f9-MuiTable-root"
class="MuiTable-root css-1spjxp3-MuiTable-root"
>
<thead
class="MuiTableHead-root css-15wwp11-MuiTableHead-root"
Expand All @@ -797,12 +797,12 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-head css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-1slat08-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-14gr31a-MuiTableCell-root"
color="default"
style="width: 50px;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-60uqaa-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-et17tq-MuiTypography-root"
>
ID
</p>
Expand Down Expand Up @@ -837,12 +837,12 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
</div>
</td>
<td
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-1w1n898-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-7hfuf0-MuiTableCell-root"
color="default"
style="width: 100px;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-60uqaa-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-et17tq-MuiTypography-root"
>
Name
</p>
Expand Down Expand Up @@ -876,12 +876,12 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
</div>
</td>
<td
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-1w1n898-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-7hfuf0-MuiTableCell-root"
color="default"
style="width: 100px;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-60uqaa-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-et17tq-MuiTypography-root"
>
Field A
</p>
Expand Down Expand Up @@ -915,12 +915,12 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
</div>
</td>
<td
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-1w1n898-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-7hfuf0-MuiTableCell-root"
color="default"
style="width: 100px;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-60uqaa-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-et17tq-MuiTypography-root"
>
Field B
</p>
Expand Down Expand Up @@ -954,12 +954,12 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
</div>
</td>
<td
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-1w1n898-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-head MuiTableCell-sizeMedium css-7hfuf0-MuiTableCell-root"
color="default"
style="width: 100px;"
>
<p
class="MuiTypography-root MuiTypography-body1 css-60uqaa-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 css-et17tq-MuiTypography-root"
>
Field C
</p>
Expand Down Expand Up @@ -1001,31 +1001,31 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-hover css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 50px;"
>
1
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Item 1
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field A1
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field B1
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field C1
Expand All @@ -1035,31 +1035,31 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-hover css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 50px;"
>
2
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Item 2
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field A2
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field B2
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field C2
Expand All @@ -1069,31 +1069,31 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-hover css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 50px;"
>
3
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Item 3
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field A3
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field B3
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field C3
Expand All @@ -1103,31 +1103,31 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-hover css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 50px;"
>
4
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Item 4
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field A4
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field B4
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field C4
Expand All @@ -1137,31 +1137,31 @@ exports[`DataTable ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiTableRow-root MuiTableRow-hover css-1fmkmr6-MuiTableRow-root"
>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 50px;"
>
5
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Item 5
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field A5
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field B5
</td>
<td
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-1f3smm9-MuiTableCell-root"
class="MuiTableCell-root MuiTableCell-body MuiTableCell-paddingNone MuiTableCell-sizeMedium css-m8xboz-MuiTableCell-root"
style="width: 100px;"
>
Field C5
Expand Down
6 changes: 3 additions & 3 deletions src/components/EmptyState/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,19 @@ exports[`EmptyState ENCOURA_CLASSIC theme matches the snapshot 1`] = `
class="MuiGrid-root MuiGrid-item css-196vuex-MuiGrid-root"
>
<h6
class="MuiTypography-root MuiTypography-body1 MuiTypography-alignCenter css-lvvnln-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 MuiTypography-alignCenter css-1jh192w-MuiTypography-root"
>
Title
</h6>
</div>
</div>
<p
class="MuiTypography-root MuiTypography-body1 MuiTypography-alignCenter css-1q7qib5-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 MuiTypography-alignCenter css-1jc7zbu-MuiTypography-root"
>
Description
</p>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation css-1m9ygoa-MuiButtonBase-root-MuiButton-root"
class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-disableElevation css-1p2tnph-MuiButtonBase-root-MuiButton-root"
tabindex="0"
type="button"
>
Expand Down
2 changes: 1 addition & 1 deletion src/components/FormCheckbox/__snapshots__/index.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ exports[`FormCheckbox ENCOURA_CLASSIC theme matches the snapshot 1`] = `
/>
</span>
<span
class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-1ph3hqj-MuiTypography-root"
class="MuiTypography-root MuiTypography-body1 MuiFormControlLabel-label css-sdneuc-MuiTypography-root"
>
The label
</span>
Expand Down
Loading

0 comments on commit 85576f3

Please sign in to comment.