Do fewer overrides of Blacklight

samvera-deprecated · Sep 3, 2015 · 31a1eb5 · 31a1eb5
1 parent b2c33b8
commit 31a1eb5
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 66 deletions.
diff --git a/app/assets/stylesheets/curation_concerns/_curation_concerns.scss b/app/assets/stylesheets/curation_concerns/_curation_concerns.scss
@@ -9,4 +9,4 @@
 @import "curation_concerns/theme";
 @import "curation_concerns/typography";
 @import 'hydra-editor/multi_value_fields';
-@import 'curation_concerns/fileupload';
+@import 'curation_concerns/fileupload';
diff --git a/app/assets/stylesheets/curation_concerns/modules/search_results.scss b/app/assets/stylesheets/curation_concerns/modules/search_results.scss
@@ -3,8 +3,13 @@
 
 #documents .document {
   border-top: 1px solid $gray-lighter;
-  margin-top: 1em;
-  padding-top:.5em;
+  margin-top: $padding-base-vertical;
+  padding-top: $padding-base-vertical;
+
+  @extend .clearfix;
+  .document-title-heading {
+    @extend h5;
+  }
 
   &:before {
     //Overwrite blacklight
@@ -15,12 +20,6 @@
     margin-top:0;
     padding-top:0;
   }
-  .search-result-actions {
-    @include make-xs-column(8);
-    @include make-xs-column-offset(4);
-    @include make-sm-column(2);
-    @include make-sm-column-offset(0);
-  }
 
   .document-thumbnail {
     @include make-xs-column(4);

diff --git a/app/views/catalog/_document_list.html.erb b/app/views/catalog/_document_list.html.erb
@@ -1,5 +1,5 @@
 <h3 id="document-list-heading" class="accessible-hidden">List of files deposited in <%= t('curation_concerns.product_name') %> that match your search criteria</h3>
 <ol id="documents" class="container-fluid search-results-list" start="<%= document_counter_with_offset(0) %>" aria-labeled-by="document-list-heading">
   <%= render documents, as: :document %>
-</ul>
+</ol>
 
diff --git a/app/views/catalog/_index_default.html.erb b/app/views/catalog/_index_default.html.erb
diff --git a/app/views/catalog/_search_results.html.erb b/app/views/catalog/_search_results.html.erb
diff --git a/app/views/collections/_identifier_and_action.html.erb b/app/views/collections/_identifier_and_action.html.erb
diff --git a/lib/generators/curation_concerns/templates/catalog_controller.rb b/lib/generators/curation_concerns/templates/catalog_controller.rb
@@ -15,6 +15,7 @@ class CatalogController < ApplicationController
 
     config.index.thumbnail_method = :thumbnail_tag
     config.index.partials.delete(:thumbnail) # we render this inside _index_default.html.erb
+    config.index.partials += [:action_menu]
 
     # solr field configuration for document/show views
     # config.show.title_field = solr_name("title", :stored_searchable)