Skip to content

Updating Font to Inter #983

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

Merged
merged 2 commits into from
Aug 22, 2023
Merged

Updating Font to Inter #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33a2450
Updating Font to `Inter`
Aug 22, 2023
4ec04d9
Update changelog
Aug 22, 2023
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
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ dist
# Webpack files
demo/bundle.js

.DS_Store
.DS_Store

# Webstorm cache
.idea
4 changes: 2 additions & 2 deletions docs/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions docs/components/Changelog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ class Changelog extends React.Component {
<h1>Change Log</h1>

<h2>MX React Components V 8.0.0</h2>
<h3>8.5.0</h3>
<ul>
<li>Changing Font to Inter</li>
</ul>

<h3>8.4.4</h3>
<ul>
<li>Republish for change log</li>
Expand Down
2 changes: 1 addition & 1 deletion docs/components/DrawerDocs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ class DrawerDocs extends React.Component {
return {
content: {
padding: 60,
fontFamily: 'ProximaNovaRegular, Helvetica, Arial, sans-serif',
fontFamily: 'InterRegular, Helvetica, Arial, sans-serif',
color: '#2E323F'
},
unorderdLists: {
Expand Down
12 changes: 6 additions & 6 deletions docs/components/StylesDocs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ class StylesDocs extends React.Component {
</Markdown>

<h5>Fonts</h5>
<p>In order to leverage the ProximaNova fonts, you will need to include those fonts in your application using <Code>@font_face</Code> and make sure the names match.</p>
<p>In order to leverage the Inter fonts, you will need to include those fonts in your application using <Code>@font_face</Code> and make sure the names match.</p>

<Markdown lang='js'>
{`
Styles.Fonts.THIN // ProximaNovaThin, Helvetica, Arial, sans-serif
Styles.Fonts.LIGHT // ProximaNovaLight, Helvetica, Arial, sans-serif
Styles.Fonts.REGULAR // ProximaNovaRegular, Helvetica, Arial, sans-serif
Styles.Fonts.ITALIC // ProximaNovaRegularItalic, Helvetica, Arial, sans-serif
Styles.Fonts.SEMIBOLD // ProximaNovaSemibold, Helvetica, Arial, sans-serif
Styles.Fonts.THIN // InterRegular, Helvetica, Arial, sans-serif
Styles.Fonts.LIGHT // InterRegular, Helvetica, Arial, sans-serif
Styles.Fonts.REGULAR // InterRegular, Helvetica, Arial, sans-serif
Styles.Fonts.ITALIC // InterRegular, Helvetica, Arial, sans-serif
Styles.Fonts.SEMIBOLD // InterSemibold, Helvetica, Arial, sans-serif
`}
</Markdown>

Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mx-react-components",
"version": "8.4.4",
"version": "8.5.0",
"description": "A collection of generic React UI components",
"main": "dist/index.js",
"files": [
Expand Down
10 changes: 5 additions & 5 deletions src/constants/Style.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ const Style = {
},

Fonts: {
THIN: 'ProximaNovaThin, Helvetica, Arial, sans-serif',
LIGHT: 'ProximaNovaLight, Helvetica, Arial, sans-serif',
REGULAR: 'ProximaNovaRegular, Helvetica, Arial, sans-serif',
ITALIC: 'ProximaNovaRegularItalic, Helvetica, Arial, sans-serif',
SEMIBOLD: 'ProximaNovaSemibold, Helvetica, Arial, sans-serif'
THIN: 'InterRegular, Helvetica, Arial, sans-serif',
LIGHT: 'InterRegular, Helvetica, Arial, sans-serif',
REGULAR: 'InterRegular, Helvetica, Arial, sans-serif',
ITALIC: 'InterRegular, Helvetica, Arial, sans-serif',
SEMIBOLD: 'InterSemibold, Helvetica, Arial, sans-serif'
},

//Box Shadows
Expand Down