bullet_train-themes-light 1.2.26 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdc7f3ee7414fc9d99a80aca201d380e62f17830fdadb8442fb2dae32d2e82ea
-  data.tar.gz: 9bd7c83def0b0492e2fdaf96b483897f2356b2dba8dc1da9f3ae76e2c979b503
+  metadata.gz: 57383918ec8982b8d1c683609afb6a4447f42b37b04ae2371cb07447124090ae
+  data.tar.gz: e9b4d5fe69371f927b5661815716e931bd57a250fa7175ad7fd9df53bed52f9c
 SHA512:
-  metadata.gz: 14f7ce22313af9df97f89debb0c8975a2ea2c563ba123def4d880505e6bf0bc1936d47f59b6a647be25ef446b876eefa5b13c58ae3e5d13ce8d5009f3f2a3c56
-  data.tar.gz: 8cfa74523b22c35d557f0b196162abb1670813f1ff82aff086cb0b8cd9288e734709609e8eaf35e37c7c98207385c5bb4e64077c8099d5779b0499eb240dceab
+  metadata.gz: 491867d08206664c8869576d1ada071562f83400c0cc79bc274ac3e8c2994723ebd46d1d16a5470cb9156e1bfbc263c3cb3a3acdbc0ecab7b969d028dcf08586
+  data.tar.gz: 0176eeed1f1668ade63d167ab9c326c5eaf47ef50968a759fea55d398f4e6108652e7eaad04afda1c669eea1874607056ad0a057148624d1ffa9edf7493bac46

data/app/assets/stylesheets/light/actiontext.css

@@ -17,6 +17,16 @@
     }
   }
 
