Merge branch 'main' into updated-seeds

TelosLabs · Sep 10, 2024 · c0e93a5 · c0e93a5
2 parents 320f883 + b93087c
commit c0e93a5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/app/assets/stylesheets/actiontext.css b/app/assets/stylesheets/actiontext.css
@@ -29,3 +29,9 @@
   padding: 0 !important;
   max-width: 100% !important;
 }
+
+.trix-content a {
+  color: #CB0C1C;
+  font-weight: 400;
+  text-decoration: underline;
+}
diff --git a/app/assets/stylesheets/application.tailwind.css b/app/assets/stylesheets/application.tailwind.css
@@ -1,9 +1,9 @@
+@import 'actiontext.css';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import 'actiontext.css';
-
 @layer base {
   ul, ol {
     @apply block ml-4

diff --git a/app/views/layouts/_back_button.html.erb b/app/views/layouts/_back_button.html.erb
@@ -0,0 +1,7 @@
+<div class="relative flex items-center justify-center w-full py-2 bg-white">
+  <%= link_to "javascript:history.back()", class: "absolute left-0 flex items-center py-2 pl-5" do %>
+    <%= inline_svg_tag("icons/chevron_left.svg", size: "24", class: "fill-red") %>
+    <span class="ml-1 text-lg italic font-black text-red">Back</span>
+  <% end %>
+  <p class="text-lg font-medium"><%= back_title %></p>
+</div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
@@ -1,14 +1,4 @@
-<% if show_back_button? %>
-  <div class="relative flex items-center justify-center w-full py-2">
-    <%= link_to "javascript:history.back()", class: "absolute left-0 flex items-center py-2 pl-5" do %>
-      <%= inline_svg_tag("icons/chevron_left.svg", size: "24", class: "fill-red") %>
-      <span class="ml-1 text-lg italic font-black text-red">Back</span>
-    <% end %>
-    <p class="text-lg font-medium"><%= back_title %></p>
-  </div>
-<% end %>
-
-<div class="sticky top-0 z-30 flex justify-center w-full py-6 mx-auto border-b border-b-white bg-purple-dark">
+<div class="flex justify-center w-full py-6 mx-auto border-b border-b-white bg-purple-dark">
   <div class="flex max-w-screen-sm px-5">
     <%= link_to root_path(
                   starts_at: current_starts_at_filter,

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -35,9 +35,15 @@
     data-web-push-notifications-notifications-enabled-value=#{current_profile.web_push_notifications}" : '' %>>
 
     <main class="flex flex-col flex-1 w-full mx-auto">
-      <% if show_header? %>
-        <%= render partial: "layouts/header" %>
-      <% end %>
+      <div class="sticky top-0 z-30">
+        <% if show_back_button? %>
+          <%= render partial: "layouts/back_button" %>
+        <% end %>
+
+        <% if show_header? %>
+          <%= render partial: "layouts/header" %>
+        <% end %>
+      </div>
 
       <div id="flash_message">
         <% flash.each do |type, message| %>