Merge branch 'master' into themed-panel-fixes

middlebury · Oct 4, 2024 · f0d7e18 · f0d7e18
2 parents c1cfac0 + ba1551a
commit f0d7e18
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/src/js/charts.tsx b/src/js/charts.tsx
@@ -370,7 +370,7 @@ class MiddChart {
 
     // add html legend
     const legend = this.chart.generateLegend() as string; // returned type for generatedLegend is wrong?
-    console.log(legend);
+    // console.log(legend);
     const legendtag = document.createElement('div');
     legendtag.innerHTML = legend;
 

diff --git a/src/templates/partials/event-teaser.twig b/src/templates/partials/event-teaser.twig
@@ -19,19 +19,32 @@
       </a>
     </h3>
     <time datetime="" class="d-block font-medium" aria-label="{{day}} at {{time}}">{{time}}</time>
-    <p class="f3 my-3">
-      {% set max_length = (i * 30) + 20 %}
+    <div class="f3 my-3 typography">
+      {# {% set max_length = (i * 30) + 20 %} #}
       {% set text =
-        'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet
+        '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet
       asperiores illum quas, voluptatum atque voluptas, animi ipsam magni sit
       quo quae ut fugit. Accusantium explicabo sunt laborum? Soluta, placeat
-      nisi.'
+      nisi.</p>
+      <ul>
+        <li>list item 1</li>
+        <li>list item 2</li>
+        <li>list item 3</li>
+        <li>list item 4</li>
+      </ul>
+      <ol>
+        <li>list item 1</li>
+        <li>list item 2</li>
+        <li>list item 3</li>
+        <li>list item 4</li>
+      </ol>'
       %}
+      {{ text }}
       {# naive example of truncate event text to 100 #}
-      {{ (text|striptags|length) > max_length
+      {# {{ (text|striptags|length) > max_length
         ? (text|striptags|slice(0, max_length)) ~ '...'
-        : text|striptags }}
-    </p>
+        : text|striptags }} #}
+    </div>
     <p class="f3 font-medium">
       McCone Irvine Auditorium
     </p>