Skip to content

feat: sync header with winglang site #436

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

Open
polamoros wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: sync header with winglang site #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a17fd77
feat: sync header with winglang site
polamoros Sep 22, 2023
6d6586b
Merge branch 'main' into feat-sync-header-with-winglang-site
polamoros Nov 14, 2023
1c69764
Merge branch 'main' into feat-sync-header-with-winglang-site
MarkMcCulloh Feb 7, 2024
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
35 changes: 35 additions & 0 deletions apps/playground/assets/fonts/GeneralSans/css/general-sans.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Binary file added apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot
View file
Open in desktop
Binary file not shown.
Binary file added apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added apps/playground/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2
View file
Open in desktop
Binary file not shown.
99 changes: 77 additions & 22 deletions apps/playground/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,89 @@
<head>
<!-- fullstory setup -->
<script>
window['_fs_host'] = 'fullstory.com';
window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
window['_fs_org'] = 'o-1CTP1V-na1';
window['_fs_namespace'] = 'FS';
(function(m,n,e,t,l,o,g,y){
if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src='https://'+_fs_script;
y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
g.anonymize=function(){g.identify(!!0)};
g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
g.log = function(a,b){g("log",[a,b])};
g.consent=function(a){g("consent",!arguments.length||a)};
g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
g.clearUserCookie=function(){};
g.setVars=function(n, p){g('setVars',[n,p]);};
g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
g._v="1.3.0";
})(window,document,window['_fs_namespace'],'script','user');
window["_fs_host"] = "fullstory.com";
window["_fs_script"] = "edge.fullstory.com/s/fs.js";
window["_fs_org"] = "o-1CTP1V-na1";
window["_fs_namespace"] = "FS";
(function (m, n, e, t, l, o, g, y) {
if (e in m) {
if (m.console && m.console.log) {
m.console.log(
'FullStory namespace conflict. Please set window["_fs_namespace"].',
);
}
return;
}
g = m[e] = function (a, b, s) {
g.q ? g.q.push([a, b, s]) : g._api(a, b, s);
};
g.q = [];
o = n.createElement(t);
o.async = 1;
o.crossOrigin = "anonymous";
o.src = "https://" + _fs_script;
y = n.getElementsByTagName(t)[0];
y.parentNode.insertBefore(o, y);
g.identify = function (i, v, s) {
g(l, { uid: i }, s);
if (v) g(l, v, s);
};
g.setUserVars = function (v, s) {
g(l, v, s);
};
g.event = function (i, v, s) {
g("event", { n: i, p: v }, s);
};
g.anonymize = function () {
g.identify(!!0);
};
g.shutdown = function () {
g("rec", !1);
};
g.restart = function () {
g("rec", !0);
};
g.log = function (a, b) {
g("log", [a, b]);
};
g.consent = function (a) {
g("consent", !arguments.length || a);
};
g.identifyAccount = function (i, v) {
o = "account";
v = v || {};
v.acctId = i;
g(o, v);
};
g.clearUserCookie = function () {};
g.setVars = function (n, p) {
g("setVars", [n, p]);
};
g._w = {};
y = "XMLHttpRequest";
g._w[y] = m[y];
y = "fetch";
g._w[y] = m[y];
if (m[y])
m[y] = function () {
return g._w[y].apply(this, arguments);
};
g._v = "1.3.0";
})(window, document, window["_fs_namespace"], "script", "user");
</script>

<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="./assets/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Wing Playground</title>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap" rel="stylesheet">
<link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap"
rel="stylesheet"
/>
<link
rel="stylesheet"
href="./assets/fonts/GeneralSans/css/general-sans.css"
/>
</head>
<body class="h-full flex flex-col bg-slate-50 dark:bg-[#293443]">
<div id="root" class="flex-1 max-h-full h-full"></div>
Expand Down
8 changes: 4 additions & 4 deletions apps/playground/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -80,8 +80,8 @@ module.exports = {
"2xs": "0.7rem",
},
screens: {
'small': '1200px',
'medium': '1400px',
small: "1200px",
medium: "1400px",
},
},
},
Expand Down
35 changes: 35 additions & 0 deletions apps/tour/assets/fonts/GeneralSans/css/general-sans.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
}
Binary file added apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.eot
View file
Open in desktop
Binary file not shown.
Binary file added apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff
View file
Open in desktop
Binary file not shown.
Binary file added apps/tour/assets/fonts/GeneralSans/fonts/GeneralSans-Regular.woff2
View file
Open in desktop
Binary file not shown.
114 changes: 85 additions & 29 deletions apps/tour/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,104 @@
<!-- appcues setup -->
<script type="text/javascript">
window.AppcuesSettings = {
enableURLDetection: true
enableURLDetection: true,
};
</script>
<script crossorigin="anonymous" src="https://fast.appcues.com/142894.js"></script>
<script
crossorigin="anonymous"
src="https://fast.appcues.com/142894.js"
></script>
<script type="text/javascript">
window.Appcues && window.Appcues.identify(
Date.now().toString()
)
window.Appcues && window.Appcues.identify(Date.now().toString());
</script>

