aaron_nad/cannery
1
0
Fork 0
forked from shibao/cannery
Code Pull Requests Activity

make text slightly easier to read

Browse Source
This commit is contained in:
shibao 2022-02-17 22:29:01 -05:00
parent 816d5649eb
commit 3164d48f6c
26 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cannery_web/components/add_shot_group_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= gettext("Record shots") %> <%= gettext("Record shots") %>
</h2> </h2>
@ -18,7 +18,7 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :ammo_left, gettext("Rounds left"), class: "title text-lg text-primary-500") %> <%= label(f, :ammo_left, gettext("Rounds left"), class: "title text-lg text-primary-600") %>
<%= number_input(f, :ammo_left, <%= number_input(f, :ammo_left,
min: 0, min: 0,
max: @ammo_group.count - 1, max: @ammo_group.count - 1,
@ -27,7 +27,7 @@
) %> ) %>
<%= error_tag(f, :ammo_left, "col-span-3") %> <%= error_tag(f, :ammo_left, "col-span-3") %>
<%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-500") %> <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
<%= textarea(f, :notes, <%= textarea(f, :notes,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
placeholder: "Really great weather", placeholder: "Really great weather",
@ -35,7 +35,7 @@
) %> ) %>
<%= error_tag(f, :notes, "col-span-3") %> <%= error_tag(f, :notes, "col-span-3") %>
<%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-500") %> <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
<%= date_input(f, :date, class: "input input-primary col-span-2") %> <%= date_input(f, :date, class: "input input-primary col-span-2") %>
<%= error_tag(f, :notes, "col-span-3") %> <%= error_tag(f, :notes, "col-span-3") %>

4
lib/cannery_web/components/move_ammo_group_component.html.heex
View File

@ -1,10 +1,10 @@
<div class="w-full flex flex-col space-y-8 justify-center items-center"> <div class="w-full flex flex-col space-y-8 justify-center items-center">
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= gettext("Move ammo") %> <%= gettext("Move ammo") %>
</h2> </h2>
<%= if @containers |> Enum.empty?() do %> <%= if @containers |> Enum.empty?() do %>
<h2 class="title text-xl text-primary-500"> <h2 class="title text-xl text-primary-600">
<%= gettext("No other containers") %> <%= gettext("No other containers") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>

