From e1744f0c5cc463809a28d5be7e91f2488274616c Mon Sep 17 00:00:00 2001 From: acon <101356372+acornitum@users.noreply.github.com> Date: Sat, 10 May 2025 17:49:24 -0400 Subject: [PATCH] edit topbar + doc margins --- app/views/landing/index.html.erb | 8 ++++---- app/views/launchpad/show.html.erb | 2 +- app/views/layouts/overview.html.erb | 4 ++-- app/views/overview/_sidebar.html.erb | 2 +- app/views/overview/show.html.erb | 5 ++++- app/views/shared/_topbar.html.erb | 24 ++++++++++++++---------- 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index 3986a63..c12bb53 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -62,7 +62,7 @@
-

Choose Your Track

+

Choose Your Track

Make as many projects as you want, as long as you finish designing your previous one!

@@ -83,7 +83,7 @@
-

Starter Projects

+

Starter Projects

If you're intimidated by the possibilites and unsure what to build - try one of our tutorials + get a kit to build it!

Plus, we'll also give you the tools - like a soldering iron - to build it with!

@@ -146,8 +146,8 @@
-

FAQ

-
+

FAQ

+
<%= render partial: "card", locals: { title: "Eligibility", content: "Anyone 18 or below in high school is welcome! If you're in middle school or a gap year student, check in with us at [email]. You will need to verify with ID when we send you your grant!" } %> <%= render partial: "card", locals: { title: "Are teams allowed for Highway projects?", content: "You are free to make the hardware project with a friend! However, you both need to make posts, and the grant will be shared between you two." } %> <%= render partial: "card", locals: { title: "Who's running this?", content: "A group of ~15 teenagers around the world! We're funded by Hack Club, a [503 non-profit who have had donations from x, y, z]." } %> diff --git a/app/views/launchpad/show.html.erb b/app/views/launchpad/show.html.erb index fb4a765..44f84f7 100644 --- a/app/views/launchpad/show.html.erb +++ b/app/views/launchpad/show.html.erb @@ -1,4 +1,4 @@ -
+

Starter projects

Don't know what to make? Want to dip your toes in? Choose one of these projects to start your adventure with hardware!

diff --git a/app/views/layouts/overview.html.erb b/app/views/layouts/overview.html.erb index a7bb373..9617f81 100644 --- a/app/views/layouts/overview.html.erb +++ b/app/views/layouts/overview.html.erb @@ -25,13 +25,13 @@
-
+
<%= render partial: "overview/sidebar" %>
<%= render "shared/topbar", class: "sticky top-0" %>
-
+
<%= yield %>
diff --git a/app/views/overview/_sidebar.html.erb b/app/views/overview/_sidebar.html.erb index edec48e..2f121cb 100644 --- a/app/views/overview/_sidebar.html.erb +++ b/app/views/overview/_sidebar.html.erb @@ -1,4 +1,4 @@ -
+
<%# link_to "Projects", projects_path, class: "#{current_page?(projects_path) ? 'bg-[#564CAD]' : 'hover:bg-[#564CAD]'} bg-[#2E2A54] p-2 rounded transition duration-100 block" %> diff --git a/app/views/overview/show.html.erb b/app/views/overview/show.html.erb index 67451ed..470822f 100644 --- a/app/views/overview/show.html.erb +++ b/app/views/overview/show.html.erb @@ -1 +1,4 @@ -<%= raw @content %> +
+ <%= raw @content %> +
+ diff --git a/app/views/shared/_topbar.html.erb b/app/views/shared/_topbar.html.erb index 66275e9..bae02fe 100644 --- a/app/views/shared/_topbar.html.erb +++ b/app/views/shared/_topbar.html.erb @@ -1,10 +1,12 @@ -
- -
- <%= link_to root_path do %> - <%= image_tag "logo.png", alt: "Logo", class: "max-h-[80px]" %> - <% end %> -
+
+ +
+ +
+ <%= link_to root_path do %> + <%= image_tag "logo.png", alt: "Logo", class: "max-h-[80px]" %> + <% end %> +
-
+
+
<%= link_to "Getting started", "/overview" %> <%= link_to "Starter projects", launchpad_path %> <%= link_to "Resources", root_path %> -
+
+
\ No newline at end of file