blacklight 7.4.2 → 7.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e934144a8f41701622a5173bbafbc5ed5e362035ab2b8e1385a44b62e1e9fb0e
-  data.tar.gz: 7f70a70e1cd8912173c85a4e6f75e5dc0616735a80ddaa1a92b3f8c8718bdca4
+  metadata.gz: 9494eb9f9c98dc35a06a369d93d30095cb05718427599f49c2179c3ab0d44456
+  data.tar.gz: fafdd89b5d4bf169f303e2673a7369b32b14894dfb983405cb37f556dcab1a3b
 SHA512:
-  metadata.gz: 60909c87a1875508abe174257d0d80448113d2e62a1dc66b65a382f8acf8f539b91e70439b9bb3f1ecd7d30c9ccc6136f2ea586711866eabd0d453244d4db6c3
-  data.tar.gz: c042494903310dfb577677e7b98aa82a4551c877beb2b1082dd6d356057f50e0539291e943118667b6f33b912f9600bd5841f8132e9dc19e32b7ffac7fa5957c
+  metadata.gz: 5011b8be264ee25f7b701e77e0e099add0f382d7f95e85123e53a6f2b215fe867b4bc5fdbb0ff02845c125fe0d89674f83750bb044650acdad103d6eb4fcb1ac
+  data.tar.gz: c772cdf8efef43a8c86c81b7ff445f5a7a6a7ab6ebdb8d6d2bac4654a558528522e6e76eec8e330996288f2e0d991fb531fb7852ded86c4bd8f0f69f0db53563

data/VERSION

@@ -1 +1 @@
-7.4.2
+7.5.0

data/app/assets/images/blacklight/list.svg

@@ -1 +1 @@
-<svg width="14" height="14" xmlns="http://www.w3.org/2000/svg"><circle cx="1" cy="1" r="1"/><circle cx="1" cy="5" r="1"/><circle cx="1" cy="9" r="1"/><circle cx="1" cy="13" r="1"/><path d="M4 8.5h9v1H4zM4 4.5h9v1H4zM4 .5h9v1H4zM4 12.5h9v1H4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7 7v2h14V7H7z"/><path d="M0 0h24v24H0z" fill="none"/></svg>

data/app/assets/images/blacklight/search.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 20 20"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/></svg>

data/app/assets/stylesheets/blacklight/_facets.scss

@@ -36,6 +36,13 @@
   }
 }
 
+.facets-header {
+  display: flex;
+  justify-content: space-between;
+  padding-bottom: 0.5rem;
+  padding-top: 0.5rem;
+}
+
 .facets-heading {
   @extend .h4;
   line-height: inherit;
@@ -132,8 +139,6 @@
 -------------------------------------------------- */
 
 .facet-pagination {
-  @extend .clearfix;
-
   &.top {
     padding: $modal-inner-padding;
   }

data/app/assets/stylesheets/blacklight/_icons.scss

@@ -1,35 +1,21 @@
-.blacklight-icons {
-  display: inline-flex;
-  height: $font-size-base;
-  width: $font-size-base;
-}
-
-.blacklight-icons svg {
-  height: 1rem;
-  width: 1rem;
-  top: .125rem;
-  position: relative;
-}
-
 @each $color, $value in $theme-colors {
   .btn-#{$color} {
     .blacklight-icons svg {
-      @include fill-yiq(theme-color($color));
+      fill: currentColor;
     }
   }
 
   .btn-outline-#{$color} {
     .blacklight-icons svg {
-      fill: $value;
+      fill: currentColor;
     }
+  }
+}
 
-    &.hover,
-    &:hover,
-    &:active,
-    &.active {
-      .blacklight-icons svg {
-        @include fill-yiq(theme-color($color));
-      }
-    }
+.btn.btn-icon {
+  padding: $btn-padding-y;
+  
+  &.btn-sm {
+    padding: $btn-padding-y-sm;
   }
 }

data/app/views/catalog/_facet_group.html.erb

@@ -2,7 +2,7 @@
 <% if has_facet_values? facet_field_names(groupname), @response %>
 <div id="facets<%= "-#{groupname}" unless groupname.nil? %>" class="facets sidenav facets-toggleable-md">
 
-  <div class="navbar">
+  <div class="facets-header">
     <h2 class="facets-heading">
       <%= groupname.blank? ? t('blacklight.search.facets.title') : t("blacklight.search.facets-#{groupname}.title") %>
     </h2>

data/app/views/catalog/_facet_pagination.html.erb

