wip 20

voc · Jan 17, 2025 · c184152 · c184152
1 parent d57b894
commit c184152
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/app/assets/stylesheets/frontend/pages/_list.scss b/app/assets/stylesheets/frontend/pages/_list.scss
@@ -63,7 +63,7 @@ body.page-list {
       float: right;
 
       &, a {
-        color: lighten(#333333, 25%);
+        color: var(--text-muted);
       }
     }
 

diff --git a/app/views/frontend/events/_event.html.haml b/app/views/frontend/events/_event.html.haml
@@ -1,4 +1,4 @@
 - cache([event.conference, event]) do
   .event-preview
     = render partial: 'frontend/shared/event_thumb', locals: { event: event }
-    = render partial: 'frontend/shared/event_metadata', locals: { event: event }
+    = render partial: 'frontend/shared/event_metadata', locals: { event: event, show_conference: false }
diff --git a/app/views/frontend/shared/_event_metadata.haml b/app/views/frontend/shared/_event_metadata.haml
@@ -26,4 +26,8 @@
       %span.icon.icon-eye
       = event.view_count
     %li.persons
-      = render partial: 'frontend/shared/event_persons', locals: { persons: event.persons }
+      = render partial: 'frontend/shared/event_persons', locals: { persons: event.persons }
+    - if show_conference && event.conference.present?
+      .conference
+        %a{href: conference_path(acronym: event.conference.acronym)}
+          = event.conference.title
diff --git a/app/views/frontend/shared/_event_with_conference.html.haml b/app/views/frontend/shared/_event_with_conference.html.haml
@@ -1,7 +1,4 @@
 - cache([event.conference, event], expires_in: 2.hours) do
   .event-preview.has-conference
     = render partial: 'frontend/shared/event_thumb', locals: { event: event }
-    = render partial: 'frontend/shared/event_metadata', locals: { event: event }
-    .conference
-      %a{href: conference_path(acronym: event.conference.acronym)}
-        = event.conference.title
+    = render partial: 'frontend/shared/event_metadata', locals: { event: event, show_conference: true }
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,7 @@ body.page-list { @@
           float: right;
           &, a {
-            color: lighten(#333333, 25%);
+            color: var(--text-muted);
           }
         }
@@ Expand Down @@