Skip to content

Ada 233 #58

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
yzhoubk merged 3 commits into from
Jun 6, 2025
Merged

Ada 233 #58

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56bd3b8
Make landmarks be uniquely identifiabe
yzhoubk Jun 5, 2025
64dbd6f
Remove spaces from navbar erb
yzhoubk Jun 6, 2025
84f137d
remove role from search div
yzhoubk Jun 6, 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
29 changes: 14 additions & 15 deletions app/views/shared/_header_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@

<nav class="navbar navbar-expand-md border-bottom topbar" role="navigation">
<div class="container">
<%= link_to (image_tag 'geodata_logo_color.svg', {:"data-svg-fallback" => "#{image_path('geodata_logo.png')}", :alt => 'GeoData @ UC Berkeley'}), root_path %>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<nav class="navbar navbar-expand-md border-bottom topbar" role="navigation">
<div class="container">
<%= link_to (image_tag 'geodata_logo_color.svg', {:"data-svg-fallback" => "#{image_path('geodata_logo.png')}", :alt => 'GeoData @ UC Berkeley'}), root_path %>
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
<%= render 'shared/user_util_links' %>
<div class="collapse navbar-collapse justify-content-md-end" id="user-util-collapse">
<%= render 'shared/user_util_links' %>
</div>
</div>
</div>
</nav>

<div class="navbar-search navbar navbar-light bg-light" role="navigation">
<div class="container">
<%= render_search_bar %>
</div>
</div>
<div class="navbar-search navbar navbar-light bg-light">
<div class="container">
<%= render_search_bar %>
</div>
</div>