12
lib/cannery_web/live/ammo_group_live/form_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
@ -18,34 +18,34 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :ammo_type_id, gettext("Ammo type"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :ammo_type_id, gettext("Ammo type"), class: "mr-4 title text-lg text-primary-600") %>
<%= select(f, :ammo_type_id, ammo_type_options(@ammo_types), <%= select(f, :ammo_type_id, ammo_type_options(@ammo_types),
class: "text-center col-span-2 input input-primary" class: "text-center col-span-2 input input-primary"
) %> ) %>
<%= error_tag(f, :ammo_type_id, "col-span-3 text-center") %> <%= error_tag(f, :ammo_type_id, "col-span-3 text-center") %>
<%= label(f, :count, gettext("Count"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :count, gettext("Count"), class: "mr-4 title text-lg text-primary-600") %>
<%= number_input(f, :count, <%= number_input(f, :count,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
min: 1 min: 1
) %> ) %>
<%= error_tag(f, :count, "col-span-3 text-center") %> <%= error_tag(f, :count, "col-span-3 text-center") %>
<%= label(f, :price_paid, gettext("Price paid"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :price_paid, gettext("Price paid"), class: "mr-4 title text-lg text-primary-600") %>
<%= number_input(f, :price_paid, <%= number_input(f, :price_paid,
step: "0.01", step: "0.01",
class: "text-center col-span-2 input input-primary" class: "text-center col-span-2 input input-primary"
) %> ) %>
<%= error_tag(f, :price_paid, "col-span-3 text-center") %> <%= error_tag(f, :price_paid, "col-span-3 text-center") %>
<%= label(f, :notes, gettext("Notes"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :notes, gettext("Notes"), class: "mr-4 title text-lg text-primary-600") %>
<%= textarea(f, :notes, <%= textarea(f, :notes,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
phx_hook: "MaintainAttrs" phx_hook: "MaintainAttrs"
) %> ) %>
<%= error_tag(f, :notes, "col-span-3 text-center") %> <%= error_tag(f, :notes, "col-span-3 text-center") %>
<%= label(f, :container, gettext("Container"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :container, gettext("Container"), class: "mr-4 title text-lg text-primary-600") %>
<%= select(f, :container_id, container_options(@containers), <%= select(f, :container_id, container_options(@containers),
class: "text-center col-span-2 input input-primary" class: "text-center col-span-2 input input-primary"
) %> ) %>

8
lib/cannery_web/live/ammo_group_live/index.html.heex
View File

@ -4,7 +4,7 @@
</h1> </h1>
<%= if @ammo_groups |> Enum.empty?() do %> <%= if @ammo_groups |> Enum.empty?() do %>
<h2 class="title text-xl text-primary-500"> <h2 class="title text-xl text-primary-600">
<%= gettext("No Ammo") %> <%= gettext("No Ammo") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>
@ -101,19 +101,19 @@
<td class="p-2"> <td class="p-2">
<div class="px-4 py-2 space-x-4 flex justify-center items-center"> <div class="px-4 py-2 space-x-4 flex justify-center items-center">
<%= live_redirect to: Routes.ammo_group_show_path(@socket, :show, ammo_group), <%= live_redirect to: Routes.ammo_group_show_path(@socket, :show, ammo_group),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "view-#{ammo_group.id}"] do %> data: [qa: "view-#{ammo_group.id}"] do %>
<i class="fa-fw fa-lg fas fa-eye"></i> <i class="fa-fw fa-lg fas fa-eye"></i>
<% end %> <% end %>
<%= live_patch to: Routes.ammo_group_index_path(@socket, :edit, ammo_group), <%= live_patch to: Routes.ammo_group_index_path(@socket, :edit, ammo_group),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{ammo_group.id}"] do %> data: [qa: "edit-#{ammo_group.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
phx_value_id: ammo_group.id, phx_value_id: ammo_group.id,
data: [ data: [

8
lib/cannery_web/live/ammo_group_live/show.html.heex
View File

@ -27,7 +27,7 @@
</div> </div>
<div class="flex flex-col justify-center items-center"> <div class="flex flex-col justify-center items-center">
<div class="flex flex-wrap justify-center items-center text-primary-500"> <div class="flex flex-wrap justify-center items-center text-primary-600">
<%= live_patch(dgettext("actions", "Ammo Details"), <%= live_patch(dgettext("actions", "Ammo Details"),
to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type), to: Routes.ammo_type_show_path(Endpoint, :show, @ammo_group.ammo_type),
class: "mx-4 my-2 btn btn-primary", class: "mx-4 my-2 btn btn-primary",
@ -35,13 +35,13 @@
) %> ) %>
<%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group), <%= live_patch to: Routes.ammo_group_show_path(Endpoint, :edit, @ammo_group),
class: "mx-4 my-2 text-primary-500 link", class: "mx-4 my-2 text-primary-600 link",
data: [qa: "edit"] do %> data: [qa: "edit"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "mx-4 my-2 text-primary-500 link", class: "mx-4 my-2 text-primary-600 link",
phx_click: "delete", phx_click: "delete",
data: [ data: [
confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"), confirm: dgettext("prompts", "Are you sure you want to delete this ammo?"),
@ -51,7 +51,7 @@
<% end %> <% end %>
</div> </div>
<div class="flex flex-wrap justify-center items-center text-primary-500"> <div class="flex flex-wrap justify-center items-center text-primary-600">
<button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged"> <button type="button" class="mx-4 my-2 btn btn-primary" phx-click="toggle_staged">
<%= if @ammo_group.staged, <%= if @ammo_group.staged,
do: gettext("Unstage from range"), do: gettext("Unstage from range"),

44
lib/cannery_web/live/ammo_type_live/form_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
<.form <.form
@ -17,11 +17,11 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :name, gettext("Name"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :name, gettext("Name"), class: "mr-4 title text-lg text-primary-600") %>
<%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %> <%= text_input(f, :name, class: "text-center col-span-2 input input-primary") %>
<%= error_tag(f, :name, "col-span-3 text-center") %> <%= error_tag(f, :name, "col-span-3 text-center") %>
<%= label(f, :desc, gettext("Description"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :desc, gettext("Description"), class: "mr-4 title text-lg text-primary-600") %>
<%= textarea(f, :desc, <%= textarea(f, :desc,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
phx_hook: "MaintainAttrs" phx_hook: "MaintainAttrs"
@ -35,7 +35,7 @@
<%= gettext("Example bullet type abbreviations") %> <%= gettext("Example bullet type abbreviations") %>
</a> </a>
<%= label(f, :bullet_type, gettext("Bullet type"), <%= label(f, :bullet_type, gettext("Bullet type"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :bullet_type, <%= text_input(f, :bullet_type,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -44,7 +44,7 @@
<%= error_tag(f, :bullet_type, "col-span-3 text-center") %> <%= error_tag(f, :bullet_type, "col-span-3 text-center") %>
<%= label(f, :bullet_core, gettext("Bullet core"), <%= label(f, :bullet_core, gettext("Bullet core"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :bullet_core, <%= text_input(f, :bullet_core,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -52,14 +52,14 @@
) %> ) %>
<%= error_tag(f, :bullet_core, "col-span-3 text-center") %> <%= error_tag(f, :bullet_core, "col-span-3 text-center") %>
<%= label(f, :cartridge, gettext("Cartridge"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :cartridge, gettext("Cartridge"), class: "mr-4 title text-lg text-primary-600") %>
<%= text_input(f, :cartridge, <%= text_input(f, :cartridge,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
placeholder: "5.56x46mm NATO" placeholder: "5.56x46mm NATO"
) %> ) %>
<%= error_tag(f, :cartridge, "col-span-3 text-center") %> <%= error_tag(f, :cartridge, "col-span-3 text-center") %>
<%= label(f, :caliber, gettext("Caliber"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :caliber, gettext("Caliber"), class: "mr-4 title text-lg text-primary-600") %>
<%= text_input(f, :caliber, <%= text_input(f, :caliber,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
placeholder: ".223" placeholder: ".223"
@ -67,7 +67,7 @@
<%= error_tag(f, :caliber, "col-span-3 text-center") %> <%= error_tag(f, :caliber, "col-span-3 text-center") %>
<%= label(f, :case_material, gettext("Case material"), <%= label(f, :case_material, gettext("Case material"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :case_material, <%= text_input(f, :case_material,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -76,7 +76,7 @@
<%= error_tag(f, :case_material, "col-span-3 text-center") %> <%= error_tag(f, :case_material, "col-span-3 text-center") %>
<%= label(f, :jacket_type, gettext("Jacket type"), <%= label(f, :jacket_type, gettext("Jacket type"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :jacket_type, <%= text_input(f, :jacket_type,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -85,7 +85,7 @@
<%= error_tag(f, :case_material, "col-span-3 text-center") %> <%= error_tag(f, :case_material, "col-span-3 text-center") %>
<%= label(f, :muzzle_velocity, gettext("Muzzle velocity"), <%= label(f, :muzzle_velocity, gettext("Muzzle velocity"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= number_input(f, :muzzle_velocity, <%= number_input(f, :muzzle_velocity,
step: "1", step: "1",
@ -95,7 +95,7 @@
<%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %> <%= error_tag(f, :muzzle_velocity, "col-span-3 text-center") %>
<%= label(f, :powder_type, gettext("Powder type"), <%= label(f, :powder_type, gettext("Powder type"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :powder_type, <%= text_input(f, :powder_type,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -104,7 +104,7 @@
<%= error_tag(f, :powder_type, "col-span-3 text-center") %> <%= error_tag(f, :powder_type, "col-span-3 text-center") %>
<%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"), <%= label(f, :powder_grains_per_charge, gettext("Powder grains per charge"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= number_input(f, :powder_grains_per_charge, <%= number_input(f, :powder_grains_per_charge,
step: "1", step: "1",
@ -113,7 +113,7 @@
) %> ) %>
<%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %> <%= error_tag(f, :powder_grains_per_charge, "col-span-3 text-center") %>
<%= label(f, :grains, gettext("Grains"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :grains, gettext("Grains"), class: "mr-4 title text-lg text-primary-600") %>
<%= number_input(f, :grains, <%= number_input(f, :grains,
step: "1", step: "1",
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -121,7 +121,7 @@
) %> ) %>
<%= error_tag(f, :grains, "col-span-3 text-center") %> <%= error_tag(f, :grains, "col-span-3 text-center") %>
<%= label(f, :pressure, gettext("Pressure"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :pressure, gettext("Pressure"), class: "mr-4 title text-lg text-primary-600") %>
<%= text_input(f, :pressure, <%= text_input(f, :pressure,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
placeholder: "+P" placeholder: "+P"
@ -129,7 +129,7 @@
<%= error_tag(f, :pressure, "col-span-3 text-center") %> <%= error_tag(f, :pressure, "col-span-3 text-center") %>
<%= label(f, :primer_type, gettext("Primer type"), <%= label(f, :primer_type, gettext("Primer type"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :primer_type, <%= text_input(f, :primer_type,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -138,7 +138,7 @@
<%= error_tag(f, :primer_type, "col-span-3 text-center") %> <%= error_tag(f, :primer_type, "col-span-3 text-center") %>
<%= label(f, :firing_type, gettext("Firing type"), <%= label(f, :firing_type, gettext("Firing type"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :firing_type, <%= text_input(f, :firing_type,
class: "text-center col-span-2 input input-primary", class: "text-center col-span-2 input input-primary",
@ -146,29 +146,29 @@
) %> ) %>
<%= error_tag(f, :firing_type, "col-span-3 text-center") %> <%= error_tag(f, :firing_type, "col-span-3 text-center") %>
<%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :tracer, gettext("Tracer"), class: "mr-4 title text-lg text-primary-600") %>
<%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %> <%= checkbox(f, :tracer, class: "text-center col-span-2 checkbox") %>
<%= error_tag(f, :tracer, "col-span-3 text-center") %> <%= error_tag(f, :tracer, "col-span-3 text-center") %>
<%= label(f, :incendiary, gettext("Incendiary"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :incendiary, gettext("Incendiary"), class: "mr-4 title text-lg text-primary-600") %>
<%= checkbox(f, :incendiary, class: "text-center col-span-2 checkbox") %> <%= checkbox(f, :incendiary, class: "text-center col-span-2 checkbox") %>
<%= error_tag(f, :incendiary, "col-span-3 text-center") %> <%= error_tag(f, :incendiary, "col-span-3 text-center") %>
<%= label(f, :blank, gettext("Blank"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :blank, gettext("Blank"), class: "mr-4 title text-lg text-primary-600") %>
<%= checkbox(f, :blank, class: "text-center col-span-2 checkbox") %> <%= checkbox(f, :blank, class: "text-center col-span-2 checkbox") %>
<%= error_tag(f, :blank, "col-span-3 text-center") %> <%= error_tag(f, :blank, "col-span-3 text-center") %>
<%= label(f, :corrosive, gettext("Corrosive"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :corrosive, gettext("Corrosive"), class: "mr-4 title text-lg text-primary-600") %>
<%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %> <%= checkbox(f, :corrosive, class: "text-center col-span-2 checkbox") %>
<%= error_tag(f, :corrosive, "col-span-3 text-center") %> <%= error_tag(f, :corrosive, "col-span-3 text-center") %>
<%= label(f, :manufacturer, gettext("Manufacturer"), <%= label(f, :manufacturer, gettext("Manufacturer"),
class: "mr-4 title text-lg text-primary-500" class: "mr-4 title text-lg text-primary-600"
) %> ) %>
<%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %> <%= text_input(f, :manufacturer, class: "text-center col-span-2 input input-primary") %>
<%= error_tag(f, :manufacturer, "col-span-3 text-center") %> <%= error_tag(f, :manufacturer, "col-span-3 text-center") %>
<%= label(f, :upc, gettext("UPC"), class: "mr-4 title text-lg text-primary-500") %> <%= label(f, :upc, gettext("UPC"), class: "mr-4 title text-lg text-primary-600") %>
<%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %> <%= text_input(f, :upc, class: "text-center col-span-2 input input-primary") %>
<%= error_tag(f, :upc, "col-span-3 text-center") %> <%= error_tag(f, :upc, "col-span-3 text-center") %>

8
lib/cannery_web/live/ammo_type_live/index.html.heex
View File

@ -4,7 +4,7 @@
</h1> </h1>
<%= if @ammo_types |> Enum.empty?() do %> <%= if @ammo_types |> Enum.empty?() do %>
<h2 class="title text-xl text-primary-500"> <h2 class="title text-xl text-primary-600">
<%= gettext("No Ammo Types") %> <%= gettext("No Ammo Types") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>
@ -49,19 +49,19 @@
<td class="p-2"> <td class="p-2">
<div class="px-4 py-2 space-x-4 flex justify-center items-center"> <div class="px-4 py-2 space-x-4 flex justify-center items-center">
<%= live_redirect to: Routes.ammo_type_show_path(@socket, :show, ammo_type), <%= live_redirect to: Routes.ammo_type_show_path(@socket, :show, ammo_type),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "view-#{ammo_type.id}"] do %> data: [qa: "view-#{ammo_type.id}"] do %>
<i class="fa-fw fa-lg fas fa-eye"></i> <i class="fa-fw fa-lg fas fa-eye"></i>
<% end %> <% end %>
<%= live_patch to: Routes.ammo_type_index_path(@socket, :edit, ammo_type), <%= live_patch to: Routes.ammo_type_index_path(@socket, :edit, ammo_type),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{ammo_type.id}"] do %> data: [qa: "edit-#{ammo_type.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
phx_value_id: ammo_type.id, phx_value_id: ammo_type.id,
data: [ data: [

6
lib/cannery_web/live/ammo_type_live/show.html.heex
View File

@ -14,15 +14,15 @@
</span> </span>
<% end %> <% end %>
<div class="flex space-x-4 justify-center items-center text-primary-500"> <div class="flex space-x-4 justify-center items-center text-primary-600">
<%= live_patch to: Routes.ammo_type_show_path(@socket, :edit, @ammo_type), <%= live_patch to: Routes.ammo_type_show_path(@socket, :edit, @ammo_type),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit"] do %> data: [qa: "edit"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
data: [ data: [
confirm: confirm:

2
lib/cannery_web/live/container_live/add_tag_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="mb-4 text-center title text-xl text-primary-500"> <h2 class="mb-4 text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>

10
lib/cannery_web/live/container_live/form_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
<.form <.form
@ -17,14 +17,14 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-500") %> <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
<%= text_input(f, :name, <%= text_input(f, :name,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
placeholder: gettext("My cool ammo can") placeholder: gettext("My cool ammo can")
) %> ) %>
<%= error_tag(f, :name, "col-span-3 text-center") %> <%= error_tag(f, :name, "col-span-3 text-center") %>
<%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-500") %> <%= label(f, :desc, gettext("Description"), class: "title text-lg text-primary-600") %>
<%= textarea(f, :desc, <%= textarea(f, :desc,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
phx_hook: "MaintainAttrs", phx_hook: "MaintainAttrs",
@ -32,14 +32,14 @@
) %> ) %>
<%= error_tag(f, :desc, "col-span-3 text-center") %> <%= error_tag(f, :desc, "col-span-3 text-center") %>
<%= label(f, :type, gettext("Type"), class: "title text-lg text-primary-500") %> <%= label(f, :type, gettext("Type"), class: "title text-lg text-primary-600") %>
<%= text_input(f, :type, <%= text_input(f, :type,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
placeholder: gettext("Magazine, Clip, Ammo Box, etc") placeholder: gettext("Magazine, Clip, Ammo Box, etc")
) %> ) %>
<%= error_tag(f, :type, "col-span-3 text-center") %> <%= error_tag(f, :type, "col-span-3 text-center") %>
<%= label(f, :location, gettext("Location"), class: "title text-lg text-primary-500") %> <%= label(f, :location, gettext("Location"), class: "title text-lg text-primary-600") %>
<%= textarea(f, :location, <%= textarea(f, :location,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
phx_hook: "MaintainAttrs", phx_hook: "MaintainAttrs",

6
lib/cannery_web/live/container_live/index.html.heex
View File

@ -4,7 +4,7 @@
</h1> </h1>
<%= if @containers |> Enum.empty?() do %> <%= if @containers |> Enum.empty?() do %>
<h2 class="title text-xl text-primary-500"> <h2 class="title text-xl text-primary-600">
<%= gettext("No containers") %> <%= gettext("No containers") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>
@ -24,13 +24,13 @@
<%= for container <- @containers do %> <%= for container <- @containers do %>
<.container_card container={container}> <.container_card container={container}>
<%= live_patch to: Routes.container_index_path(@socket, :edit, container), <%= live_patch to: Routes.container_index_path(@socket, :edit, container),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{container.id}"] do %> data: [qa: "edit-#{container.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
phx_value_id: container.id, phx_value_id: container.id,
data: [ data: [

12
lib/cannery_web/live/container_live/show.html.heex
View File

@ -22,15 +22,15 @@
</span> </span>
<% end %> <% end %>
<div class="flex space-x-4 justify-center items-center text-primary-500"> <div class="flex space-x-4 justify-center items-center text-primary-600">
<%= live_patch to: Routes.container_show_path(@socket, :edit, @container), <%= live_patch to: Routes.container_show_path(@socket, :edit, @container),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit"] do %> data: [qa: "edit"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete_container", phx_click: "delete_container",
data: [ data: [
confirm: confirm:
@ -45,7 +45,7 @@
<%= if @container.tags |> Enum.empty?() do %> <%= if @container.tags |> Enum.empty?() do %>
<div class="flex flex-row justify-center items-center space-x-4"> <div class="flex flex-row justify-center items-center space-x-4">
<h2 class="title text-lg text-primary-500"> <h2 class="title text-lg text-primary-600">
<%= gettext("No tags for this container") %> <%= gettext("No tags for this container") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>
@ -56,14 +56,14 @@
) %> ) %>
</div> </div>
<% else %> <% else %>
<h2 class="mb-4 title text-xl text-primary-500"> <h2 class="mb-4 title text-xl text-primary-600">
<%= gettext("Tags") %> <%= gettext("Tags") %>
</h2> </h2>
<%= for tag <- @container.tags do %> <%= for tag <- @container.tags do %>
<.tag_card tag={tag}> <.tag_card tag={tag}>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete_tag", phx_click: "delete_tag",
phx_value_tag_id: tag.id, phx_value_tag_id: tag.id,
data: [ data: [

6
lib/cannery_web/live/home_live.ex
View File

@ -37,11 +37,11 @@ defmodule CanneryWeb.HomeLive do
<div <div
class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl" class="mx-auto px-8 sm:px-16 flex flex-col justify-center items-center text-center space-y-4 max-w-3xl"
> >
<h1 class="title text-primary-500 text-2xl"> <h1 class="title text-primary-600 text-2xl">
<%= gettext("Welcome to %{name}", name: "Cannery") %> <%= gettext("Welcome to %{name}", name: "Cannery") %>
</h1> </h1>
<h2 class="title text-primary-500 text-lg"> <h2 class="title text-primary-600 text-lg">
<%= gettext("The self-hosted firearm tracker website") %> <%= gettext("The self-hosted firearm tracker website") %>
</h2> </h2>
@ -84,7 +84,7 @@ defmodule CanneryWeb.HomeLive do
<hr class="hr" /> <hr class="hr" />
<ul class="flex flex-col space-y-2 text-center justify-center"> <ul class="flex flex-col space-y-2 text-center justify-center">
<h2 class="title text-primary-500 text-lg"> <h2 class="title text-primary-600 text-lg">
<%= gettext("Instance Information") %> <%= gettext("Instance Information") %>
</h2> </h2>

6
lib/cannery_web/live/invite_live/form_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
<.form <.form
@ -17,11 +17,11 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-500") %> <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
<%= text_input(f, :name, class: "input input-primary col-span-2") %> <%= text_input(f, :name, class: "input input-primary col-span-2") %>
<%= error_tag(f, :name, "col-span-3") %> <%= error_tag(f, :name, "col-span-3") %>
<%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-500") %> <%= label(f, :uses_left, gettext("Uses left"), class: "title text-lg text-primary-600") %>
<%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %> <%= number_input(f, :uses_left, min: 0, class: "input input-primary col-span-2") %>
<%= error_tag(f, :uses_left, "col-span-3") %> <%= error_tag(f, :uses_left, "col-span-3") %>

14
lib/cannery_web/live/invite_live/index.html.heex
View File

@ -4,7 +4,7 @@
</h1> </h1>
<%= if @invites |> Enum.empty?() do %> <%= if @invites |> Enum.empty?() do %>
<h1 class="title text-xl text-primary-500"> <h1 class="title text-xl text-primary-600">
<%= gettext("No invites") %> <%= gettext("No invites") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h1> </h1>
@ -36,13 +36,13 @@
</form> </form>
</:code_actions> </:code_actions>
<%= live_patch to: Routes.invite_index_path(Endpoint, :edit, invite), <%= live_patch to: Routes.invite_index_path(Endpoint, :edit, invite),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{invite.id}"] do %> data: [qa: "edit-#{invite.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete_invite", phx_click: "delete_invite",
phx_value_id: invite.id, phx_value_id: invite.id,
data: [ data: [
@ -87,7 +87,7 @@
<%= unless @admins |> Enum.empty?() do %> <%= unless @admins |> Enum.empty?() do %>
<hr class="hr" /> <hr class="hr" />
<h1 class="title text-2xl text-primary-500"> <h1 class="title text-2xl text-primary-600">
<%= gettext("Admins") %> <%= gettext("Admins") %>
</h1> </h1>
@ -95,7 +95,7 @@
<%= for admin <- @admins do %> <%= for admin <- @admins do %>
<.user_card user={admin}> <.user_card user={admin}>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete_user", phx_click: "delete_user",
phx_value_id: admin.id, phx_value_id: admin.id,
data: [ data: [
@ -116,7 +116,7 @@
<%= unless @users |> Enum.empty?() do %> <%= unless @users |> Enum.empty?() do %>
<hr class="hr" /> <hr class="hr" />
<h1 class="title text-2xl text-primary-500"> <h1 class="title text-2xl text-primary-600">
<%= gettext("Users") %> <%= gettext("Users") %>
</h1> </h1>
@ -124,7 +124,7 @@
<%= for user <- @users do %> <%= for user <- @users do %>
<.user_card user={user}> <.user_card user={user}>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete_user", phx_click: "delete_user",
phx_value_id: user.id, phx_value_id: user.id,
data: [ data: [

8
lib/cannery_web/live/range_live/form_component.html.heex
View File

@ -1,5 +1,5 @@
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
@ -18,7 +18,7 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :count, gettext("Shots fired"), class: "title text-lg text-primary-500") %> <%= label(f, :count, gettext("Shots fired"), class: "title text-lg text-primary-600") %>
<%= number_input(f, :count, <%= number_input(f, :count,
min: 1, min: 1,
max: @shot_group.count + @ammo_group.count, max: @shot_group.count + @ammo_group.count,
@ -26,14 +26,14 @@
) %> ) %>
<%= error_tag(f, :count, "col-span-3") %> <%= error_tag(f, :count, "col-span-3") %>
<%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-500") %> <%= label(f, :notes, gettext("Notes"), class: "title text-lg text-primary-600") %>
<%= textarea(f, :notes, <%= textarea(f, :notes,
class: "input input-primary col-span-2", class: "input input-primary col-span-2",
phx_hook: "MaintainAttrs" phx_hook: "MaintainAttrs"
) %> ) %>
<%= error_tag(f, :notes, "col-span-3") %> <%= error_tag(f, :notes, "col-span-3") %>
<%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-500") %> <%= label(f, :date, gettext("Date (UTC)"), class: "title text-lg text-primary-600") %>
<%= date_input(f, :date, class: "input input-primary col-span-2") %> <%= date_input(f, :date, class: "input input-primary col-span-2") %>
<%= error_tag(f, :notes, "col-span-3") %> <%= error_tag(f, :notes, "col-span-3") %>

10
lib/cannery_web/live/range_live/index.html.heex
View File

@ -4,7 +4,7 @@
</h1> </h1>
<%= if @ammo_groups |> Enum.empty?() do %> <%= if @ammo_groups |> Enum.empty?() do %>
<h1 class="title text-xl text-primary-500"> <h1 class="title text-xl text-primary-600">
<%= gettext("No ammo staged") %> <%= gettext("No ammo staged") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h1> </h1>
@ -44,12 +44,12 @@
<hr class="hr" /> <hr class="hr" />
<%= if @shot_groups |> Enum.empty?() do %> <%= if @shot_groups |> Enum.empty?() do %>
<h1 class="title text-xl text-primary-500"> <h1 class="title text-xl text-primary-600">
<%= gettext("No shots recorded") %> <%= gettext("No shots recorded") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h1> </h1>
<% else %> <% else %>
<h1 class="title text-2xl text-primary-500"> <h1 class="title text-2xl text-primary-600">
<%= gettext("Shot log") %> <%= gettext("Shot log") %>
</h1> </h1>
@ -95,13 +95,13 @@
<td class="p-2 w-full h-full space-x-2 flex justify-center items-center"> <td class="p-2 w-full h-full space-x-2 flex justify-center items-center">
<div class="px-4 py-2 space-x-4 flex justify-center items-center"> <div class="px-4 py-2 space-x-4 flex justify-center items-center">
<%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group), <%= live_patch to: Routes.range_index_path(Endpoint, :edit, shot_group),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{shot_group.id}"] do %> data: [qa: "edit-#{shot_group.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
phx_value_id: shot_group.id, phx_value_id: shot_group.id,
data: [ data: [

8
lib/cannery_web/live/tag_live/form_component.ex
View File

@ -29,7 +29,7 @@ defmodule CanneryWeb.TagLive.FormComponent do
def render(assigns) do def render(assigns) do
~H""" ~H"""
<div> <div>
<h2 class="text-center title text-xl text-primary-500"> <h2 class="text-center title text-xl text-primary-600">
<%= @title %> <%= @title %>
</h2> </h2>
<.form <.form
@ -47,17 +47,17 @@ defmodule CanneryWeb.TagLive.FormComponent do
</div> </div>
<% end %> <% end %>
<%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-500") %> <%= label(f, :name, gettext("Name"), class: "title text-lg text-primary-600") %>
<%= text_input(f, :name, class: "input input-primary col-span-2") %> <%= text_input(f, :name, class: "input input-primary col-span-2") %>
<%= error_tag(f, :name, "col-span-3") %> <%= error_tag(f, :name, "col-span-3") %>
<%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-500") %> <%= label(f, :bg_color, gettext("Background color"), class: "title text-lg text-primary-600") %>
<span id="tag-bg-color-input" class="mx-auto col-span-2" phx-update="ignore"> <span id="tag-bg-color-input" class="mx-auto col-span-2" phx-update="ignore">
<%= color_input(f, :bg_color) %> <%= color_input(f, :bg_color) %>
</span> </span>
<%= error_tag(f, :bg_color, "col-span-3") %> <%= error_tag(f, :bg_color, "col-span-3") %>
<%= label(f, :text_color, gettext("Text color"), class: "title text-lg text-primary-500") %> <%= label(f, :text_color, gettext("Text color"), class: "title text-lg text-primary-600") %>
<span id="tag-text-color-input" class="mx-auto col-span-2" phx-update="ignore"> <span id="tag-text-color-input" class="mx-auto col-span-2" phx-update="ignore">
<%= color_input(f, :text_color) %> <%= color_input(f, :text_color) %>
</span> </span>

8
lib/cannery_web/live/tag_live/index.html.heex
View File

@ -2,11 +2,11 @@
<h1 class="title text-2xl title-primary-500"> <h1 class="title text-2xl title-primary-500">
<%= gettext("Tags") %> <%= gettext("Tags") %>
</h1> </h1>
<p class="title text-md text-primary-500"> <p class="title text-md text-primary-600">
<%= gettext("Tags can be added to your containers to help you organize") %> <%= gettext("Tags can be added to your containers to help you organize") %>
</p> </p>
<%= if @tags |> Enum.empty?() do %> <%= if @tags |> Enum.empty?() do %>
<h2 class="title text-xl text-primary-500"> <h2 class="title text-xl text-primary-600">
<%= gettext("No tags") %> <%= gettext("No tags") %>
<%= display_emoji("😔") %> <%= display_emoji("😔") %>
</h2> </h2>
@ -25,13 +25,13 @@
<%= for tag <- @tags do %> <%= for tag <- @tags do %>
<.tag_card tag={tag}> <.tag_card tag={tag}>
<%= live_patch to: Routes.tag_index_path(Endpoint, :edit, tag), <%= live_patch to: Routes.tag_index_path(Endpoint, :edit, tag),
class: "text-primary-500 link", class: "text-primary-600 link",
data: [qa: "edit-#{tag.id}"] do %> data: [qa: "edit-#{tag.id}"] do %>
<i class="fa-fw fa-lg fas fa-edit"></i> <i class="fa-fw fa-lg fas fa-edit"></i>
<% end %> <% end %>
<%= link to: "#", <%= link to: "#",
class: "text-primary-500 link", class: "text-primary-600 link",
phx_click: "delete", phx_click: "delete",
phx_value_id: tag.id, phx_value_id: tag.id,
data: [ data: [

4
lib/cannery_web/templates/error/error.html.heex
View File

@ -19,13 +19,13 @@
<div <div
class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl" class="p-8 sm:p-16 w-full flex flex-col justify-center items-center space-y-4 max-w-3xl"
> >
<h1 class="title text-primary-500 text-3xl"> <h1 class="title text-primary-600 text-3xl">
<%= @error_string %> <%= @error_string %>
</h1> </h1>
<hr class="w-full hr" /> <hr class="w-full hr" />
<a href={Routes.live_path(Endpoint, HomeLive)} class="link title text-primary-500 text-lg"> <a href={Routes.live_path(Endpoint, HomeLive)} class="link title text-primary-600 text-lg">
<%= dgettext("errors", "Go back home") %> <%= dgettext("errors", "Go back home") %>
</a> </a>
</div> </div>

4
lib/cannery_web/templates/user_confirmation/new.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-600 text-xl">
<%= dgettext("actions", "Resend confirmation instructions") %> <%= dgettext("actions", "Resend confirmation instructions") %>
</h1> </h1>
@ -11,7 +11,7 @@
"justify-center items-center text-center space-y-4" "justify-center items-center text-center space-y-4"
], ],
fn f -> %> fn f -> %>
<%= label(f, :email, class: "title text-lg text-primary-500") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= submit(dgettext("actions", "Resend confirmation instructions"), <%= submit(dgettext("actions", "Resend confirmation instructions"),

6
lib/cannery_web/templates/user_registration/new.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-600 text-xl">
<%= dgettext("actions", "Register") %> <%= dgettext("actions", "Register") %>
</h1> </h1>
@ -23,11 +23,11 @@
<%= hidden_input(f, :invite_token, value: @invite.token) %> <%= hidden_input(f, :invite_token, value: @invite.token) %>
<% end %> <% end %>
<%= label(f, :email, class: "title text-lg text-primary-500") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= error_tag(f, :email, "col-span-3") %> <%= error_tag(f, :email, "col-span-3") %>
<%= label(f, :password, class: "title text-lg text-primary-500") %> <%= label(f, :password, class: "title text-lg text-primary-600") %>
<%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
<%= error_tag(f, :password, "col-span-3") %> <%= error_tag(f, :password, "col-span-3") %>

6
lib/cannery_web/templates/user_reset_password/edit.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-600 text-xl">
<%= dgettext("actions", "Reset password") %> <%= dgettext("actions", "Reset password") %>
</h1> </h1>
@ -19,12 +19,12 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :password, "New password", class: "title text-lg text-primary-500") %> <%= label(f, :password, "New password", class: "title text-lg text-primary-600") %>
<%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
<%= error_tag(f, :password, "col-span-3") %> <%= error_tag(f, :password, "col-span-3") %>
<%= label(f, :password_confirmation, "Confirm new password", <%= label(f, :password_confirmation, "Confirm new password",
class: "title text-lg text-primary-500" class: "title text-lg text-primary-600"
) %> ) %>
<%= password_input(f, :password_confirmation, <%= password_input(f, :password_confirmation,
required: true, required: true,

4
lib/cannery_web/templates/user_reset_password/new.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-600 text-xl">
<%= dgettext("actions", "Forgot your password?") %> <%= dgettext("actions", "Forgot your password?") %>
</h1> </h1>
@ -11,7 +11,7 @@
"justify-center items-center text-center space-y-4" "justify-center items-center text-center space-y-4"
], ],
fn f -> %> fn f -> %>
<%= label(f, :email, class: "title text-lg text-primary-500") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= submit(dgettext("actions", "Send instructions to reset password"), <%= submit(dgettext("actions", "Send instructions to reset password"),

8
lib/cannery_web/templates/user_session/new.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="title text-primary-500 text-xl"> <h1 class="title text-primary-600 text-xl">
<%= dgettext("actions", "Log in") %> <%= dgettext("actions", "Log in") %>
</h1> </h1>
@ -20,14 +20,14 @@
</div> </div>
<% end %> <% end %>
<%= label(f, :email, class: "title text-lg text-primary-500") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "input input-primary col-span-2") %>
<%= label(f, :password, class: "title text-lg text-primary-500") %> <%= label(f, :password, class: "title text-lg text-primary-600") %>
<%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %> <%= password_input(f, :password, required: true, class: "input input-primary col-span-2") %>
<%= label(f, :remember_me, gettext("Keep me logged in for 60 days"), <%= label(f, :remember_me, gettext("Keep me logged in for 60 days"),
class: "title text-lg text-primary-500" class: "title text-lg text-primary-600"
) %> ) %>
<%= checkbox(f, :remember_me, class: "checkbox col-span-2") %> <%= checkbox(f, :remember_me, class: "checkbox col-span-2") %>

16
lib/cannery_web/templates/user_settings/edit.html.heex
View File

@ -1,5 +1,5 @@
<div class="mb-8 flex flex-col justify-center items-center space-y-4"> <div class="mb-8 flex flex-col justify-center items-center space-y-4">
<h1 class="pb-4 title text-primary-500 text-xl"> <h1 class="pb-4 title text-primary-600 text-xl">
<%= gettext("Settings") %> <%= gettext("Settings") %>
</h1> </h1>
@ -13,7 +13,7 @@
"justify-center items-center text-center space-y-4" "justify-center items-center text-center space-y-4"
], ],
fn f -> %> fn f -> %>
<h3 class="title text-primary-500 text-lg col-span-3"> <h3 class="title text-primary-600 text-lg col-span-3">
<%= dgettext("actions", "Change email") %> <%= dgettext("actions", "Change email") %>
</h3> </h3>
@ -27,13 +27,13 @@
<%= hidden_input(f, :action, name: "action", value: "update_email") %> <%= hidden_input(f, :action, name: "action", value: "update_email") %>
<%= label(f, :email, class: "title text-lg text-primary-500") %> <%= label(f, :email, class: "title text-lg text-primary-600") %>
<%= email_input(f, :email, required: true, class: "mx-2 my-1 input input-primary col-span-2") %> <%= email_input(f, :email, required: true, class: "mx-2 my-1 input input-primary col-span-2") %>
<%= error_tag(f, :email, "col-span-3") %> <%= error_tag(f, :email, "col-span-3") %>
<%= label(f, :current_password, gettext("Current password"), <%= label(f, :current_password, gettext("Current password"),
for: "current_password_for_email", for: "current_password_for_email",
class: "mx-2 my-1 title text-lg text-primary-500" class: "mx-2 my-1 title text-lg text-primary-600"
) %> ) %>
<%= password_input(f, :current_password, <%= password_input(f, :current_password,
required: true, required: true,
@ -57,7 +57,7 @@
"pb-4 flex flex-col sm:grid sm:grid-cols-3 justify-center items-center text-center space-y-4" "pb-4 flex flex-col sm:grid sm:grid-cols-3 justify-center items-center text-center space-y-4"
], ],
fn f -> %> fn f -> %>
<h3 class="title text-primary-500 text-lg col-span-3"> <h3 class="title text-primary-600 text-lg col-span-3">
<%= dgettext("actions", "Change password") %> <%= dgettext("actions", "Change password") %>
</h3> </h3>
@ -71,7 +71,7 @@
<%= hidden_input(f, :action, name: "action", value: "update_password") %> <%= hidden_input(f, :action, name: "action", value: "update_password") %>
<%= label(f, :password, gettext("New password"), class: "title text-lg text-primary-500") %> <%= label(f, :password, gettext("New password"), class: "title text-lg text-primary-600") %>
<%= password_input(f, :password, <%= password_input(f, :password,
required: true, required: true,
class: "mx-2 my-1 input input-primary col-span-2" class: "mx-2 my-1 input input-primary col-span-2"
@ -79,7 +79,7 @@
<%= error_tag(f, :password, "col-span-3") %> <%= error_tag(f, :password, "col-span-3") %>
<%= label(f, :password_confirmation, gettext("Confirm new password"), <%= label(f, :password_confirmation, gettext("Confirm new password"),
class: "title text-lg text-primary-500" class: "title text-lg text-primary-600"
) %> ) %>
<%= password_input(f, :password_confirmation, <%= password_input(f, :password_confirmation,
required: true, required: true,
@ -89,7 +89,7 @@
<%= label(f, :current_password, gettext("Current password"), <%= label(f, :current_password, gettext("Current password"),
for: "current_password_for_password", for: "current_password_for_password",
class: "title text-lg text-primary-500" class: "title text-lg text-primary-600"
) %> ) %>
<%= password_input(f, :current_password, <%= password_input(f, :current_password,
required: true, required: true,