Detailed changes
@@ -7,12 +7,12 @@ module.exports = {
"Noto Color Emoji"
],
body: [
- "Spectral", "Constantia", "Lucida Bright", "Lucidabright", "Lucida Serif", "Lucida", "DejaVu Serif", "Bitstream Vera Serif",
- "Liberation Serif", "Georgia", "serif", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",
- "Noto Color Emoji"
+ "JetBrains Mono", "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono",
+ "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", "Apple Color Emoji", "Segoe UI Emoji",
+ "Segoe UI Symbol", "Noto Color Emoji"
],
mono: [
- "Inconsolata", "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono",
+ "JetBrains Mono", "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono",
"Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", "Courier New", "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol", "Noto Color Emoji"
],
@@ -1,6 +1,7 @@
/* This file is compiled to /assets/styles/tailwind.css via script/tailwind */
-@import url('https://fonts.googleapis.com/css2?family=Inconsolata:wght@400;700&family=Spectral:ital,wght@0,200;0,300;1,800&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Spectral:ital,wght@0,200;0,300;1,200;1,300&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100;0,300;1,100;1,300&display=swap');
@tailwind base;
@tailwind components;
@@ -23,4 +24,7 @@
@apply text-2xl;
@apply tracking-tighter;
}
+.underline, .hover\:underline:hover {
+ text-underline-offset: 4px;
+ }
}
@@ -1,7 +1,7 @@
{{#> layout }}
<div class="container mx-auto max-w-screen-md p-10 pt-20">
- <h1 class="text-white text-4xl font-extralight mb-10">Community</h1>
+ <h1 class="text-white text-4xl font-display font-extralight mb-10">Community</h1>
</div>
{{/layout}}
@@ -1,18 +1,18 @@
{{#> layout }}
-<div class="container mx-auto max-w-screen-md p-10 pt-20">
- <h1 class="text-white text-4xl font-extralight mb-10">Meet Zed—A lightning fast code editor written natively in Rust.</h1>
- <p class="text-xl leading-7">
+<div class="container mx-auto max-w-screen-md text-main p-10 pt-20">
+ <h1 class="text-white text-4xl font-display font-extralight mb-10">Meet Zed—A lightning fast code editor written natively in Rust.</h1>
+ <p class="leading-7">
Level up your development process with:
- <ul class="mt-2 ml-5 list-disc text-xl leading-7">
- <li>a lightning fast code editor</li>
+ <ul class="mt-2 ml-8 list-disc leading-8">
+ <li>a <a href="/tech#rust>" class="underline">lightning fast</a> code editor</li>
<li>real time collaboration on any work tree</li>
<li>powerful code annotation tools</li>
<li>the ability to rewind time to any point</li>
</ul>
</p>
- <p class="text-xl mt-10 leading-8">Early access to Zed will open up mid-2022 for small teams and individuals. Be the first in line.</p>
- <p class="text-xl mt-10 leading-7">Read our story.</p>
+ <p class="mt-5 leading-7">Early access to Zed will open up mid-2022 for small teams and individuals. Be the <a href="/community" class="underline">first to know</a>.</p>
+ <p class="mt-5 leading-7">Read <a href="/story>" class="underline">our story</a>.</p>
</div>
{{/layout}}
@@ -22,42 +22,29 @@
</script>
</head>
-<body class="box-border font-body bg-black flex w-full h-full overflow-hidden p-10">
- <main class="flex-1 flex text-gray-50 border border-white">
- <nav class="flex-initial flex flex-col w-1/5 p-10 border-r border-white">
+<body class="box-border font-body text-main font-light bg-black flex w-full h-full overflow-hidden">
+ <main class="container mx-auto max-w-screen-2xl flex text-gray-50">
+ <nav class="flex-initial flex flex-col w-1/5 p-10 pt-20 font-extralight border-r border-white">
<a href="/" class="font-display">
- <svg width="57" height="16" fill="none" xmlns="http://www.w3.org/2000/svg">
- <mask id="path-2-inside-1" fill="white">
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0ZM8 2C4.68629 2 2 4.68629 2 8C2 11.3137 4.68629 14 8 14C11.3137 14 14 11.3137 14 8C14 4.68629 11.3137 2 8 2Z" />
- </mask>
- <path
- d="M2 8C2 4.68629 4.68629 2 8 2V-2C2.47715 -2 -2 2.47715 -2 8H2ZM8 14C4.68629 14 2 11.3137 2 8H-2C-2 13.5228 2.47715 18 8 18V14ZM14 8C14 11.3137 11.3137 14 8 14V18C13.5228 18 18 13.5228 18 8H14ZM8 2C11.3137 2 14 4.68629 14 8H18C18 2.47715 13.5228 -2 8 -2V2ZM4 8C4 5.79086 5.79086 4 8 4V0C3.58172 0 0 3.58172 0 8H4ZM8 12C5.79086 12 4 10.2091 4 8H0C0 12.4183 3.58172 16 8 16V12ZM12 8C12 10.2091 10.2091 12 8 12V16C12.4183 16 16 12.4183 16 8H12ZM8 4C10.2091 4 12 5.79086 12 8H16C16 3.58172 12.4183 0 8 0V4Z"
- fill="white" mask="url(#path-2-inside-1)" />
- <path fill-rule="evenodd" clip-rule="evenodd"
- d="M5 5L11.75 5L7.4375 9.5H9.5L11 11H4.25L8.5625 6.5H6.5L5 5Z" fill="white" />
- <path
- d="M22.92 12.8L29.78 4.1H23.2V1.96H33.06V3.58L26.28 12.3H32.5C32.7267 12.3 32.8867 12.2867 32.98 12.26C33.0733 12.2333 33.16 12.18 33.24 12.1H33.44V12.3V14.42H22.92V12.8Z"
- fill="white" />
- <path
@@ -1,7 +1,10 @@
{{#> layout }}
<div class="container mx-auto max-w-screen-md p-10 pt-20">
- <h1 class="text-white text-4xl font-extralight mb-10">Our Story</h1>
+ <h1 class="text-white text-4xl font-display font-extralight mb-10">Our Story</h1>
+ <p class="mt-5 leading-7">We’re the team behind GitHub’s Atom text editor, and we’re building something new:</p>
+ <p class="mt-5 leading-7">Zed is a fully-native desktop code editor focused on high performance, clean design, and seamless collaboration.</p>
+ <p class="mt-5 leading-7">We’re in early development, but we’d like to build a small community of developers who care deeply about their tools and are willing to give us feedback.</p>
</div>
{{/layout}}
@@ -1,62 +1,37 @@
{{#> layout }}
-<div class="bg-white">
- <div class="container mx-auto py-12 px-8 md:px-12 lg:flex lg:flex-row">
- <div class="mb-16 lg:mb-0 lg:flex-1 lg:mr-8 xl:mr-16">
- <img src="https://github.com/nathansobo.png?size=200" class="mx-auto mb-4 h-28 rounded-full">
- <div>
- <a href="https://github.com/nathansobo"
- class="block text-center mb-4 font-display text-2xl font-bold whitespace-nowrap hover:underline">
- NATHAN SOBO
- </a>
- <div class="prose md:prose-lg lg:prose xl:prose-lg">
- Nathan joined GitHub in late 2011 to build the <a href="https://atom.io">Atom text editor</a>, and
- he led the Atom team until 2018. He also co-led development of <a
- href="https://teletype.atom.io">Teletype for Atom</a>, pioneering one of the first production
- uses of conflict-free replicated data types for collaborative text editing. He's been dreaming about
- building the world’s best text editor since he graduated from college, and is excited to finally
- have
- the knowledge, tools, and resources to achieve this vision.
- </div>
- </div>
- </div>
- <div class="mb-16 lg:mb-0 lg:flex-1 lg:mr-8 xl:mr-16">
- <img src="https://github.com/as-cii.png?size=200" class="mx-auto mb-4 h-28 rounded-full">
- <div>
- <a href="https://github.com/as-cii"
- class="block text-center mb-4 font-display text-2xl font-bold whitespace-nowrap hover:underline">
- ANTONIO SCANDURRA
- </a>
- <div class="prose md:prose-lg lg:prose xl:prose-lg">
- Antonio joined the Atom team in 2014 while still in university after his outstanding open source
- contributions caught the attention of the team. He later joined Nathan in architecting <a
- href="https://teletype.atom.io">Teletype for
- Atom</a> and researching the foundations of what has turned into Zed. For the last two years,
- he’s
- become an expert in distributed systems and conflict-free replicated data types through the
- development of a real-time, distributed, conflict-free database implemented in Rust for <a
- href="https://ditto.live">Ditto</a>.
- </div>
- </div>
- </div>
- <div class="mb-16 lg:mb-0 lg:flex-1">
- <img src="https://github.com/maxbrunsfeld.png?size=200" class="mx-auto mb-4 h-28 rounded-full">
- <div>
- <a href="https://github.com/maxbrunsfeld"
- class="block text-center mb-4 font-display text-2xl font-bold whitespace-nowrap hover:underline">
- MAX BRUNSFELD
- </a>
- <div class="prose md:prose-lg lg:prose xl:prose-lg">
- Max joined the Atom team in 2013 after working at Pivotal Labs. While driving Atom towards its 1.0
- launch during the day, Max spent nights and weekends building <a
- href="https://tree-sitter.github.io">Tree-sitter</a>, a blazing-fast and
- expressive incremental parsing framework that currently powers all code analysis at GitHub. Before
- leaving to start Zed, Max helped GitHub's semantic analysis team integrate Tree-sitter to support
- syntax highlighting and code navigation on <a href="https://github.com">github.com</a>.
- </div>
- </div>
- </div>
- </div>
+<div class="container mx-auto max-w-screen-md text-main p-10 pt-20">
+ <h1 class="hidden text-4xl font-display font-extralight mb-10">The Team</h1>
+
+ <article>
+ <h2 class="font-display font-extralight">Nathan Sobo</h2>
+ <p class="mt-4 leading-7">Nathan joined GitHub in late 2011 to build the <a href="https://atom.io" class="underline">Atom text editor</a>, and he led the Atom team until 2018.</p>
+
+ <p class="mt-4 leading-7">He also co-led development of <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a>, pioneering one of the first production uses of conflict-free replicated data types for collaborative text editing.</p>
+
+ <p class="mt-4 leading-7">He's been dreaming about building the world’s best text editor since he graduated from college, and is excited to finally have the knowledge, tools, and resources to achieve this vision.</p>
+ </article>
+
+ <article>
+ <h2 class="font-display font-extralight mt-10">Antonio Scandurra</h2>
+ <p class="mt-4 leading-7">Antonio joined the Atom team in 2014 while still in university after his outstanding open source contributions caught the attention of the team.</p>
+
+ <p class="mt-4 leading-7">He later joined Nathan in architecting <a href="https://teletype.atom.io" class="underline">Teletype for Atom</a> and researching the foundations of what has turned into Zed.</p>
+
+ <p class="mt-4 leading-7">For the last two years, he’s become an expert in distributed systems and conflict-free replicated data types through the development of a real-time, distributed, conflict-free database implemented in Rust for <a href="https://ditto.live" class="underline">Ditto</a>.</p>
+ </article>
+
+ <article>
+ <h2 class="font-display font-extralight mt-10">Max Brunsfeld</h2>
+ <p class="mt-4 leading-7">Max joined the Atom team in 2013 after working at Pivotal Labs. While driving Atom towards its 1.0 launch during the day, Max spent nights and weekends building <a href="https://tree-sitter.github.io" class="underline">Tree-sitter</a>, a blazing-fast and expressive incremental parsing framework that currently powers all code analysis at GitHub.</p>
+
+ <p class="mt-4 leading-7">Before leaving to start Zed, Max helped GitHub's semantic analysis team integrate Tree-sitter to support syntax highlighting and code navigation on <a href="https://github.com" class="underline">github.com</a>.</p>
+ </article>
+
+ <article>
+ <h2 class="font-display font-extralight mt-10">Nate Butler</h2>
+ <p class="mt-4 leading-7">wip</p>
+ </article>
</div>
{{/layout}}
@@ -1,7 +1,17 @@
{{#> layout }}
<div class="container mx-auto max-w-screen-md p-10 pt-20">
- <h1 class="text-white text-4xl font-extralight mb-10">The Tech</h1>
+ <h1 class="text-white text-4xl font-display font-extralight mb-10">The Tech</h1>
+
+ <h2 class="font-display mt-10">Rust – wip</h2>
+ <p>wip</p>
+
+ <h2 id="gpui" class="font-display mt-10">GPUI – <span class="italic">Laying the foundation for a generation of apps.</span></h2>
+ <p class="mt-5 leading-7">A GPU rendering library for rust apps, gpui is a brand new platform for creating lightning fast native apps that take full advantage of your local hardware.</p>
+ <p class="mt-5 leading-7">We’re building gpui and Zed in parallel, and expect to open gpui up for usage outside of it in the future.</p>
+
+ <h2 id="gpui" class="font-display mt-10">CRDT – The key to time travel.</h2>
+ <p class="mt-5 leading-7">One of the foundational elements of Zed is the ability...</p>
</div>
{{/layout}}