diff --git a/app/views/producers/_filters.html.haml b/app/views/producers/_filters.html.haml index 283777cf09..c3809aba20 100644 --- a/app/views/producers/_filters.html.haml +++ b/app/views/producers/_filters.html.haml @@ -3,7 +3,7 @@ .small-12.medium-6.columns.text-right   -.row.animate-show.filter-row{"ng-show" => "filtersActive"} +.row.animate-show{"ng-show" => "filtersActive"} .small-12.columns .row.filter-box .small-12.columns diff --git a/app/views/shops/_filters.html.haml b/app/views/shops/_filters.html.haml index f3011a0a25..a460f28846 100644 --- a/app/views/shops/_filters.html.haml +++ b/app/views/shops/_filters.html.haml @@ -4,7 +4,7 @@ .row = render 'shared/components/filter_controls' -.row.animate-show.filter-row{"ng-show" => "filtersActive"} +.row.animate-show{"ng-show" => "filtersActive"} .small-12.columns .row.filter-box .small-12.large-9.columns diff --git a/app/webpacker/css/darkswarm/_shop-filters.scss b/app/webpacker/css/darkswarm/_shop-filters.scss index ca59784e9d..e4bceed102 100644 --- a/app/webpacker/css/darkswarm/_shop-filters.scss +++ b/app/webpacker/css/darkswarm/_shop-filters.scss @@ -161,13 +161,6 @@ } } -// filterSelectors directive provides a drop-down that can overlap -// content. Ensure that the dropdown appears above the content. -.filter-row { - position: relative; - z-index: 90; -} - .sticky-shop-filters-container { position: sticky; top: $topbar-height; diff --git a/spec/system/consumer/caching/darkswarm_caching_spec.rb b/spec/system/consumer/caching/darkswarm_caching_spec.rb index c853f41b24..e6c891a861 100644 --- a/spec/system/consumer/caching/darkswarm_caching_spec.rb +++ b/spec/system/consumer/caching/darkswarm_caching_spec.rb @@ -47,7 +47,7 @@ describe "Darkswarm data caching", js: true, caching: true do toggle_filters - within "#hubs .filter-row" do + within "#hubs .filter-box" do expect(page).to have_content taxon.name expect(page).to have_content property.presentation end @@ -64,7 +64,7 @@ describe "Darkswarm data caching", js: true, caching: true do visit shops_path # Wait for /shops page to load properly before checking for new timestamps - expect(page).to_not have_selector ".row.filter-row" + expect(page).to_not have_selector ".row.filter-box" taxon_timestamp2 = CacheService.latest_timestamp_by_class(Spree::Taxon) expect_cached "views/#{CacheService::FragmentCaching.ams_all_taxons[0]}" @@ -77,7 +77,7 @@ describe "Darkswarm data caching", js: true, caching: true do toggle_filters - within "#hubs .filter-row" do + within "#hubs .filter-box" do expect(page).to have_content "Changed Taxon" expect(page).to have_content "Changed Property" end