Merge branch 'dev' into dependabot/bundler/oj-3.13.8

This commit is contained in:
Daniel O'Connor
2021-10-05 22:04:41 +10:30
committed by GitHub
6 changed files with 3 additions and 401 deletions

View File

@@ -92,7 +92,6 @@ submit the change with your pull request.
- André Aubin / [lambda2](https://github.com/lambda2)
- Martina Simicic / [simicic](https://github.com/simicic)
- Rowan Crawford / [wombleton](https://github.com/wombleton)
- Le-jun - [lejun](https://github.com/le-jun)
## Bots

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 155 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Binary file not shown.

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 156 KiB

View File

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 1014 KiB

View File

@@ -3,13 +3,13 @@
- if signed_in?
%li.nav-item
= link_to timeline_index_path, method: :get, class: 'nav-link text-white' do
= image_tag 'icons/notification.svg', alt: 'Timeline', class: 'img img-icon'
= image_tag 'icons/notification.svg', class: 'img img-icon'
%li.nav-item
= link_to member_gardens_path(current_member), class: 'nav-link text-white' do
= image_icon 'gardens', alt: 'My gardens'
= image_icon 'gardens'
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", href: "#", role: "button"}
= image_tag "icons/gardener.svg", alt: 'New record', class: 'img img-icon'
= image_tag "icons/gardener.svg", class: 'img img-icon'
= t('.record')
.dropdown-menu
= link_to new_planting_path, class: 'dropdown-item' do