Merge branch 'master' of git.library.upei.ca:code/lmmi_journal_theme

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "roblib/lmmi_journal_theme",
   "description": "Journal of LM Montgomery Studies theme, sub-theme of MagazinePlus",
-  "type": "drupal-theme",
+  "type": "drupal-custom-theme",
   "keywords": [
     "Drupal"
   ],

css_overrides.css

@@ -60,3 +60,15 @@ img.orcid_logo {
 	font-size: smaller;
 	line-height: 2;
 }
+.teaser-card__body .field--name-field-affiliation-string {
+	    display:none;
+}
+.field--name-field-journal-article-abstract {
+  background: #eee;
+  padding: .5em;
+  margin-bottom:1.5em;
+  p:last-child {
+
+    padding-bottom: 0;
+  }
+}

lmmi_journal.info.yml

@@ -1,8 +1,7 @@
 name: LMMI Journal
 type: theme
 description: Subtheme of Magazine Plus
-core: 8.x
+core_version_requirement: ^8 || ^9 || ^10
-core_version_requirement: ^8 || ^9
 # Defines the base theme
 base theme: magazineplus
 # Defines libraries group in which we can add css/js.
@@ -11,7 +10,7 @@ libraries:
   - lmmi_journal/global-scripts
   - lmmi_journal/fonts
 
-stylesheets-remove: 
+stylesheets-remove:
   - core/themes/stable/css/views/views.module.css
   - themes/custom/magazineplus_lmmi_journal/css/base/elements.css
   - core/assets/vendor/jquery.ui/themes/base/theme.css

templates/news_articles/news--hero.html.twig

@@ -1,7 +1,10 @@
+{% if not (node.field_article_highlight_image.isEmpty == true) and content.field_article_highlight_image is defined %}
 {% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
 <header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
-  <div  class="container article-info--wrapper">
+{% else %}
-
+<header class="no_image article-title-banner node__header paragraph-responsive-typography-enabled article-header">
+{% endif %}
+  <div class="container article-info--wrapper">
         {% block title_area %}
           {{ title_prefix }}
             <h1{{ title_attributes.addClass('article--title title') }}>
@@ -13,19 +16,8 @@
           {{ title_suffix }}
         {% endblock %}
   <section class="article-header--metadata">
-    <div class="left">
+    <div class="left"> </div>
-      {#<div class="article--contributor">#}
+    <div class="right"> </div>
-        {#Robert N. Drew#}
-      {#</div>#}
-      {#<div class="article--contributor__affiliation">University of Prince Edward Island</div>#}
-    </div>
-    <div class="right">
-      {#<div class="article--type">Article</div>#}
-      {#<div class="article--date-published">#}
-     {#Published September 20, 2018 #}
-      {#</div>#}
-    </div>
   </section>
   </div>
-
 </header>

templates/news_articles/news--hero.html.twig.old

@@ -0,0 +1,19 @@
+{% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
+<header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
+  <div class="container article-info--wrapper">
+        {% block title_area %}
+          {{ title_prefix }}
+            <h1{{ title_attributes.addClass('article--title title') }}>
+              {{ label }}
+            </h1>
+            <h1{{ title_attributes.addClass('article--title title sr-only') }}>
+              {{ label }}
+            </h1>
+          {{ title_suffix }}
+        {% endblock %}
+  <section class="article-header--metadata">
+    <div class="left"> </div>
+    <div class="right"> </div>
+  </section>
+  </div>
+</header>