+  /* Override Tailwind's preflight styles */
+  /* https://github.com/tailwindlabs/tailwindcss/issues/989#issuecomment-506555308 */
+  ul {
+    list-style-type: disc;
+  }
+
+  ol {
+    list-style-type: decimal;
+  }
+
   action-text-attachment {
     .attachment {
       padding: 0 !important;

data/app/assets/stylesheets/light/application.css

@@ -9,18 +9,6 @@
 @import './fields';
 @import './turn';
 
-/* TODO We should be able to do this in Tailwind CSS. */
-.hover-indent-child {
-  .indent-child {
-    transition: transform 0.2s ease;
-  }
-  &:hover {
-    .indent-child {
-      transform:translateX(8px);
-    }
-  }
-}
-
 form.button_to {
   @apply inline-block;
   input[type=submit] {
@@ -33,3 +21,9 @@ form.button_to {
 
 /* hide the first breadcrumb chevron */
 ol.breadcrumb li:first-child svg { display: none; }
+
+/* Override Turbo's progress bar color with the application's theme. */
+.turbo-progress-bar {
+  height: 5px;
+  @apply bg-primary-500;
+}

data/app/assets/stylesheets/light/fields/super_select.css

@@ -39,6 +39,10 @@
   }
 }
 
+.select2-results__option--highlighted {
+  @apply bg-primary-400 !important;
+}
+
 @layer components {
   .select2-container {
     @apply w-full;
@@ -89,7 +93,7 @@
 
   .select2-container .select2-dropdown {
     @apply border-2 border-slate-300 shadow-sm overflow-hidden !important;
-    border-color: #5897fb !important;
+    @apply border-primary-500 !important;
   }
 
   .select2-container--default .select2-results__option[aria-selected=true] {

data/app/assets/stylesheets/light/fields/trix_editor.css

@@ -11,18 +11,8 @@ trix-toolbar {
 
 /* Override Tailwind's preflight styles */
 /* https://github.com/tailwindlabs/tailwindcss/issues/989#issuecomment-506555308 */
-trix-editor ul {
-  list-style-type: disc;
-  padding-left: 2.5rem;
-}
-
-trix-editor ol {
-  list-style-type: decimal;
-  padding-left: 2.5rem;
-}
-
 .trix-button {
-  @apply dark:bg-slate-300 !important;
+  @apply dark:bg-slate-800 !important;
 }
 
 /* Prevent red ring on Trix Editor */
@@ -113,3 +103,63 @@ trix-editor {
 .trix-content {
   @apply text-base md:text-sm;
 }
+
+/* The Trix Editor uses SVGs for its buttons, so we manually override them here for dark mode */
+/* Icons taken from https://react-icons.github.io/react-icons/icons?name=md */
+@media (prefers-color-scheme: dark) {
+  .trix-button--icon-bold::before {
+    background-image: url('data:image/svg+xml;utf-8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M15.6 10.79c.97-.67 1.65-1.77 1.65-2.79 0-2.26-1.75-4-4-4H7v14h7.04c2.09 0 3.71-1.7 3.71-3.79 0-1.52-.86-2.82-2.15-3.42zM10 6.5h3c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5h-3v-3zm3.5 9H10v-3h3.5c.83 0 1.5.67 1.5 1.5s-.67 1.5-1.5 1.5z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-italic::before {
+    background-image: url('data:image/svg+xml;utf-8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M10 4v3h2.21l-3.42 8H6v3h8v-3h-2.21l3.42-8H18V4z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-strike::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M6.85 7.08C6.85 4.37 9.45 3 12.24 3c1.64 0 3 .49 3.9 1.28.77.65 1.46 1.73 1.46 3.24h-3.01c0-.31-.05-.59-.15-.85-.29-.86-1.2-1.28-2.25-1.28-1.86 0-2.34 1.02-2.34 1.7 0 .48.25.88.74 1.21.38.25.77.48 1.41.7H7.39c-.21-.34-.54-.89-.54-1.92zM21 12v-2H3v2h9.62c1.15.45 1.96.75 1.96 1.97 0 1-.81 1.67-2.28 1.67-1.54 0-2.93-.54-2.93-2.51H6.4c0 .55.08 1.13.24 1.58.81 2.29 3.29 3.3 5.67 3.3 2.27 0 5.3-.89 5.3-4.05 0-.3-.01-1.16-.48-1.94H21V12z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-link::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M8 11h8v2H8v-2zm12.1 1H22c0-2.76-2.24-5-5-5h-4v1.9h4c1.71 0 3.1 1.39 3.1 3.1zM3.9 12c0-1.71 1.39-3.1 3.1-3.1h4V7H7c-2.76 0-5 2.24-5 5s2.24 5 5 5h4v-1.9H7c-1.71 0-3.1-1.39-3.1-3.1zM19 12h-2v3h-3v2h3v3h2v-3h3v-2h-3v-3z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-heading-1::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M9 4v3h5v12h3V7h5V4H9zm-6 8h3v7h3v-7h3V9H3v3z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-quote::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M6 17h3l2-4V7H5v6h3zm8 0h3l2-4V7h-6v6h3z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-code::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0V0z"></path><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-bullet-list::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0V0z"></path><path d="M4 10.5c-.83 0-1.5.67-1.5 1.5s.67 1.5 1.5 1.5 1.5-.67 1.5-1.5-.67-1.5-1.5-1.5zm0-6c-.83 0-1.5.67-1.5 1.5S3.17 7.5 4 7.5 5.5 6.83 5.5 6 4.83 4.5 4 4.5zm0 12c-.83 0-1.5.68-1.5 1.5s.68 1.5 1.5 1.5 1.5-.68 1.5-1.5-.67-1.5-1.5-1.5zM7 19h14v-2H7v2zm0-6h14v-2H7v2zm0-8v2h14V5H7z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-number-list::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M2 17h2v.5H3v1h1v.5H2v1h3v-4H2v1zm1-9h1V4H2v1h1v3zm-1 3h1.8L2 13.1v.9h3v-1H3.2L5 10.9V10H2v1zm5-6v2h14V5H7zm0 14h14v-2H7v2zm0-6h14v-2H7v2z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-decrease-nesting-level::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M11 17h10v-2H11v2zm-8-5l4 4V8l-4 4zm0 9h18v-2H3v2zM3 3v2h18V3H3zm8 6h10V7H11v2zm0 4h10v-2H11v2z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-increase-nesting-level::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M3 21h18v-2H3v2zM3 8v8l4-4-4-4zm8 9h10v-2H11v2zM3 3v2h18V3H3zm8 6h10V7H11v2zm0 4h10v-2H11v2z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-attach::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M16.5 6v11.5c0 2.21-1.79 4-4 4s-4-1.79-4-4V5a2.5 2.5 0 015 0v10.5c0 .55-.45 1-1 1s-1-.45-1-1V6H10v9.5a2.5 2.5 0 005 0V5c0-2.21-1.79-4-4-4S7 2.79 7 5v12.5c0 3.04 2.46 5.5 5.5 5.5s5.5-2.46 5.5-5.5V6h-1.5z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-undo::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0V0z"></path><path d="M12.5 8c-2.65 0-5.05.99-6.9 2.6L2 7v9h9l-3.62-3.62c1.39-1.16 3.16-1.88 5.12-1.88 3.54 0 6.55 2.31 7.6 5.5l2.37-.78C21.08 11.03 17.15 8 12.5 8z"></path></svg>') !important;
+  }
+
+  .trix-button--icon-redo::before {
+    background-image: url('data:image/svg+xml;utf8,<svg stroke="currentColor" fill="%23FFFFFF" stroke-width="0" viewBox="0 0 24 24" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><path fill="none" d="M0 0h24v24H0z"></path><path d="M18.4 10.6C16.55 8.99 14.15 8 11.5 8c-4.65 0-8.58 3.03-9.96 7.22L3.9 16a8.002 8.002 0 017.6-5.5c1.95 0 3.73.72 5.12 1.88L13 16h9V7l-3.6 3.6z"></path></svg>') !important;
+  }
+}

data/app/assets/stylesheets/light/tailwind/utilities/billing.css

@@ -26,8 +26,8 @@
       top: -200px;
       width: 1000px;
       height: 600px;
-      background-image: linear-gradient(90deg, rgba(227,231,248,0) 0%, #E8F2FC 100%);
       z-index: -1;
+      @apply bg-primary-200 bg-gradient-to-r from-white
     }
 
     position: absolute;
@@ -35,9 +35,9 @@
     top: 0px;
     width: 800px;
     height: 600px;
-    background-image: linear-gradient(90deg, rgba(227,231,248,0) 0%, #8BBAF5 100%);
     transform: translate(-360px, 0px) rotate(-45deg);
     z-index: -1;
+    @apply bg-primary-400 bg-gradient-to-r from-white
   }
 
   .brand-title {
@@ -66,6 +66,6 @@
     background-attachment: scroll;
     background-clip: text;
     background-color: rgba(0,0,0,0);
-    background-image: -webkit-linear-gradient(-75deg, #c094de 10%, #65A8F1 50%, #006EF4 95%);
+    @apply bg-slate-800 bg-gradient-to-r from-primary-500
   }
-}
+}

data/app/views/showcase/engine/_head.html.erb

@@ -0,0 +1,7 @@
+<script>
+  const color = "<%= BulletTrain::Themes::Light.color %>"
+  const secondaryColor = "<%= BulletTrain::Themes::Light.secondary_color %>"
+
+  if (color) document.documentElement.classList.add(`theme-${color}`)
+  if (secondaryColor) document.documentElement.classList.add(`theme-secondary-${secondaryColor}`)
+</script>

data/app/views/showcase/previews/partials/_breadcrumb.html.erb

@@ -5,10 +5,9 @@
   </ul>
 <% end %>
 
-<%# TODO: Find a suitable url_for GET route here that every BulletTrain app would have. %>
-<%# showcase.sample "With model url_for" do %>
-<%#= render "shared/breadcrumb", url: [:account, Scaffolding::CompletelyConcrete::TangibleThing.new(id: 1)], label: "Concept" %>
-<%# end %>
+<% showcase.sample "With model url_for" do %>
+  <%= render 'account/shared/breadcrumb', label: t('memberships.label'), url: [:account, current_team, :memberships] %>
+<% end %>
 
 <% showcase.options do |o| %>
   <% o.required :label, "The breadcrumb text, either shown in the link or the plain label" %>

data/app/views/showcase/previews/tailwind/utilities/_spacing.html.erb

@@ -18,4 +18,20 @@
   </div>
 <% end %>
 
-<% # TODO Add `gap-y` and `gap-x`. %>
+<% showcase.sample "Vertical Gaps" do %>
+  <div class="grid gap-y">
+    <div class="button block">Item</div>
+    <div class="button block">Item</div>
+    <div class="button block">Item</div>
+    <div class="button block">Item</div>
+  </div>
+<% end %>
+
+<% showcase.sample "Horizontal Gaps" do %>
+  <div class="flex gap-x">
+    <div class="flex-1 button">Item</div>
+    <div class="flex-1 button">Item</div>
+    <div class="flex-1 button">Item</div>
+    <div class="flex-1 button">Item</div>
+  </div>
+<% end %>

data/app/views/themes/light/_alert.html.erb

@@ -7,8 +7,8 @@ when :yellow
   div_classes = "bg-amber-100 border-amber-200"
   header_classes = "text-amber-800"
 when :red
-  div_classes = "bg-red-300 border-red-400"
-  header_classes = "text-red-700"
+  div_classes = "bg-red-100 dark:bg-red-900 border-red-200 dark:border-red-700"
+  header_classes = "text-red-900 dark:text-red-100"
 end
 %>
 

data/app/views/themes/light/actions/_action.html.erb

@@ -34,22 +34,22 @@
       <% if action.completed? %>
         <% if action.is_a?(Actions::HasProgress) %>
           <div class="uppercase text-xs text-slate-400">
-            Processed <%= action.performed_count %> of <%= action.target_count %> <%= display_date_and_time(action.completed_at) %>
+            <%= t('action_models.processed_of', performed_count: action.performed_count, target_count: action.target_count, at: display_date_and_time(action.completed_at)) %>
           </div>
         <% else %>
           <div class="uppercase text-xs text-slate-400">
-            Processed <%= display_date_and_time(action.completed_at) %>
+            <%= t('action_models.processed', at: display_date_and_time(action.completed_at)) %>
           </div>
         <% end %>
 
       <% elsif action.is_a?(Actions::RequiresApproval) && !action.approved? %>
         <div class="uppercase text-xs text-slate-400">
-          Awaiting approval
+          <%= t('action_models.awaiting') %>
         </div>
 
       <% elsif action.is_a?(Actions::SupportsScheduling) && action.scheduled_for && !action.started? %>
         <div class="uppercase text-xs text-slate-400">
-          Scheduled for <%= display_date_and_time(action.scheduled_for) %>
+          <%= t('action_models.scheduled_for', at: display_date_and_time(action.scheduled_for)) %>
         </div>
 
       <% elsif action.is_a?(Actions::HasProgress) && action.started? %>
@@ -58,17 +58,17 @@
         </div>
 
         <div class="mt-2 uppercase text-xs text-slate-400">
-          Processing <%= action.performed_count %> of <%= action.target_count %>
+          <%= t('action_models.processing_of', performed_count: action.performed_count, target_count: action.target_count) %>
         </div>
 
       <% elsif action.is_a?(Actions::HasProgress) %>
         <div class="uppercase text-xs text-slate-400">
-          Preparing to process <%= action.performed_count %> of <%= action.target_count %>
+          <%= t('action_models.preparing_to_process_of', performed_count: action.performed_count, target_count: action.target_count) %>
         </div>
 
       <% else %>
         <div class="uppercase text-xs text-slate-400">
-          Preparing to process
+          <%= t('action_models.preparing_to_process') %>
         </div>
 
       <% end %>

data/app/views/themes/light/attributes/_block.html.erb

@@ -2,8 +2,8 @@
 <% strategy ||= current_attributes_strategy || :none %>
 <% url ||= nil %>
 
-<% if object.send(attribute).present? %>
+<% if object.public_send(attribute).present? %>
   <%= render 'shared/attributes/attribute', object: object, attribute: attribute, strategy: strategy, url: url do %>
-    <pre><%= object.send(attribute) %></pre>
+    <pre><%= object.public_send(attribute) %></pre>
   <% end %>
 <% end %>

data/app/views/themes/light/attributes/_progress_bar.html.erb

@@ -4,7 +4,7 @@
 <% hide_completed ||= false %>
 
 <% if object.send(total).present? %>
-  <% completion_percent = (object.send(attribute).to_f / object.send(total).to_f) * 100.0 %>
+  <% completion_percent = (object.public_send(attribute).to_f / object.send(total).to_f) * 100.0 %>
 
   <% unless completion_percent == 100 && hide_completed %>
     <%= render 'shared/attributes/attribute', object: object, attribute: "#{attribute}_over_#{total}".to_sym, strategy: strategy, url: url do %>

data/app/views/themes/light/conversations/_card.html.erb

@@ -7,7 +7,7 @@
       <img src="<%= membership_profile_photo_url(conversation.last_message&.membership || current_membership)  %>" title="<%= current_membership.name %>" alt="<%= current_membership.name %>" class="md:w-14 md:h-14 w-12 h-12 rounded-full mx-auto border-1 border-white border-2 flex-none">
     </div>
     <div class="w-4/5 md:w-full lg:w-4/5 pl-4 pr-1 flex-initial truncate">
-      <p class="text-xs text-slate-300 text-right hover:no-underline"><%= "#{time_ago_in_words conversation.last_message.created_at} ago" unless conversation.last_message.nil? %></p>
+      <p class="text-xs text-slate-300 text-right hover:no-underline"><%= "#{t('global.time_ago', time: time_ago_in_words(conversation.last_message.created_at))}" if conversation.last_message.present? %></p>
       <h2 class="<%= subscription.unread? ? 'font-bold text-slate-800' : 'font-semibold text-slate-600' %> "><%= conversation.subject&.label_string %></h2>
       <div class="text-slate-300">
         <%= conversation.last_message&.user&.label_string %>

data/app/views/themes/light/conversations/_comment.html.erb

@@ -7,7 +7,8 @@
 <div class="flex py-3 px-2  text-slate-700 <%= message.reply? ? 'border w-full bg-slate-50 rounded-md' : 'border-b' %> <%= 'opacity-30' if new_message %>">
   <div class="mr-3 min-w-max"><%= avatar %></div>
   <div class="flex flex-col w-full">
-    <div class=""><span class="uppercase font-bold text-slate-500"><%= message.user.name %></span><span class="font-extralight text-xs text-slate-400"> &bull; <%= time_ago_in_words message.created_at %> ago</span></div>
+    <div class=""><span class="uppercase font-bold text-slate-500"><%= message.user.name %></span><span class="font-extralight text-xs text-slate-400"> &bull; <%= t("global.time_ago", time: time_ago_in_words(message.created_at)) %>
+</span></div>
     <div class="py-2"><%= trix_sanitize message.body %></div>
     <% if message.replies.any? %>
       <div class="space-y-2 mt-2 mb-2">

data/app/views/themes/light/conversations/_message.html.erb

@@ -34,7 +34,7 @@
 
 <% rounding_modifier = message_corner_class(next_message_in_series, current_user_message) %>
 
-<% timestamp = next_message_in_series || show_as_thread ? '' : time_ago_in_words(message.created_at) + " ago" %>
+<% timestamp = next_message_in_series || show_as_thread ? '' : t("global.time_ago", time: time_ago_in_words(message.created_at)) %>
 
 <% threaded_message = message.threaded? %>
 <% thread_started_by_current_user = message.thread_origin_user == current_author %>
@@ -126,7 +126,7 @@
             <path d="M0 57.7c.1 145.1 4.1 224 14.5 281.1 19.4 106.3 65.2 156.4 166.3 181.7 48.7 12.1 111.4 18.8 211.7 22.5 23.8.9 196.6 2.8 268.2 3H683l.2 67.8.3 67.8 170.3-102.1L1024 477.3l-170.2-102-170.3-102-.3 67.8-.2 67.9h-75.8c-184.7 0-266.9-4.8-327.2-19-34.2-8.1-62.8-21.1-81.2-37-36.1-31.3-52.3-76.8-58.8-165.5-2-28-3-69.2-3-127.8V0H0v57.7z"/>
           </svg>
           <div class="flex flex-col mr-10 min-w-max">
-            <div class="pt-0 mr-2 ml-4 text-xxs"><%= reply.membership.label_string %> reply: </div>
+            <div class="pt-0 mr-2 ml-4 text-xxs"><%= reply.membership.label_string %> <%= t('conversations.message.reply') %></div>
             <div class="bg-slate-100 rounded py-2 px-4 mt-0 text-slate-400 max-w-md"><%= reply.body.html_safe %></div>
           </div>
         </div>

data/app/views/themes/light/fields/_field.html.erb

@@ -1,4 +1,11 @@
-<% yield %>
+<%
+%i[label field error help after_help].each do |key|
+  if (content = content_for(key).presence)
+    flush_content_for key
+    partial.section key, content
+  end
+end
+%>
 
 <%
 form ||= current_fields_form
@@ -12,7 +19,7 @@ other_options ||= {}
 other_options[:help] = [other_options[:help], labels.help].compact.join(" ")
 
 errors = [method, method.to_s.gsub(/_id$/, '').to_sym].uniq.map { |attribute| form.object.errors.full_messages_for(attribute) }.flatten
-has_errors = errors.any? || content_for(:error).present? || other_options[:error].present?
+has_errors = errors.any? || partial.error? || other_options[:error].present?
 
 options[:class] = "#{options[:class]} block w-full rounded-md shadow-sm font-light text-sm dark:bg-slate-800 dark:text-slate-300"
 
@@ -28,9 +35,8 @@ end
 
   <% # the label. %>
   <% unless other_options[:hide_label] == true %>
-    <% if content_for? :label %>
-      <%= yield :label %>
-      <% flush_content_for :label %>
+    <% if partial.label? %>
+      <%= partial.label %>
     <% else %>
       <% # allow the label to be defined via an inline option or else one of the locale yaml definitions. %>
       <% label = (other_options[:label].presence || labels.label || legacy_label_for(form, method)) %>
@@ -39,24 +45,20 @@ end
   <% end %>
 
   <div class="mt-1.5">
-
     <% # the actual field. %>
-    <% if content_for? :field %>
-      <%= yield :field %>
-      <% flush_content_for :field %>
+    <% if partial.field? %>
+      <%= partial.field %>
     <% else %>
       <% # e.g. form.text_field(method, options) %>
       <%= form.send(helper, method, options) %>
     <% end %>
-
   </div>
 
   <% # any error messages. %>
   <% if has_errors %>
     <p class="mt-1.5 text-xs text-red-500">
       <%= errors.map { |error| error + ". " }.join %>
-      <%= yield :error %>
-      <% flush_content_for :error %>
+      <%= partial.error %>
       <% if other_options[:hide_custom_error].blank? %>
         <%= other_options[:error]&.html_safe %>
       <% end %>
@@ -64,13 +66,11 @@ end
   <% end %>
 
   <% # any help text. %>
-  <% if content_for?(:help) || other_options[:help].present? || content_for?(:after_help) %>
+  <% if partial.help? || other_options[:help].present? || partial.after_help? %>
     <p class="mt-1.5 text-xs text-slate-500 dark:text-slate-400">
-      <%= yield :help %>
-      <% flush_content_for :help %>
+      <%= partial.help %>
       <%= other_options[:help]&.html_safe %>
-      <%= yield :after_help %>
-      <% flush_content_for :after_help %>
+      <%= partial.after_help %>
     </p>
   <% end %>
 

data/app/views/themes/light/layouts/_pricing.html.erb

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="theme-<%= BulletTrain::Themes::Light.color %> <%= "theme-secondary-#{BulletTrain::Themes::Light.secondary_color}" if BulletTrain::Themes::Light.secondary_color %>">
   <head>
     <%= render 'shared/layouts/head' %>
   </head>
@@ -13,7 +13,7 @@
         <div class="m-5 -mb-5">
           <%= link_to @back, class: 'button-secondary hover:no-underline group' do %>
             <i class="ti ti-angle-left text-lg group-hover:no-underline"></i>
-            <span class="text-base ml-3 group-hover:underline">Back</span>
+            <span class="text-base ml-3 group-hover:underline"><%= t('navigation.back') %></span>
           <% end %>
         </div>
       <% end %>

data/app/views/themes/light/menu/_close.html.erb

@@ -3,7 +3,7 @@
     id="mobile-menu-close"
     data-action="mobile-menu#close"
   >
-    <span class="sr-only">Close Application Menu</span>
+    <span class="sr-only"><%= t('navigation.close_app_menu') %></span>
     <svg class="h-6 w-6 text-white" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
       <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
     </svg>

data/app/views/themes/light/menu/_item.html.erb

@@ -1,8 +1,8 @@
 <% method ||= nil %>
 <% active ||= request.path == url %>
 
-<%= send (method ? :button_to : :link_to), url, class: "block group hover:text-white hover:no-underline #{'bg-primary-900 dark:bg-black dark:bg-opacity-10' if active} text-white #{@menu_orientation == :top ? "px-5 py-5" : "px-2 py-2 rounded-md hover-indent-child"} #{"rounded-tl-lg" unless @not_first || BulletTrain::Themes::Light.show_logo_in_account} dark:text-white", data: {"desktop-menu-target": "menuItemLink"}, tabIndex: 0, method: method do %>
-  <div class="inline-block indent-child flex items-center">
+<%= send (method ? :button_to : :link_to), url, class: "block group/item hover:text-white hover:no-underline #{'bg-primary-900 dark:bg-black dark:bg-opacity-10' if active} text-white #{@menu_orientation == :top ? "px-5 py-5" : "px-3 py-2 rounded-md"} #{"rounded-tl-lg" unless @not_first || BulletTrain::Themes::Light.show_logo_in_account} dark:text-white", data: {"desktop-menu-target": "menuItemLink"}, tabIndex: 0, method: method do %>
+  <div class="inline-block <%= "transition group-hover/item:translate-x-3 duration-200" if @menu_orientation == :side %> flex items-center">
     <!-- Heroicon name: home -->
     <% if partial.icon? %>
       <span class="mr-3 h-6 w-6 text-center text-secondary-300 text-xl leading-6 dark:text-slate-400">

data/app/views/themes/light/menu/_open.html.erb

@@ -2,8 +2,8 @@
   id="mobile-menu-open"
   data-action="mobile-menu#open"
 >
-  <span class="sr-only">Open Application Menu</span>
+  <span class="sr-only"><%= t('navigation.open_app_menu') %></span>
   <svg class="h-6 w-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
     <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16" />
   </svg>
-</button>
+</button>

data/app/views/themes/light/menu/_subsection.html.erb

@@ -10,7 +10,7 @@
   </div>
 <% else %>
   <div>
-    <div class="inline-block relative group" data-controller="desktop-menu" data-action="keydown->desktop-menu#hideSubmenu" id="<%= title.underscore %>">
+    <div class="inline-block relative group" data-controller="desktop-menu" data-action="keydown->desktop-menu#hideSubmenu" id="<%= title.parameterize(separator: '_') %>">
       <%= render 'account/shared/menu/heading' do %>
         <%= title %>
 

data/config/locales/en/action_models.en.yml

@@ -0,0 +1,9 @@
+en:
+  action_models:
+    processed: Processed %{at}
+    processed_of: Processed %{performed_count} of %{target_count} %{at}
+    awaiting: Awaiting approval
+    scheduled_for: Scheduled for %{for}
+    processing_of: Processing %{performed_count} of %{target_count}
+    preparing_to_process: Preparing to process
+    preparing_to_process_of: Preparing to process %{performed_count} of %{target_count}

data/config/locales/en/conversations.en.yml

@@ -0,0 +1,4 @@
+en:
+  conversations:
+    message:
+      reply: "reply:"

data/config/locales/en/navigation.en.yml

@@ -0,0 +1,5 @@
+en:
+  navigation:
+    close_app_menu: Close Application Menu
+    open_app_menu: Open Application Menu
+    back: Back

data/lib/bullet_train/themes/light/version.rb

@@ -1,7 +1,7 @@
 module BulletTrain
   module Themes
     module Light
-      VERSION = "1.2.26"
+      VERSION = "1.3.0"
     end
   end
 end

data/lib/bullet_train/themes/light.rb

@@ -14,7 +14,6 @@ module BulletTrain
       mattr_accessor :logo_color_shift, default: false
       mattr_accessor :show_logo_in_account, default: false
       mattr_accessor :navigation, default: :top
-      mattr_accessor :original_devise_path # TODO: Obsolete: remove after shipping a new BulletTrain version with usage removed.
 
       class Theme < BulletTrain::Themes::TailwindCss::Theme
         def directory_order

data/lib/tasks/application.rb

@@ -180,14 +180,81 @@ module BulletTrain
       end
 
       def self.clean_theme(theme_name, args)
-        theme_base_path = `bundle show --paths bullet_train-themes-#{theme_name}`.chomp
-        `find app/views/themes/#{args[:theme]} | grep html.erb`.lines.map(&:chomp).each do |path|
-          _, file = path.split("app/views/themes/#{args[:theme]}/")
-          original_theme_path = "#{theme_base_path}/app/views/themes/#{theme_name}/#{file}"
-          if File.read(path) == File.read(original_theme_path)
-            puts "No changes in `#{path}` since being ejected. Removing."
-            `rm #{path}`
+        light_base_path = `bundle show --paths bullet_train-themes-light`.chomp
+        tailwind_base_path = `bundle show --paths bullet_train-themes-tailwind_css`.chomp
+        theme_base_path = `bundle show --paths bullet_train-themes`.chomp
+
+        directory_content = `find . | grep 'app/.*#{args[:theme]}'`.lines.map(&:chomp)
+        directory_content = directory_content.reject { |content| content.match?("app/assets/builds/") }
+        files = directory_content.select { |file| file.match?(/(\.erb)|(\.rb)|(\.css)|(\.js)$/) }
+
+        # Files that exist outside of "./app/" that we need to check.
+        files += [
+          "tailwind.#{args[:theme]}.config.js",
+          "tailwind.mailer.#{args[:theme]}.config.js",
+        ]
+
+        # This file doesn't exist under "app/" in its original gem, so we handle it differently.
+        # Also, don't remove this file from the starter repository in case
+        # the developer has any ejected files that have been customized.
+        files.delete("./app/lib/bullet_train/themes/#{args[:theme]}.rb")
+
+        files.each do |file|
+          original_theme_path = nil
+
+          # Remove the current directory syntax for concatenation with the gem base path.
+          file.gsub!("./", "")
+
+          [light_base_path, tailwind_base_path, theme_base_path].each do |theme_path|
+            # Views exist under "base" when the gem is "bullet_train-themes".
+            theme_gem_name = theme_path.scan(/(.*themes-)(.*$)/).flatten.pop || "base"
+            original_theme_path = file.gsub(args[:theme], theme_gem_name)
+
+            if File.exist?("#{theme_path}/#{original_theme_path}")
+              original_theme_path = "#{theme_path}/#{original_theme_path}"
+              break
+            end
           end
+
+          ejected_file_content = File.read(file)
+
+          # These are the only files where we replace the theme name inside of them when ejecting,
+          # so we revert the contents and check if the file has been changed or not.
+          transformed_files = [
+            "app/views/themes/foo/layouts/_head.html.erb",
+            "app/assets/stylesheets/foo.tailwind.css",
+            "tailwind.mailer.#{args[:theme]}.config.js"
+          ]
+          ejected_file_content.gsub!(/#{args[:theme]}/i, theme_name) if transformed_files.include?(file)
+
+          if ejected_file_content == File.read(original_theme_path)
+            puts "No changes in `#{file}` since being ejected. Removing."
+            `rm #{file}`
+          end
+        end
+
+        # Delete all leftover directories with empty content.
+        [
+          "./app/assets/stylesheets/",
+          "./app/views/themes/"
+        ].each do |remaining_directory|
+          puts "Cleaning out directory: #{remaining_directory}"
+          remaining_directory_content = Dir.glob(remaining_directory + "**/*")
+          remaining_directories = remaining_directory_content.select { |content| File.directory?(content) }
+          remaining_directories.reverse_each { |dir| Dir.rmdir dir if Dir.empty?(dir) }
+          FileUtils.rmdir(remaining_directory) if Dir.empty?(remaining_directory)
+        end
+
+        # These are files from the starter repository that need to be set back to the original theme.
+        [
+          "Procfile.dev",
+          "app/helpers/application_helper.rb",
+          "package.json",
+          "test/system/resolver_system_test.rb"
+        ].each do |file|
+          puts "Reverting changes in #{file}."
+          new_lines = File.open(file).readlines.join.gsub(/#{args[:theme]}/i, theme_name)
+          File.write(file, new_lines)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes-light
 version: !ruby/object:Gem::Version
-  version: 1.2.26
+  version: 1.3.0
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -130,6 +130,7 @@ files:
 - app/assets/stylesheets/tailwindcss/components.css
 - app/assets/stylesheets/tailwindcss/utilities.css
 - app/javascript/application.light.js
+- app/views/showcase/engine/_head.html.erb
 - app/views/showcase/previews/partials/_alert.html.erb
 - app/views/showcase/previews/partials/_box.html.erb
 - app/views/showcase/previews/partials/_breadcrumb.html.erb
@@ -195,6 +196,9 @@ files:
 - app/views/themes/light/menu/_top.html.erb
 - app/views/themes/light/menu/_user.html.erb
 - app/views/themes/light/workflow/_box.html.erb
+- config/locales/en/action_models.en.yml
+- config/locales/en/conversations.en.yml
+- config/locales/en/navigation.en.yml
 - config/routes.rb
 - lib/bullet_train/themes/light.rb
 - lib/bullet_train/themes/light/custom_theme_file_replacer.rb
@@ -204,12 +208,12 @@ files:
 - lib/tasks/application.rb
 - lib/tasks/bullet_train/themes/light_tasks.rake
 - tailwind.light.config.js
-homepage: https://github.com/bullet-train-co/bullet_train-themes-light
+homepage: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes-light
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/bullet-train-co/bullet_train-themes-light
-  source_code_uri: https://github.com/bullet-train-co/bullet_train-themes-light
+  homepage_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes-light
+  source_code_uri: https://github.com/bullet-train-co/bullet_train-core/tree/main/bullet_train-themes-light
 post_install_message:
 rdoc_options: []
 require_paths: