Skip to content
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

Reorder nav items for mobile and hide org name #1284

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Reorder nav items for mobile and hide org name #1284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions app/views/layouts/shared/_navbar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<nav class="navbar navbar-expand-lg bg-transparent shadow-none px-0 py-3">
<div class="container-fluid px-4">
<div class="d-flex gap-2">
<% if Current.organization.avatar.attached? %>
<%= image_tag Current.organization.avatar, alt: current_organization_name, title: current_organization_name, height: 30 %>
<% end %>

<%= link_to home_index_path, class: 'navbar-brand fw-bold text-black' do %>
<%= Current.organization.name %>
<% end %>
</div>

<div class="d-flex align-items-center order-lg-3">
<div>
<button class="navbar-toggler collapsed me-1" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-default3" aria-controls="navbar-default3" aria-expanded="false" aria-label="Toggle navigation">
Expand All @@ -30,6 +20,16 @@
<% end %>
</div>

<div class="d-flex gap-2">
<% if Current.organization.avatar.attached? %>
<%= image_tag Current.organization.avatar, alt: current_organization_name, title: current_organization_name, height: 30 %>
<% end %>

<%= link_to home_index_path, class: 'navbar-brand fw-bold text-black d-none d-sm-block' do %>
<%= Current.organization.name %>
<% end %>
</div>

<!-- Collapse -->
<div class="justify-content-end collapse navbar-collapse" id="navbar-default3">
<ul class="navbar-nav">
Expand Down
Loading