Skip to content

Faqs to top navbar #155

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
mlwzrd merged 2 commits into from
Sep 13, 2025
Merged

Faqs to top navbar #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87ea980
merge conflict resolve
Sep 13, 2025
ae7d59d
move FAQ to top navbar
Sep 13, 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
27 changes: 16 additions & 11 deletions app/views/shared/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,24 @@
<%= image_tag("logo-color.png", class:"colored-logo") %>
<% end %>

<div class="navbar-text navbar-link">
<%= link_to workshops_path do %>
Workshops
<% end %>
</div>
<% if user_signed_in? %>
<div class="navbar-text navbar-link">
<%= link_to workshops_path do %>
Workshops
<% end %>
</div>

<div class="navbar-text navbar-link">
<%= link_to resources_path do %>
Resources
<% end %>
</div>
<div class="navbar-text navbar-link">
<%= link_to resources_path do %>
Resources
<% end %>
</div>

<% if user_signed_in? %>
<div class="navbar-text navbar-link">
<%= link_to faqs_path do %>
FAQ
<% end %>
</div>
<div class="navbar-text pull-right container-fluid">
<div class="dropdown">
<div class="dropdown-compoments pull-right">
Expand Down
6 changes: 0 additions & 6 deletions app/views/shared/_side_nav.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@
</li>
<% end %>
<% if user_signed_in? %>
<%= link_to faqs_path do %>
<li class="nav-item js-faq">
<i class="icon icon-faq"></i>
<span>FAQ</span>
</li>
<% end %>
<%= link_to contact_us_path(q: "adult") do %>
<li class="nav-item js-contact">
<i class="far fa-envelope icon"></i>
Expand Down