From 9d7818f3fad514d703c6c6106d3f4db0d0053a2a Mon Sep 17 00:00:00 2001
From: Simon Mayer <simon.mayer@onb.ac.at>
Date: Tue, 22 Nov 2022 16:32:28 +0100
Subject: [PATCH] Various graphical changes

---
 app/javascript/packs/application.scss         |  1 +
 app/javascript/packs/stylesheets/catalog.scss | 38 ++++++++++++++++++-
 app/views/dataset/_document.html.erb          |  9 ++++-
 .../named_entities/_named_entities.html.erb   |  4 +-
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/app/javascript/packs/application.scss b/app/javascript/packs/application.scss
index d3aad5f..744c9f1 100644
--- a/app/javascript/packs/application.scss
+++ b/app/javascript/packs/application.scss
@@ -14,6 +14,7 @@ $link-hover-color: darken($labs-green, 10%) !default;
 $component-active-bg: $labs-green;
 $card-color: black;
 $border-color: #69737e;
+$accordion-border-color: #afafaf;
 
 $fa-font-path: '../../../node_modules/@fortawesome/fontawesome-free/webfonts';
 
diff --git a/app/javascript/packs/stylesheets/catalog.scss b/app/javascript/packs/stylesheets/catalog.scss
index 1f8e54b..e836c7d 100644
--- a/app/javascript/packs/stylesheets/catalog.scss
+++ b/app/javascript/packs/stylesheets/catalog.scss
@@ -13,7 +13,7 @@
 // }
 /////////////////////////////////////////////
 
-////////////////// Catalog index //////////////////
+////////////////// Catalog index/show //////////////////
 .search_result {
   padding: 0.5em;
 }
@@ -27,6 +27,40 @@
 #canvas_wide_dates_histogram {
   height: 60vh;
 }
+
+.card .accordion {
+  .accordion-item:first-of-type {
+    border-radius: 0px;
+    .accordion-button {
+      border-radius: 0px;
+    }
+  }
+  ul {
+    margin: 0px;
+  }
+  .accordion-item {
+    h2 {
+      margin: 0px;
+    }
+    button.accordion-button {
+      margin: 0px;
+    }
+  }
+}
+
+.btn-group .btn {
+  margin: 0px;
+}
+
+.navbar-nav.ml-auto {
+  margin-left: auto;
+}
+
+:not(#newspaper-platform) {
+  .navbar .nav-link {
+    padding: 0.5rem 1rem;
+  }
+}
 ////////////////////////////////////////////
 
 ////////////////// Facets //////////////////
@@ -55,7 +89,7 @@ li.selected_constraint {
   border-style: solid;
   border-width: 1px;
   border-radius: 6px;
-  background-color: #b3c3c7;
+  // background-color: #d5e6eb;
 }
 #viewer_container {
   position: relative;
diff --git a/app/views/dataset/_document.html.erb b/app/views/dataset/_document.html.erb
index d8a067a..1f1b38e 100644
--- a/app/views/dataset/_document.html.erb
+++ b/app/views/dataset/_document.html.erb
@@ -28,8 +28,13 @@
         </div>
         <div class="col-4">
             <% if !highlight.nil? and !highlight.first.nil? %>
-                <%# highlight.first[1].each do |extract| %>
-                <p><%= highlight[0..250] + '...' unless doc.is_a?(Issue) %><%#= extract.gsub(/\n/, "<br/>").gsub("<br/><br/>", "<br/>").html_safe %></p>
+                <%# highlight.first[1].each do |extract| %><%#= extract.gsub(/\n/, "<br/>").gsub("<br/><br/>", "<br/>").html_safe %>
+                <p><%= if doc.is_a?(Article)
+                         highlight[0..250] + '...' 
+                       elsif doc.is_a?(CompoundArticle)
+                         highlight[0..250].gsub(/\\n/, " ").gsub(/"/, "") + '...'
+                       end %>
+                </p>
                 <%# end %>
             <% end %>
         </div>
diff --git a/app/views/named_entities/_named_entities.html.erb b/app/views/named_entities/_named_entities.html.erb
index ba437e7..bb5cf05 100644
--- a/app/views/named_entities/_named_entities.html.erb
+++ b/app/views/named_entities/_named_entities.html.erb
@@ -2,8 +2,8 @@
 <div class="accordion w-100">
     <% named_entities.keys.each do |ne_type| %>
         <div class="accordion-item">
-            <h2 class="accordion-header">
-                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#<%= ne_type %>_ne_collapse">
+            <h2 class="accordion-header m-0">
+                <button class="accordion-button collapsed my-0" type="button" data-bs-toggle="collapse" data-bs-target="#<%= ne_type %>_ne_collapse">
                     <%= t("newspapers.named_entity_type.#{ne_type}") %>
                     <div class="text-secondary ms-2">
                         <% nb_linked = named_entities[ne_type].keys.size %>
-- 
GitLab