Merge pull request #2306 from Growstuff/dev

Hotfix, buttons on small screens
This commit is contained in:
Brenda Wallace
2019-12-03 22:36:09 +13:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -183,7 +183,7 @@ GEM
factory_bot_rails (5.1.1)
factory_bot (~> 5.1.0)
railties (>= 4.2.0)
faker (2.7.0)
faker (2.8.0)
i18n (>= 1.6, < 1.8)
faraday (0.17.1)
multipart-post (>= 1.2, < 3)

View File

@@ -1,6 +1,6 @@
- if crop.approved? && signed_in?
%ul.nav.crop-actions
%li.nav-item.dropdown.btn.btn-sm
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Add to garden
.dropdown-menu.dropdown-secondary
- current_member.gardens.active.each do |garden|
@@ -8,13 +8,13 @@
= garden.name
.dropdown-divider
= link_to 'add new garden', new_garden_path, class: 'dropdown-item'
%li.nav-item.dropdown.btn.btn-sm
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'} Record harvest
.dropdown-menu.dropdown-secondary
- PlantPart.all.each do |plant_part|
= link_to harvests_path(harvest: {crop_id: crop.id, plant_part_id: plant_part.id}), method: :post, class: 'dropdown-item' do
= plant_part.name
%li.nav-item.dropdown.btn.btn-sm
%li.nav-item.dropdown
%a.nav-link.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", role: "button", href: '#'}=t('buttons.save_seeds', crop_name: crop.name)
.dropdown-menu.dropdown-secondary
- Seed::TRADABLE_TO_VALUES.each do |trade|