<!-- fullstory setup -->
<script>
window['_fs_host'] = 'fullstory.com';
window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
window['_fs_org'] = 'o-1CTP1V-na1';
window['_fs_namespace'] = 'FS';
(function(m,n,e,t,l,o,g,y){
if (e in m) {if(m.console && m.console.log) { m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].');} return;}
g=m[e]=function(a,b,s){g.q?g.q.push([a,b,s]):g._api(a,b,s);};g.q=[];
o=n.createElement(t);o.async=1;o.crossOrigin='anonymous';o.src='https://'+_fs_script;
y=n.getElementsByTagName(t)[0];y.parentNode.insertBefore(o,y);
g.identify=function(i,v,s){g(l,{uid:i},s);if(v)g(l,v,s)};g.setUserVars=function(v,s){g(l,v,s)};g.event=function(i,v,s){g('event',{n:i,p:v},s)};
g.anonymize=function(){g.identify(!!0)};
g.shutdown=function(){g("rec",!1)};g.restart=function(){g("rec",!0)};
g.log = function(a,b){g("log",[a,b])};
g.consent=function(a){g("consent",!arguments.length||a)};
g.identifyAccount=function(i,v){o='account';v=v||{};v.acctId=i;g(o,v)};
g.clearUserCookie=function(){};
g.setVars=function(n, p){g('setVars',[n,p]);};
g._w={};y='XMLHttpRequest';g._w[y]=m[y];y='fetch';g._w[y]=m[y];
if(m[y])m[y]=function(){return g._w[y].apply(this,arguments)};
g._v="1.3.0";
})(window,document,window['_fs_namespace'],'script','user');
window["_fs_host"] = "fullstory.com";
window["_fs_script"] = "edge.fullstory.com/s/fs.js";
window["_fs_org"] = "o-1CTP1V-na1";
window["_fs_namespace"] = "FS";
(function (m, n, e, t, l, o, g, y) {
if (e in m) {
if (m.console && m.console.log) {
m.console.log(
'FullStory namespace conflict. Please set window["_fs_namespace"].',
);
}
return;
}
g = m[e] = function (a, b, s) {
g.q ? g.q.push([a, b, s]) : g._api(a, b, s);
};
g.q = [];
o = n.createElement(t);
o.async = 1;
o.crossOrigin = "anonymous";
o.src = "https://" + _fs_script;
y = n.getElementsByTagName(t)[0];
y.parentNode.insertBefore(o, y);
g.identify = function (i, v, s) {
g(l, { uid: i }, s);
if (v) g(l, v, s);
};
g.setUserVars = function (v, s) {
g(l, v, s);
};
g.event = function (i, v, s) {
g("event", { n: i, p: v }, s);
};
g.anonymize = function () {
g.identify(!!0);
};
g.shutdown = function () {
g("rec", !1);
};
g.restart = function () {
g("rec", !0);
};
g.log = function (a, b) {
g("log", [a, b]);
};
g.consent = function (a) {
g("consent", !arguments.length || a);
};
g.identifyAccount = function (i, v) {
o = "account";
v = v || {};
v.acctId = i;
g(o, v);
};
g.clearUserCookie = function () {};
g.setVars = function (n, p) {
g("setVars", [n, p]);
};
g._w = {};
y = "XMLHttpRequest";
g._w[y] = m[y];
y = "fetch";
g._w[y] = m[y];
if (m[y])
m[y] = function () {
return g._w[y].apply(this, arguments);
};
g._v = "1.3.0";
})(window, document, window["_fs_namespace"], "script", "user");
</script>

<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="./assets/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Learn Wing</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap" rel="stylesheet">
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&display=swap"
rel="stylesheet"
/>
<link
rel="stylesheet"
href="./assets/fonts/GeneralSans/css/general-sans.css"
/>
</head>
<body class="h-full flex flex-col bg-slate-50 dark:bg-[#293443]">
<div id="root" class="flex-1 max-h-full"></div>
Expand Down
6 changes: 3 additions & 3 deletions apps/tour/tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand All @@ -80,7 +80,7 @@ module.exports = {
"2xs": "0.7rem",
},
screens: {
'small': '1200px',
small: "1200px",
},
},
},
Expand Down
8 changes: 4 additions & 4 deletions packages/shared/src/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ export const Header = ({ tabs, size = "auto" }: HeaderProps) => {
return (
<div
className={classNames(
"flex items-center font-sans font-normal text-[#1c1e21] dark:text-[#2bd5c1]",
"flex items-center font-sans font-normal text-[#1c1e21] dark:text-[#f1f0f1]",
"h-[80px] w-full",
)}
>
<a
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]",
)}
>
<WingLogo className="h-[24px] w-[88px]" />
<WingLogo className="h-[23px] w-[138px] mr-[1px]" />
</a>

<div className="overflow-x-auto flex grow">
Expand All @@ -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]",
)}
>
Expand Down
Loading