Skip to content

Commit 2f9ce36

Browse files
authored
Merge pull request #2373 from oasisprotocol/mz/uil
Bump Oasis UI Library dependency
2 parents 180989a + 5cac131 commit 2f9ce36

5 files changed

Lines changed: 9 additions & 6 deletions

File tree

.changelog/2373.trivial.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump Oasis UI Library dependency

src/app/components/PageLayout/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const Footer: FC<FooterProps> = ({ scope, mobileSearchAction, enableMobil
3535
>
3636
<Typography variant="xsmall" textColor="muted" className="flex items-center gap-0.5 flex-wrap">
3737
<span className="whitespace-nowrap">{t('footer.mobileTitle')} |</span>
38-
<span className={cn(hasMobileAction && 'order-1 basis-full sm:order-none sm:basis-auto')}>
38+
<span className={cn(!!hasMobileAction && 'order-1 basis-full sm:order-none sm:basis-auto')}>
3939
<ReopenAnalyticsConsentButton />
4040
{!hasMobileAction && ' | '}
4141
</span>

src/styles/index.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ html {
66
scroll-behavior: smooth;
77
/* Don't scroll the target underneath sticky Header */
88
scroll-padding-top: 180px;
9-
/* TODO: Remove when Oasis UI library use variable fonts */
10-
font-family: 'Inter Variable', Helvetica, Arial, sans-serif;
11-
font-weight: 400;
12-
font-size: 1rem;
139
}
1410

1511
/** Use Inter for "…" instead of Roboto Mono. */

yarn.lock

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,6 +1721,11 @@
17211721
resolved "https://registry.yarnpkg.com/@fontsource-variable/inter/-/inter-5.2.6.tgz#014f41f5eec8d177cc296721ebbd91dad241cd0b"
17221722
integrity sha512-jks/bficUPQ9nn7GvXvHtlQIPudW7Wx8CrlZoY8bhxgeobNxlQan8DclUJuYF2loYRrGpfrhCIZZspXYysiVGg==
17231723

1724+
"@fontsource-variable/inter@^5.2.8":
1725+
version "5.2.8"
1726+
resolved "https://registry.yarnpkg.com/@fontsource-variable/inter/-/inter-5.2.8.tgz#29b11476f5149f6a443b4df6516e26002d87941a"
1727+
integrity sha512-kOfP2D+ykbcX/P3IFnokOhVRNoTozo5/JxhAIVYLpea/UBmCQ/YWPBfWIDuBImXX/15KH+eKh4xpEUyS2sQQGQ==
1728+
17241729
"@fontsource-variable/roboto-mono@^5.0.17":
17251730
version "5.0.17"
17261731
resolved "https://registry.yarnpkg.com/@fontsource-variable/roboto-mono/-/roboto-mono-5.0.17.tgz#293d600624b1fc1ca2d811c8bbf78b63b04883fe"
@@ -2047,6 +2052,7 @@
20472052
"@oasisprotocol/ui-library@file:./ui-library":
20482053
version "0.0.0"
20492054
dependencies:
2055+
"@fontsource-variable/inter" "^5.2.8"
20502056
"@hookform/resolvers" "^5.0.1"
20512057
"@radix-ui/react-accordion" "^1.2.8"
20522058
"@radix-ui/react-alert-dialog" "^1.1.11"

0 commit comments

Comments
 (0)