From 893ff2f26f5f927c44861232c1e55e2972649490 Mon Sep 17 00:00:00 2001 From: Nate Date: Mon, 20 Sep 2021 10:34:18 -0400 Subject: [PATCH] layout updates --- server/styles.css | 80 +++++++++++++++++----------- server/templates/error.hbs | 13 +++++ server/templates/home.hbs | 26 ++++----- server/templates/partials/layout.hbs | 8 +-- server/templates/team.hbs | 34 +++++++----- server/templates/updates.hbs | 9 ++-- 6 files changed, 107 insertions(+), 63 deletions(-) diff --git a/server/styles.css b/server/styles.css index 0232c1d2d6..aefea1c804 100644 --- a/server/styles.css +++ b/server/styles.css @@ -1,41 +1,61 @@ /* This file is compiled to /assets/styles/tailwind.css via script/tailwind */ -@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;0,600;1,100;1,300;1,600&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;0,600;1,100;1,300;1,600&display=swap"); @tailwind base; @tailwind components; @tailwind utilities; @layer base { - html { - font-size: 125%; - text-rendering: geometricPrecision; - } - h1 { - @apply text-4xl; - @apply tracking-tighter; - } - h2 { - @apply text-3xl; - @apply tracking-tighter; - } - h3 { - @apply text-2xl; - @apply tracking-tighter; - } - h4 { - @apply text-xl; - } -.underline, .hover\:underline:hover { - text-underline-offset: 4px; + html { + font-size: 125%; + text-rendering: geometricPrecision; + } + h1 { + @apply text-4xl; + @apply tracking-tighter; + } + h2 { + @apply text-3xl; + @apply tracking-tighter; + } + h3 { + @apply text-2xl; + @apply tracking-tighter; + } + h4 { + @apply text-xl; + } + + .underline, + .hover\:underline:hover { + text-underline-offset: 4px; + } + + @media screen and (min-width: 1124px) { + .text-columns-2 { + column-count: 2; + column-gap: 3rem; } - /* This fixes scrollbar jump */ - @media screen and (min-width: 960px) { - html { - margin-left: calc(100vw - 100%); - margin-right: 0; - } +} + + .text-columns-2 { + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + break-inside: avoid; + } + + .text-columns-2 p { + break-inside: avoid; + } + + /* This fixes scrollbar jump */ + @media screen and (min-width: 960px) { + html { + margin-left: calc(100vw - 100%); + margin-right: 0; } -} \ No newline at end of file + } +} diff --git a/server/templates/error.hbs b/server/templates/error.hbs index 6013b2de80..6b43f7a55a 100644 --- a/server/templates/error.hbs +++ b/server/templates/error.hbs @@ -4,4 +4,17 @@ Sorry, we encountered a {{status}} error: {{reason}}. + +
+
+

Sorry, we encountered a {{status}} error:

+

+ {{reason}} +

+

+ Try refreshing or going home. +

+
+
+ {{/layout}} \ No newline at end of file diff --git a/server/templates/home.hbs b/server/templates/home.hbs index 87b12ccd18..67ae72b3b8 100644 --- a/server/templates/home.hbs +++ b/server/templates/home.hbs @@ -1,18 +1,20 @@ {{#> layout }}
-

Meet Zed—A lightning fast code editor written natively in Rust.

-

- Level up your development process with: -

-

-

Early access to Zed will open up mid-2022 for small teams and individuals in our community.

- Read our story. +
+

Introducing Zed—A lightning fast code editor written natively in Rust.

+

+ Level up your development process with: +

    +
  • a lightning fast code editor
    • +
  • real time collaboration on any work tree
    • +
  • powerful code annotation tools
    • +
  • the ability to rewind time to any point
    • +
+

+

Early access to Zed will open up mid-2022 for small teams and individuals in our community.

+ Read our story. +
{{/layout}} \ No newline at end of file diff --git a/server/templates/partials/layout.hbs b/server/templates/partials/layout.hbs index 2724f37401..286baf5868 100644 --- a/server/templates/partials/layout.hbs +++ b/server/templates/partials/layout.hbs @@ -55,7 +55,7 @@ {{#if current_user}}
-

Insider Zone

+

Insiders

Updates @@ -67,9 +67,9 @@ {{#if current_user.is_admin }}
-

Admin Zone

+

Admin

- Admin + Users & Signups
{{/if}} @@ -78,7 +78,7 @@

@{{current_user.github_login}}

- +
diff --git a/server/templates/team.hbs b/server/templates/team.hbs index 1c0c5d0768..1f571a3f69 100644 --- a/server/templates/team.hbs +++ b/server/templates/team.hbs @@ -2,25 +2,33 @@

The Team

-
-
+
+
-

Nathan Sobo

-

Nathan joined GitHub in late 2011 to build the Atom text editor, and he led the Atom team until 2018.

+

Nathan Sobo

+
+

Nathan joined GitHub in late 2011 to build the Atom text editor, and he led the Atom team until 2018.

-

He also co-led development of Teletype for Atom, 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.

+

He also co-led development of Teletype for Atom, 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.

+ +

Github · Twitter

+
-
-

Antonio Scandurra

-

Antonio joined the Atom team in 2014 while still in university after his outstanding open source contributions caught the attention of the team.

+
+
+

Antonio Scandurra

+
+

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 Teletype for Atom 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 Ditto.

+

He later joined Nathan in architecting Teletype for Atom 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 Ditto.

+
+
diff --git a/server/templates/updates.hbs b/server/templates/updates.hbs index e1788dbbe8..9382ff2281 100644 --- a/server/templates/updates.hbs +++ b/server/templates/updates.hbs @@ -5,12 +5,13 @@ {{#if current_user}} {{#if releases}} -

Updates

+ {{!--

Updates

--}} {{#each releases}} -