@@ -1,4 +1,4 @@
-<div class="prev_next_links btn-group float-md-left">
+<div class="prev_next_links btn-group">
   <%= link_to_previous_page @pagination, raw(t('views.pagination.previous')), params: search_state.to_h, param_name: blacklight_config.facet_paginator_class.request_keys[:page], class: 'btn btn-link', data: { blacklight_modal: "preserve" } do %>
     <span class="disabled btn btn-disabled"><%= raw(t('views.pagination.previous')) %></span>
   <% end %>
@@ -8,7 +8,7 @@
   <% end %>
 </div>
 
-<div class="sort-options btn-group float-md-right">
+<div class="sort-options btn-group">
   <% if @pagination.sort == 'index' -%>
     <span class="active az btn btn-outline-secondary"><%= t('blacklight.search.facets.sort.index') %></span>
     <%= link_to(t('blacklight.search.facets.sort.count'), @pagination.params_for_resort_url('count', search_state.to_h), class: "sort_change numeric btn btn-outline-secondary", data: { blacklight_modal: "preserve" }) %>

data/app/views/catalog/_sort_and_per_page.html.erb

@@ -1,4 +1,4 @@
-<div id="sortAndPerPage" class="sort-pagination clearfix">
+<div id="sortAndPerPage" class="sort-pagination d-md-flex justify-content-between">
   <%= render partial: "paginate_compact", object: @response if show_pagination? %>
-  <%= render_results_collection_tools wrapping_class: "search-widgets float-md-right" %>
+  <%= render_results_collection_tools wrapping_class: "search-widgets" %>
 </div>

data/app/views/catalog/_view_type_group.html.erb

@@ -3,7 +3,7 @@
   <span class="sr-only"><%= t('blacklight.search.view_title') %></span>
   <div class="view-type-group btn-group">
     <% document_index_view_controls.each do |view, config| %>
-      <%= link_to url_for(search_state.to_h.merge(view: view)), title: view_label(view), class: "btn btn-outline-secondary view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
+      <%= link_to url_for(search_state.to_h.merge(view: view)), title: view_label(view), class: "btn btn-outline-secondary btn-icon view-type-#{ view.to_s.parameterize } #{"active" if document_index_view_type == view}" do %>
         <%= render_view_type_group_icon view %>
         <span class="caption"><%= view_label(view) %></span>
       <% end %>

data/app/views/catalog/facet.html.erb

@@ -1,4 +1,4 @@
-<div class="facet-pagination top">
+<div class="facet-pagination top row justify-content-between">
   <%= render :partial=>'facet_pagination' %>
 </div>
 
@@ -18,8 +18,7 @@
 </div>
 
 <div class="modal-footer">
-
-  <div class="facet-pagination bottom">
+  <div class="facet-pagination bottom row justify-content-between">
     <%= render :partial=>'facet_pagination' %>
   </div>
 </div>

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blacklight-frontend",
-  "version": "7.2.0",
+  "version": "7.5.0",
   "description": "[![Build Status](https://travis-ci.org/projectblacklight/blacklight.png?branch=master)](https://travis-ci.org/projectblacklight/blacklight) [![Gem Version](https://badge.fury.io/rb/blacklight.png)](http://badge.fury.io/rb/blacklight) [![Coverage Status](https://coveralls.io/repos/github/projectblacklight/blacklight/badge.svg?branch=master)](https://coveralls.io/github/projectblacklight/blacklight?branch=master)",
   "main": "app/assets/javascripts/blacklight",
   "scripts": {

data/spec/features/facets_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe "Facets" do
 
     expect(page).to have_css('#facet-format', visible: false)
 
-    within('#facets .navbar') do
+    within('#facets .facets-header') do
       page.find('button.navbar-toggler').click
     end
 

data/spec/features/search_filters_spec.rb

@@ -170,7 +170,7 @@ RSpec.describe "Facets" do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .navbar') do
+    within('#facets .facets-header') do
       page.find('button.navbar-toggler').click
     end
 
@@ -182,7 +182,7 @@ RSpec.describe "Facets" do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .navbar') do
+    within('#facets .facets-header') do
       page.find('button.navbar-toggler').click
     end
 
@@ -196,7 +196,7 @@ RSpec.describe "Facets" do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .navbar') do
+    within('#facets .facets-header') do
       page.find('button.navbar-toggler').click
     end
 
@@ -210,7 +210,7 @@ RSpec.describe "Facets" do
     skip("Test passes locally but not on Travis.") if ENV['TRAVIS']
     visit root_path
 
-    within('#facets .navbar') do
+    within('#facets .facets-header') do
       page.find('button.navbar-toggler').click
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 7.4.2
+  version: 7.5.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -737,7 +737,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)