Skip to content

Commit

Permalink
Merge branch 'staging' into liao-frank/fix-fouc
Browse files Browse the repository at this point in the history
  • Loading branch information
@bruugey
bruugey authored Feb 27, 2024
2 parents 92bf8b6 + fb1a679 commit c4579f1
Show file tree
Hide file tree
Showing 4 changed files with 461 additions and 210 deletions.
6 changes: 2 additions & 4 deletions layouts/ComponentLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { palette } from '@leafygreen-ui/palette';
import { Tab, Tabs } from '@leafygreen-ui/tabs';
import { breakpoints, spacing } from '@leafygreen-ui/tokens';
import Tooltip from '@leafygreen-ui/tooltip';
import { H2 } from '@leafygreen-ui/typography';
import { H1 } from '@leafygreen-ui/typography';

const layout = css`
${mq({
Expand Down Expand Up @@ -218,9 +218,7 @@ function ComponentLayout({

<div className={mainContentStyle}>
<div className={cx([flexContainer, containerPadding])}>
<H2 as="h1" className={pageHeaderStyle}>
{displayName}
</H2>
<H1 className={pageHeaderStyle}>{displayName}</H1>
{isMobile && component && session && (
<ComponentLinks
component={component}
Expand Down
49 changes: 25 additions & 24 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,63 +31,64 @@
"@emotion/server": "^11.0.0",
"@emotion/styled": "^11.9.3",
"@faker-js/faker": "^8.0.0",
"@leafygreen-ui/a11y": "^1.4.11",
"@leafygreen-ui/badge": "^8.0.15",
"@leafygreen-ui/a11y": "^1.4.12",
"@leafygreen-ui/badge": "^8.1.0",
"@leafygreen-ui/banner": "^7.0.18",
"@leafygreen-ui/box": "^3.1.8",
"@leafygreen-ui/button": "^21.0.11",
"@leafygreen-ui/button": "^21.0.12",
"@leafygreen-ui/callout": "^9.0.18",
"@leafygreen-ui/card": "^10.0.6",
"@leafygreen-ui/checkbox": "^12.0.20",
"@leafygreen-ui/chip": "^1.0.0",
"@leafygreen-ui/code": "^14.2.18",
"@leafygreen-ui/combobox": "^7.0.1",
"@leafygreen-ui/confirmation-modal": "^5.0.8",
"@leafygreen-ui/combobox": "^7.2.0",
"@leafygreen-ui/confirmation-modal": "^5.0.9",
"@leafygreen-ui/copyable": "^8.0.22",
"@leafygreen-ui/date-picker": "^0.2.1",
"@leafygreen-ui/emotion": "^4.0.7",
"@leafygreen-ui/empty-state": "^1.0.14",
"@leafygreen-ui/expandable-card": "^3.0.22",
"@leafygreen-ui/expandable-card": "^3.0.23",
"@leafygreen-ui/form-footer": "^3.0.15",
"@leafygreen-ui/guide-cue": "^5.0.5",
"@leafygreen-ui/hooks": "^8.0.1",
"@leafygreen-ui/icon": "^11.25.1",
"@leafygreen-ui/hooks": "^8.1.1",
"@leafygreen-ui/icon": "^11.28.0",
"@leafygreen-ui/icon-button": "^15.0.19",
"@leafygreen-ui/info-sprinkle": "^1.0.2",
"@leafygreen-ui/inline-definition": "^6.0.14",
"@leafygreen-ui/leafygreen-provider": "^3.1.10",
"@leafygreen-ui/lib": "^13.1.0",
"@leafygreen-ui/loading-indicator": "^2.0.7",
"@leafygreen-ui/leafygreen-provider": "^3.1.11",
"@leafygreen-ui/lib": "^13.2.1",
"@leafygreen-ui/loading-indicator": "^2.0.8",
"@leafygreen-ui/logo": "^8.0.12",
"@leafygreen-ui/marketing-modal": "^4.1.2",
"@leafygreen-ui/marketing-modal": "^4.2.1",
"@leafygreen-ui/menu": "^23.0.0",
"@leafygreen-ui/modal": "^16.0.3",
"@leafygreen-ui/modal": "^16.0.4",
"@leafygreen-ui/mongo-nav": "^12.2.0",
"@leafygreen-ui/number-input": "^1.0.18",
"@leafygreen-ui/pagination": "^1.0.18",
"@leafygreen-ui/pagination": "^1.0.19",
"@leafygreen-ui/palette": "^4.0.8",
"@leafygreen-ui/password-input": "^1.0.16",
"@leafygreen-ui/pipeline": "^5.0.17",
"@leafygreen-ui/popover": "^11.2.0",
"@leafygreen-ui/popover": "^11.2.2",
"@leafygreen-ui/portal": "^5.0.3",
"@leafygreen-ui/radio-box-group": "^12.0.16",
"@leafygreen-ui/radio-group": "^10.2.3",
"@leafygreen-ui/radio-group": "^10.2.4",
"@leafygreen-ui/ripple": "^1.1.12",
"@leafygreen-ui/search-input": "^2.1.2",
"@leafygreen-ui/search-input": "^2.1.3",
"@leafygreen-ui/segmented-control": "^8.2.8",
"@leafygreen-ui/select": "^11.1.1",
"@leafygreen-ui/select": "^11.1.2",
"@leafygreen-ui/side-nav": "^14.1.0",
"@leafygreen-ui/skeleton-loader": "^1.1.2",
"@leafygreen-ui/split-button": "^1.0.10",
"@leafygreen-ui/stepper": "^3.2.9",
"@leafygreen-ui/table": "^12.1.4",
"@leafygreen-ui/table": "^12.4.1",
"@leafygreen-ui/tabs": "^11.1.13",
"@leafygreen-ui/text-area": "^8.0.20",
"@leafygreen-ui/text-input": "^12.1.24",
"@leafygreen-ui/toast": "^6.1.18",
"@leafygreen-ui/text-area": "^8.0.21",
"@leafygreen-ui/text-input": "^12.1.25",
"@leafygreen-ui/toast": "^6.1.20",
"@leafygreen-ui/toggle": "^10.0.17",
"@leafygreen-ui/tokens": "^2.2.0",
"@leafygreen-ui/tokens": "^2.3.0",
"@leafygreen-ui/tooltip": "^11.0.0",
"@leafygreen-ui/typography": "^18.0.1",
"@leafygreen-ui/typography": "^18.1.0",
"@lg-tools/cli": "^0.4.2",
"@lg-tools/storybook": "^0.3.1",
"@mdx-js/loader": "^2.1.0",
Expand Down
100 changes: 28 additions & 72 deletions styles/globals.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,62 +9,18 @@ import { css } from '@emotion/css';
const fontsURL = `${CDN}/fonts`;

export const globalStyles = EmotionReactCss`
@font-face {
font-family: 'Akzidenz';
font-weight: normal;
src: url('${fontsURL}/akzidgrostdreg.eot');
/* IE9 Compat Modes */
src: url('${fontsURL}/akzidgrostdreg.eot?#iefix')
format('embedded-opentype'),
/* Pretty Modern Browsers */ url('${fontsURL}/akzidgrostdreg.ttf')
format('truetype'),
/* Safari, Android, iOS */ url('${fontsURL}/akzidgrostdreg.svg#Akzidenz')
format('svg');
/* Legacy iOS */
}
@font-face {
font-family: 'Akzidenz';
font-weight: 600;
src: url('${fontsURL}/akzidgrostdmed.eot');
/* IE9 Compat Modes */
src: url('${fontsURL}/akzidgrostdmed.eot?#iefix')
format('embedded-opentype'),
/* IE6-IE8 */ url('${fontsURL}/akzidgrostdmed.woff') format('woff'),
/* Pretty Modern Browsers */ url('${fontsURL}/akzidgrostdmed.ttf')
format('truetype'),
/* Safari, Android, iOS */ url('${fontsURL}/akzidgrostdmed.svg#Akzidenz')
format('svg');
/* Legacy iOS */
}
@font-face {
font-family: 'Akzidenz';
font-weight: bold;
src: url('${fontsURL}/akzidgrostdmed.eot');
/* IE9 Compat Modes */
src: url('${fontsURL}/akzidgrostdmed.eot?#iefix')
format('embedded-opentype'),
/* IE6-IE8 */ url('${fontsURL}/akzidgrostdmed.woff') format('woff'),
/* Pretty Modern Browsers */ url('${fontsURL}/akzidgrostdmed.ttf')
format('truetype'),
/* Safari, Android, iOS */ url('${fontsURL}/akzidgrostdmed.svg#Akzidenz')
format('svg');
/* Legacy iOS */
}
/**
* Euclid
*/
/* Semibold */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Semibold-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-Semibold-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Semibold-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-Semibold-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Semibold.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-Semibold.ttf')
format('truetype');
font-weight: 700;
font-style: normal;
Expand All @@ -73,11 +29,11 @@ export const globalStyles = EmotionReactCss`
/* Semibold Italic */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-SemiboldItalic-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-SemiboldItalic-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-SemiboldItalic-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-SemiboldItalic-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-SemiboldItalic.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-SemiboldItalic.ttf')
format('truetype');
font-weight: 700;
font-style: italic;
Expand All @@ -86,11 +42,11 @@ export const globalStyles = EmotionReactCss`
/* Medium */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Medium-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-Medium-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Medium-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-Medium-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Medium.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-Medium.ttf')
format('truetype');
font-weight: 500;
font-style: normal;
Expand All @@ -99,11 +55,11 @@ export const globalStyles = EmotionReactCss`
/* Medium Italic */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-MediumItalic-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-MediumItalic-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-MediumItalic-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-MediumItalic-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-MediumItalic.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-MediumItalic.ttf')
format('truetype');
font-weight: 500;
font-style: italic;
Expand All @@ -112,11 +68,11 @@ export const globalStyles = EmotionReactCss`
/* Normal */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Regular-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-Regular-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Regular-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-Regular-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-Regular.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-Regular.ttf')
format('truetype');
font-weight: 400;
font-style: normal;
Expand All @@ -125,11 +81,11 @@ export const globalStyles = EmotionReactCss`
/* Italic */
@font-face {
font-family: 'Euclid Circular A';
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-RegularItalic-WebXL.woff')
src: url('${fontsURL}/euclid-circular/EuclidCircularA-RegularItalic-WebXL.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-RegularItalic-WebXL.woff2')
url('${fontsURL}/euclid-circular/EuclidCircularA-RegularItalic-WebXL.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/euclid-circular/EuclidCircularA-RegularItalic.ttf')
url('${fontsURL}/euclid-circular/EuclidCircularA-RegularItalic.ttf')
format('truetype');
font-weight: 400;
font-style: italic;
Expand All @@ -143,40 +99,40 @@ export const globalStyles = EmotionReactCss`
@font-face {
font-family: 'MongoDB Value Serif';
font-weight: 700;
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Bold.woff')
src: url('${fontsURL}/value-serif/MongoDBValueSerif-Bold.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Bold.woff2')
url('${fontsURL}/value-serif/MongoDBValueSerif-Bold.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Bold.ttf')
url('${fontsURL}/value-serif/MongoDBValueSerif-Bold.ttf')
format('truetype');
}
/* Medium */
@font-face {
font-family: 'MongoDB Value Serif';
font-weight: 500;
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Medium.woff')
src: url('${fontsURL}/value-serif/MongoDBValueSerif-Medium.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Medium.woff2')
url('${fontsURL}/value-serif/MongoDBValueSerif-Medium.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Medium.ttf')
url('${fontsURL}/value-serif/MongoDBValueSerif-Medium.ttf')
format('truetype');
}
/* Normal */
@font-face {
font-family: 'MongoDB Value Serif';
font-weight: 400;
src: url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Regular.woff')
src: url('${fontsURL}/value-serif/MongoDBValueSerif-Regular.woff')
format('woff'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Regular.woff2')
url('${fontsURL}/value-serif/MongoDBValueSerif-Regular.woff2')
format('woff2'),
url('https://d2va9gm4j17fy9.cloudfront.net/fonts/value-serif/MongoDBValueSerif-Regular.ttf')
url('${fontsURL}/value-serif/MongoDBValueSerif-Regular.ttf')
format('truetype');
}
html {
font-family: 'Euclid Circular A', 'Akzidenz', 'Helvetica Neue', Helvetica,
font-family: 'Euclid Circular A', 'Helvetica Neue', Helvetica,
Arial, sans-serif;
font-weight: normal;
font-style: normal;
Expand Down
Loading

0 comments on commit c4579f1

Please sign in to comment.