Skip to content

Fix bugs and general css improvements #2833

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

Merged
achen178 merged 5 commits into from
Nov 26, 2025
Merged

Fix bugs and general css improvements #2833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d15185
Increase specificity on testimonial logo styles
achen178 Nov 26, 2025
d03ed6e
Fix alt text for avatar photo
achen178 Nov 26, 2025
5f59cce
Update opengraph preview logo
achen178 Nov 26, 2025
9893892
Update footer responsiveness
achen178 Nov 26, 2025
e5dc65d
Responsive header and navigation menu
achen178 Nov 26, 2025
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
3 changes: 3 additions & 0 deletions app/assets/images/marketing_redesign/menu.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/thoughtbot_horizontal_default_red_on_light.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions app/assets/stylesheets/marketing_redesign/base/_layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ main {
.grid-full {
grid-column: 1 / -1;
}

@media screen and (max-width: 988px) {
main {
transition: transform var(--transition-timing--base)
var(--transition-duration--base);
}
header:has(input.menu-toggle:checked) + main {
Copy link
Copy Markdown
Contributor

@thoughtbot-summer thoughtbot-summer Nov 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice.

transform: translateX(22rem);
}
}
20 changes: 17 additions & 3 deletions app/assets/stylesheets/marketing_redesign/components/_footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ footer {
border-top: var(--border--footer);
display: flex;
font-size: var(--font-size--small);
gap: var(--space--x-large);
padding: var(--space--large) Max(var(--space--base), (100% - var(--container--large)) / 2);
gap: var(--space--medium) var(--space--x-large);
padding: var(--space--large) 0;
flex-direction: column;

.logo {
font-family: var(--font-family--body);
Expand All @@ -22,8 +23,9 @@ footer {

nav {
display: flex;
justify-content: space-between;
gap: var(--space--large);
margin-left: auto;
flex: 1;

ul {
--color--link: var(--color--footer-link);
Expand All @@ -43,3 +45,15 @@ footer {
}
}
}

@media screen and (min-width: 600px) {
footer {
flex-direction: row-reverse;
padding: var(--space--large)
Max(var(--space--base), (100% - var(--container--large)) / 2);

nav {
justify-content: flex-end;
}
}
}
128 changes: 123 additions & 5 deletions app/assets/stylesheets/marketing_redesign/components/_header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,49 @@
header {
height: 6rem;
}

.header-container {
align-items: baseline;
background-color: var(--color--background-base);
display: flex;
font-family: var(--font-family--heading);
font-size: var(--font-size--ui);
gap: var(--space--x-large);
padding: var(--space--base) Max(var(--space--base), (100% - var(--container--large)) / 2);
justify-content: space-between;
left: 0;
padding: 0 var(--space--base) var(--space--base) var(--space--base);
position: fixed;
top: 0;
width: 100%;
z-index: var(--z-index--ceiling);

label.menu-toggle,
.spacer {
display: inline-block;
height: var(--space--x-large);
padding: var(--space--small);
width: var(--space--x-large);
}

.spacer {
caret-color: transparent;
pointer-events: none;
}

input.menu-toggle {
display: none;
}

.logo {
color: var(--color--text-base);
display: inline-block;
font-family: var(--font-family--body);
font-size: var(--font-size--body);
text-decoration: none;
width: auto;

.subtitle {
display: none;
}

svg {
height: var(--font-size--300);
Expand All @@ -18,16 +53,25 @@ header {
}

nav {
background-color: var(--color--background-dark);
bottom: 0;
box-shadow: -8px 8px 37.6px -12px var(--color--gray-400) inset;
flex-grow: 1;
font-weight: var(--font-weight--extrabold);
height: calc(100vh - 60px);
left: -100%;
padding: var(--space--base);
position: fixed;
transition: left var(--transition-timing--base)
var(--transition-duration--base);

ul {
--color--link: var(--color--header-link);
--color--link-hover: var(--color--header-link-hover);

align-items: center;
align-items: flex-start;
display: flex;
gap: var(--space--medium);
flex-direction: column;
gap: var(--space--small);
margin: 0;
padding: 0;

Expand All @@ -40,6 +84,15 @@ header {
gap: var(--space--x-small);
text-decoration: none;

&:not(.button) {
padding: var(--space--small);
}

&.button--secondary {
background-color: transparent;
margin-block-start: var(--space--medium);
}

.icon--new-window {
height: calc(var(--font-size--ui) * (17 / 16));
position: relative;
Expand All @@ -51,3 +104,68 @@ header {
}
}
}

@media screen and (min-width: 988px) {
.header-container {
gap: var(--space--x-large);
padding: var(--space--base)
Max(var(--space--base), (100% - var(--container--large)) / 2);
input[type="checkbox"],
label.menu-toggle,
.spacer {
display: none;
}

.logo .subtitle {
display: inline;
}

nav {
background-color: transparent;
box-shadow: none;
flex-grow: 1;
font-weight: var(--font-weight--extrabold);
height: auto;
padding: 0;
position: static;

ul {
align-items: center;
flex-direction: row;
gap: var(--space--medium);
margin: 0;
padding: 0;

li {
list-style-type: none;

a {
align-items: center;
display: flex;
gap: var(--space--x-small);
text-decoration: none;

&.button--secondary {
margin-block-start: 0;

.icon--new-window {
height: calc(var(--font-size--ui) * (17 / 16));
position: relative;
top: calc((var(--font-size--ui) * (-1 / 16)) / 2);
width: auto;
}
}
}
}
}
}
}
}

@media screen and (max-width: 988px) {
.header-container {
input[type="checkbox"]:checked ~ nav {
left: 0;
}
}
}
16 changes: 8 additions & 8 deletions app/assets/stylesheets/marketing_redesign/components/_testimonial.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
flex-wrap: wrap;
gap: var(--space--base);
justify-content: center;
}

.logo {
opacity: 0.8;
scale: 0.7;
width: min-content;
.logo {
opacity: 0.8;
scale: 0.7;
width: min-content;
}
}

@media (min-width: 998px) {
Expand All @@ -75,9 +75,9 @@
.logo-container {
justify-content: space-between;
padding: var(--space--x-large);
}

.logo {
scale: 1;
.logo {
scale: 1;
}
}
}
2 changes: 1 addition & 1 deletion app/helpers/open_graph_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module OpenGraphHelper
def open_graph_tags
raw [
tag("meta", property: "og:image", content: image_url("ralph-gradient.png")),
tag("meta", property: "og:image", content: image_url("thoughtbot_horizontal_default_red_on_light.png")),
tag("meta", property: "og:url", content: url_for(only_path: false)),
tag("meta", property: "og:title", content: page_title)
].join("\n")
Expand Down
21 changes: 10 additions & 11 deletions app/views/layouts/marketing_redesign/_footer.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
<footer>
<div>
<span class="logo">
<%= inline_svg_tag("marketing/upcase-logo--small.svg") %>
<%= t("layouts.app_name_subtitle") %>
</span>

<p class="copyright"><%= t("layouts.copyright", current_year: Date.current.year) %></p>
</div>

<nav>
<div>
<%= t(".links_heading") %>
<strong><%= t(".links_heading") %></strong>
<ul>
<li>
<%= link_to(
Expand All @@ -22,7 +13,7 @@
</div>

<div>
<%= t(".resources_heading") %>
<strong><%= t(".resources_heading") %></strong>
<ul>
<li>
<%= link_to(
Expand All @@ -39,4 +30,12 @@
</ul>
</div>
</nav>
<div>
<span class="logo">
<%= inline_svg_tag("marketing/upcase-logo--small.svg") %>
<%= t("layouts.app_name_subtitle") %>
</span>

<p class="copyright"><%= t("layouts.copyright", current_year: Date.current.year) %></p>
</div>
</footer>
84 changes: 47 additions & 37 deletions app/views/layouts/marketing_redesign/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,50 @@
<header>
<span class="logo">
<%= inline_svg_tag("marketing/upcase-logo--small.svg") %>
<%= t("layouts.app_name_subtitle") %>
</span>
<div class="header-container">
<input type="checkbox" name="menu-toggle" id="menu-toggle" class="menu-toggle" aria-label="hamburger" aria-controls="menu" aria-expanded="false" >
<label class="menu-toggle" for="menu-toggle" id="hamburger" aria-hidden="true">
<%= inline_svg_tag("marketing_redesign/menu.svg") %>
</label>
<%= link_to(
{controller: "/marketing_redesign/home", action: :show},
class: "logo"
) do %>
<%= inline_svg_tag("marketing/upcase-logo--small.svg") %>
<span class="subtitle"><%= t("layouts.app_name_subtitle") %></span>
<% end %>
<span class="spacer"></span>

<nav>
<ul>
<li>
<%= link_to(
t(".nav.links.root"),
{controller: "/marketing_redesign/home", action: :show}
) %>
</li>
<li>
<%= link_to(
t(".nav.links.about_show"),
{controller: "/marketing_redesign/about", action: :show}
) %>
</li>
<li>
<%= link_to(
{controller: "/marketing", action: :show},
target: "_blank",
rel: "noopener"
) do %>
<%= t(".nav.links.root_marketing_show") %>
<%= inline_svg_tag("marketing_redesign/new_window.svg", class: "icon--new-window") %>
<% end %>
</li>
<li style="margin-left: auto;">
<%= link_to(
t(".nav.links.contacts_new"),
{controller: "/marketing_redesign/opportunities", action: :new},
class: "button button--secondary"
) %>
</li>
</ul>
</nav>
<nav>
<ul>
<li>
<%= link_to(
t(".nav.links.root"),
{controller: "/marketing_redesign/home", action: :show}
) %>
</li>
<li>
<%= link_to(
t(".nav.links.about_show"),
{controller: "/marketing_redesign/about", action: :show}
) %>
</li>
<li>
<%= link_to(
{controller: "/marketing", action: :show},
target: "_blank",
rel: "noopener"
) do %>
<%= t(".nav.links.root_marketing_show") %>
<%= inline_svg_tag("marketing_redesign/new_window.svg", class: "icon--new-window") %>
<% end %>
</li>
<li style="margin-left: auto;">
<%= link_to(
t(".nav.links.contacts_new"),
{controller: "/marketing_redesign/opportunities", action: :new},
class: "button button--secondary"
) %>
</li>
</ul>
</nav>
</div>
</header>
2 changes: 1 addition & 1 deletion app/views/marketing_redesign/home/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<q class="quote text-xl"><%= t("marketing_redesign.home.show.testimonials.quotes.patrick_cushing_quote_html") %></q>
<div class="author">
<div class="author-avatar">
<%= image_tag "marketing_redesign/patrick.png", alt: "Vimeo logo", class: "avatar" %>
<%= image_tag "marketing_redesign/patrick.png", alt: "Patrick Cushing wearing a green polo shirt and smiling", class: "avatar" %>
</div>
<div class="author-info">
<p class="author-name"><strong>Patrick Cushing</strong></p>
Expand Down
Loading