Fixed talk link, use theme colors for talks

FroMage · Jul 5, 2024 · 0f4aa18 · 0f4aa18
1 parent eb7f473
commit 0f4aa18
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 3 deletions.
diff --git a/src/main/resources/templates/tags/talk.html b/src/main/resources/templates/tags/talk.html
@@ -1,8 +1,8 @@
 <div class="talkDetails">
-    <div class="talkDetails__header">
+    <div class="talkDetails__header talkDetails__header--{talk.theme ? talk.theme.color.code : 'none'}">
         <div class="talkDetails__header--title">
             <div class="talkDetails__micro">
-                <div class="talkDetails__title"><a href="@{uri:Application.talk(talk.id)}">&laquo; {talk.title} &raquo;</a></div>
+                <div class="talkDetails__title"><a href="{uri:Application.talk(talk.id)}">&laquo; {talk.title} &raquo;</a></div>
             </div>
             {#if talk.speakers}
             <div class="talkDetails__speakers">
@@ -59,7 +59,7 @@
         {/if}
     </div>
     {#if talk.feedbackUrl}
-        <div class="talkDetails__footer">
+        <div class="talkDetails__footer talkDetails__footer--{talk.theme ? talk.theme.color.code : 'none'}"">
             <div class="talkDetails__feedback">
                 <a class="button button--white"
             href="{talk.feedbackUrl}"

diff --git a/src/main/resources/web/app/stylesheets/partials/_schedule.scss b/src/main/resources/web/app/stylesheets/partials/_schedule.scss
@@ -341,6 +341,7 @@ $avatar-size: 30px;
             border-style: solid;
             border-top: none;
 
+			/* Same colors as in _talk.scss */
             &--blue {
                 background-color: $color-theme-blue;
                 border-color: $color-theme-blue;

diff --git a/src/main/resources/web/app/stylesheets/partials/_talk.scss b/src/main/resources/web/app/stylesheets/partials/_talk.scss
@@ -155,6 +155,54 @@
         text-align: center;
         background-color: $color-yellow;
 
+		a {
+			color: $color-white;
+			text-decoration: none;
+		}
+
+		/* Same colors as in _schedule.scss */
+        &--blue {
+            background-color: $color-theme-blue;
+            border-color: $color-theme-blue;
+        }
+        &--yellow {
+            background-color: $color-theme-yellow;
+            border-color: $color-theme-yellow;
+        }
+        &--purple {
+            background-color: $color-theme-purple;
+            border-color: $color-theme-purple;
+        }
+        &--green {
+            background-color: $color-theme-green;
+            border-color: $color-theme-green;
+        }
+        &--orange {
+            background-color: $color-theme-orange;
+            border-color: $color-theme-orange;
+        }
+        &--red {
+            background-color: $color-theme-red;
+            border-color: $color-theme-red;
+        }
+        &--pink {
+            background-color: $color-theme-pink;
+            border-color: $color-theme-pink;
+        }
+        &--turquoise {
+            background-color: $color-theme-turquoise;
+            border-color: $color-theme-turquoise;
+        }
+        &--brown {
+            background-color: $color-theme-brown;
+            border-color: $color-theme-brown;
+        }
+        &--grey,
+        &--none {
+            background-color: $color-theme-grey;
+            border-color: $color-theme-grey;
+        }
+
         &--title,
         &--schedule {
             display: flex;