Skip to content

Commit 0e5747f

Browse files
feat: Replace Equinor-Regular with Inter font (#62)
1 parent c20bfff commit 0e5747f

5 files changed

Lines changed: 608 additions & 608 deletions

File tree

apps/mobile-storybook/app/(tabs)/components/cell-detail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default function CellDetailScreen() {
2727
This is a detail screen that shows when you tap a navigation cell.
2828
</Typography>
2929
<View style={{ height: 32 }} />
30-
<Button title="Go Back" onPress={() => router.push('/cell')} />
30+
<Button title="Go Back" onPress={() => router.back()} />
3131
</View>
3232
</View>
3333
);
583 KB
Binary file not shown.

packages/components/src/components/Typography/Typography.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const themeStyles = EDSStyleSheet.create(
113113
const textStyle: TextStyle = {
114114
color: resolveColor(color, theme),
115115
...typography,
116-
fontFamily: resolveFontName(bold, italic, typography.fontFamily ?? "Equinor-Regular"),
116+
fontFamily: resolveFontName(bold, italic, typography.fontFamily ?? "Inter"),
117117
};
118118
return {
119119
text: textStyle,
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
import { FontSource, useFonts } from "expo-font";
22

3+
import { MaterialCommunityIcons } from "@expo/vector-icons";
34
import EquinorBold from "../assets/fonts/Equinor-Bold.otf";
45
import EquinorBoldItalic from "../assets/fonts/Equinor-BoldItalic.otf";
56
import EquinorItalic from "../assets/fonts/Equinor-Italic.otf";
67
import EquinorLight from "../assets/fonts/Equinor-Light.otf";
78
import EquinorLightItalic from "../assets/fonts/Equinor-LightItalic.otf";
89
import EquinorMedium from "../assets/fonts/Equinor-Medium.otf";
910
import EquinorMediumItalic from "../assets/fonts/Equinor-MediumItalic.otf";
10-
import EquinorRegular from "../assets/fonts/Equinor-Regular.otf";
11-
import { MaterialCommunityIcons } from "@expo/vector-icons";
11+
import Inter from "../assets/fonts/Inter.otf";
1212

1313
const fontMap = {
14-
...MaterialCommunityIcons.font,
15-
"Equinor-Bold": EquinorBold as FontSource,
16-
"Equinor-BoldItalic": EquinorBoldItalic as FontSource,
17-
"Equinor-Italic": EquinorItalic as FontSource,
18-
"Equinor-Light": EquinorLight as FontSource,
19-
"Equinor-LightItalic": EquinorLightItalic as FontSource,
20-
"Equinor-Medium": EquinorMedium as FontSource,
21-
"Equinor-MediumItalic": EquinorMediumItalic as FontSource,
22-
"Equinor-Regular": EquinorRegular as FontSource,
14+
...MaterialCommunityIcons.font,
15+
"Equinor-Bold": EquinorBold as FontSource,
16+
"Equinor-BoldItalic": EquinorBoldItalic as FontSource,
17+
"Equinor-Italic": EquinorItalic as FontSource,
18+
"Equinor-Light": EquinorLight as FontSource,
19+
"Equinor-LightItalic": EquinorLightItalic as FontSource,
20+
"Equinor-Medium": EquinorMedium as FontSource,
21+
"Equinor-MediumItalic": EquinorMediumItalic as FontSource,
22+
"Inter": Inter as FontSource,
2323
};
2424

2525
/**
@@ -28,6 +28,6 @@ const fontMap = {
2828
* @returns A tuple array of the loading state in addition to any potential errors caught during asset initialization.
2929
*/
3030
export const useEDS = () => {
31-
const isLoaded = useFonts(fontMap);
32-
return isLoaded;
31+
const isLoaded = useFonts(fontMap);
32+
return isLoaded;
3333
};

0 commit comments

Comments
 (0)