From ca99caad546c8a80cfef3aa98a24a9e17ffc37f7 Mon Sep 17 00:00:00 2001 From: Mason Roberts Date: Thu, 7 Mar 2024 17:14:52 -0500 Subject: [PATCH 01/16] 499 org root part1 navbar (#500) * added line in gitignore to ignore bundle folder in vendor folder. removed ui code at bottom of registration/edit page to delete account. * added the bg-white css selector to the sections of org/root per figma file * modified Figma link in README to point to update * updated the figma link in README * set adopt link path back to registration * per git conversation, updated navbar, deleted org-nav, removed note in application.htm.erb --------- Co-authored-by: Mason Roberts --- app/assets/images/png/logo.png | Bin 0 -> 2628 bytes app/views/layouts/shared/_navbar.html.erb | 18 +++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 app/assets/images/png/logo.png diff --git a/app/assets/images/png/logo.png b/app/assets/images/png/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b999e948a3b7273876d7d5a036e262f344eac48d GIT binary patch literal 2628 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 mUj{NzV_E6|0000
- <%= link_to home_index_path, class: 'navbar-brand' do %> + <%= image_tag('png/logo.png', width: '40px', height: '35px', alt: 'Organization logo', + class: 'pe-2') %> + <%= link_to home_index_path, class: 'navbar-brand fw-bold text-black' do %> <%= Current.organization.name %> <% end %>
-
diff --git a/app/views/organizations/pets/tabs/partials/_application_status.html.erb b/app/views/organizations/pets/tabs/partials/_application_status.html.erb index 71f1d20e8..5a6e7fa5a 100644 --- a/app/views/organizations/pets/tabs/partials/_application_status.html.erb +++ b/app/views/organizations/pets/tabs/partials/_application_status.html.erb @@ -45,9 +45,9 @@ <% if params[:active_tab] == 'applications' || @applications_tab == true %> - <%= app.notes.truncate(10) %> + <%= app.notes&.truncate(10) %> <% else %> - <%= app.notes.truncate(30) %> + <%= app.notes&.truncate(30) %> <% end %>