diff --git a/apps/playground/assets/fonts/GeneralSans/css/general-sans.css b/apps/playground/assets/fonts/GeneralSans/css/general-sans.css new file mode 100644 index 00000000..d8c3241f --- /dev/null +++ b/apps/playground/assets/fonts/GeneralSans/css/general-sans.css @@ -0,0 +1,35 @@ +/** + * @license + * + * Font Family: General Sans + * Designed by: Frode Helland + * URL: https://www.fontshare.com/fonts/general-sans + * © 2023 Indian Type Foundry + * + * Font Styles: + * General Sans Variable(Variable font) + * General Sans Variable Italic(Variable font) + * General Sans Extralight + * General Sans Extralight Italic + * General Sans Light + * General Sans Light Italic + * General Sans Regular + * General Sans Italic + * General Sans Medium + * General Sans Medium Italic + * General Sans Semibold + * General Sans Semibold Italic + * General Sans Bold + * General Sans Bold Italic + * +*/ + +@font-face { + font-family: "GeneralSans-Regular"; + src: url("../fonts/GeneralSans-Regular.woff2") format("woff2"), + url("../fonts/GeneralSans-Regular.woff") format("woff"), + url("../fonts/GeneralSans-Regular.ttf") format("truetype"); + font-weight: 400; + font-display: swap; + font-style: normal; +} diff --git a/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot new file mode 100644 index 00000000..a1269dda Binary files /dev/null and b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot differ diff --git a/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf new file mode 100644 index 00000000..d970a994 Binary files /dev/null and b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf differ diff --git a/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff new file mode 100644 index 00000000..0dbc271b Binary files /dev/null and b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff differ diff --git a/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 new file mode 100644 index 00000000..2bc4672a Binary files /dev/null and b/apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 differ diff --git a/apps/playground/index.html b/apps/playground/index.html index da4eb8a9..d63d2c1b 100644 --- a/apps/playground/index.html +++ b/apps/playground/index.html @@ -3,34 +3,89 @@ Wing Playground - + +
diff --git a/apps/playground/tailwind.config.js b/apps/playground/tailwind.config.js index ede5ab78..3448ef93 100644 --- a/apps/playground/tailwind.config.js +++ b/apps/playground/tailwind.config.js @@ -63,10 +63,10 @@ module.exports = { "../../packages/shared/src/**/*.{vue,js,ts,jsx,tsx}", ], plugins: [require("@tailwindcss/typography")], - darkMode: 'class', + darkMode: "class", theme: { fontFamily: { - sans: ["IBM Plex Sans"], + sans: ["GeneralSans-Regular", "sans-serif"], }, extend: { colors: { @@ -80,8 +80,8 @@ module.exports = { "2xs": "0.7rem", }, screens: { - 'small': '1200px', - 'medium': '1400px', + small: "1200px", + medium: "1400px", }, }, }, diff --git a/apps/tour/assets/fonts/GeneralSans/css/general-sans.css b/apps/tour/assets/fonts/GeneralSans/css/general-sans.css new file mode 100644 index 00000000..d8c3241f --- /dev/null +++ b/apps/tour/assets/fonts/GeneralSans/css/general-sans.css @@ -0,0 +1,35 @@ +/** + * @license + * + * Font Family: General Sans + * Designed by: Frode Helland + * URL: https://www.fontshare.com/fonts/general-sans + * © 2023 Indian Type Foundry + * + * Font Styles: + * General Sans Variable(Variable font) + * General Sans Variable Italic(Variable font) + * General Sans Extralight + * General Sans Extralight Italic + * General Sans Light + * General Sans Light Italic + * General Sans Regular + * General Sans Italic + * General Sans Medium + * General Sans Medium Italic + * General Sans Semibold + * General Sans Semibold Italic + * General Sans Bold + * General Sans Bold Italic + * +*/ + +@font-face { + font-family: "GeneralSans-Regular"; + src: url("../fonts/GeneralSans-Regular.woff2") format("woff2"), + url("../fonts/GeneralSans-Regular.woff") format("woff"), + url("../fonts/GeneralSans-Regular.ttf") format("truetype"); + font-weight: 400; + font-display: swap; + font-style: normal; +} diff --git a/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot new file mode 100644 index 00000000..a1269dda Binary files /dev/null and b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot differ diff --git a/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf new file mode 100644 index 00000000..d970a994 Binary files /dev/null and b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf differ diff --git a/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff new file mode 100644 index 00000000..0dbc271b Binary files /dev/null and b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff differ diff --git a/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 new file mode 100644 index 00000000..2bc4672a Binary files /dev/null and b/apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2 differ diff --git a/apps/tour/index.html b/apps/tour/index.html index 737d9a09..a71588f3 100644 --- a/apps/tour/index.html +++ b/apps/tour/index.html @@ -4,48 +4,104 @@ - + Learn Wing - - - + + + +
diff --git a/apps/tour/tailwind.config.js b/apps/tour/tailwind.config.js index bed04b21..f896e85a 100644 --- a/apps/tour/tailwind.config.js +++ b/apps/tour/tailwind.config.js @@ -63,10 +63,10 @@ module.exports = { "../../packages/shared/src/**/*.{vue,js,ts,jsx,tsx}", ], plugins: [require("@tailwindcss/typography")], - darkMode: 'class', + darkMode: "class", theme: { fontFamily: { - sans: ["IBM Plex Sans"], + sans: ["GeneralSans-Regular", "sans-serif"], }, extend: { colors: { @@ -80,7 +80,7 @@ module.exports = { "2xs": "0.7rem", }, screens: { - 'small': '1200px', + small: "1200px", }, }, }, diff --git a/packages/shared/src/Header.tsx b/packages/shared/src/Header.tsx index 29b0c3e0..6324e420 100644 --- a/packages/shared/src/Header.tsx +++ b/packages/shared/src/Header.tsx @@ -13,7 +13,7 @@ export const Header = ({ tabs, size = "auto" }: HeaderProps) => { return (
@@ -21,11 +21,11 @@ export const Header = ({ tabs, size = "auto" }: HeaderProps) => { href="https://winglang.io/" rel="noreferrer" className={classNames( - "hover:text-slate-600 dark:hover:text-white mr-[16px] decoration-0", + "hover:text-slate-600 dark:hover:text-white mr-[16px] decoration-0 mb-[1px]", size === "auto" && "small:mr-[40px]", )} > - +
@@ -38,7 +38,7 @@ export const Header = ({ tabs, size = "auto" }: HeaderProps) => { "decoration-0", "px-[12px] py-[8px]", "text-[16px] leading-[20px]", - size === "auto" && "small:px-[24px] small:text-[17px]", + size === "auto" && "small:px-[24px] small:text-[14px]", "dark:text-[#f1f0f1]", )} > diff --git a/packages/shared/src/WingLogo.tsx b/packages/shared/src/WingLogo.tsx index e0525938..fe9f2510 100644 --- a/packages/shared/src/WingLogo.tsx +++ b/packages/shared/src/WingLogo.tsx @@ -1,8 +1,6 @@ import { forwardRef } from "react"; -type WingLogoProps = React.PropsWithoutRef< - React.SVGProps -> & { +type WingLogoProps = React.PropsWithoutRef> & { title?: string; titleId?: string; } & React.RefAttributes; @@ -11,21 +9,21 @@ export const WingLogo = forwardRef( ({ title, titleId, ...props }, svgRef) => { return ( - {title && {title}} - - - - - - - + + ); },