Skip to content

move workshop link to top navbar #135

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

move workshop link to top navbar #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7fa83cd
move workshop link to top navbar
Sep 13, 2025
02327b4
move resources to top bar
Sep 13, 2025
8aa484f
Revert "move resources to top bar"
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
12 changes: 10 additions & 2 deletions app/assets/stylesheets/components/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@
}
}

.navbar-link {
display: flex;
align-items: center;
font-size: 20px;
a {
text-decoration: none;
}
}

.navbar-text {
cursor: pointer;
padding: 0;
Expand All @@ -95,10 +104,9 @@
}

@include full_desktop {
border-left: 1px solid white;
margin: -6px 0;
padding-top: 0;
padding-left: 5px;
padding-left: 20px;
}

.dropdown,
Expand Down
6 changes: 6 additions & 0 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,6 +11,12 @@
<%= 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 pull-right container-fluid">
<div class="dropdown">
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 @@ -10,12 +10,6 @@
<span>Dashboard</span>
</li>
<% end %>
<%= link_to workshops_path do %>
<li class="nav-item js-search">
<i class="icon icon-search"></i>
<span>Search Curriculum</span>
</li>
<% end %>

<% # Submit Report %>

Expand Down