Skip to content

Commit 45c1ab5

Browse files
fix: activities styling
1 parent be8934d commit 45c1ab5

5 files changed

Lines changed: 9 additions & 15 deletions

File tree

assets/js/app.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@ import {Socket} from "phoenix"
2424
import {LiveSocket} from "phoenix_live_view"
2525
import "../vendor/alpine.js";
2626
import topbar from "../vendor/topbar"
27-
import { QrScanner, InitSorting, StickyScroll, ScrollToTop, AutoFocus } from "./hooks";
27+
import { QrScanner, InitSorting, StickyScroll, ScrollToTop } from "./hooks";
2828
import phxFeedbackDom from "./shims/phx_feedback_dom.js"
2929

3030
let Hooks = {
3131
QrScanner: QrScanner,
3232
InitSorting: InitSorting,
3333
StickyScroll: StickyScroll,
3434
ScrollToTop: ScrollToTop,
35-
AutoFocus: AutoFocus,
3635
};
3736

3837
let csrfToken = document.querySelector("meta[name='csrf-token']").getAttribute("content")

assets/js/hooks/auto_focus.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/atomic_web/live/activity_live/components/activity_card.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ defmodule AtomicWeb.ActivityLive.Components.ActivityCard do
3535
<% end %>
3636
</div>
3737
</div>
38-
<object>
38+
<object class="w-2/3">
3939
<.link navigate={~p"/organizations/#{@activity.organization.id}"} class="group flex max-w-min pt-2">
4040
<.icon name="hero-building-office" class="mr-1.5 h-5 w-5 text-zinc-400" />
41-
<span class="text-sm text-zinc-500 focus:outline-none group-hover:underline">
41+
<span class="text-sm text-zinc-500 focus:outline-none group-hover:underline truncate">
4242
{@activity.organization.name}
4343
</span>
4444
</.link>

lib/atomic_web/live/activity_live/form_component.html.heex

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
phx-target={@myself}
5555
>
5656
<%= if not @has_description? do %>
57-
<label class="cursor-pointer text-left text-gray-500">
57+
<label class="cursor-pointer text-left font-normal text-gray-500 py-[2px]">
5858
Add description
5959
</label>
6060
<% end %>
@@ -110,7 +110,7 @@
110110
/>
111111
<% else %>
112112
<.field
113-
class="cursor-pointer border-none bg-transparent p-0 text-sm text-gray-900 shadow-none focus:border-transparent focus:outline-none focus:ring-0"
113+
class="cursor-pointer border-none bg-transparent p-0 text-sm text-gray-900 shadow-none focus:border-transparent focus:outline-none focus:ring-0 font-normal"
114114
type="number"
115115
field={@form[:maximum_entries]}
116116
label="Maximum entries"
@@ -139,9 +139,9 @@
139139
</div>
140140
</div>
141141
</div>
142-
<.modal :if={@description_modal} id="description-modal" show on_cancel={JS.push("toggle_description_modal", target: @myself)}>
142+
<.modal :if={@description_modal} id="description-modal" show on_cancel={JS.push("toggle_description_modal", target: @myself)} class="textarea">
143143
<div class="mt-4 flex-grow">
144-
<.field class="\-h-10 resize-none" type="textarea" field={@form[:description]} label="Description" placeholder="Choose description" rows={15} required />
144+
<.field id="description-input" class="\-h-10 resize-none" type="textarea" field={@form[:description]} label="Description" placeholder="Choose description" rows={15} required phx-hook="AutoFocus"/>
145145
<div class="flex w-full justify-end">
146146
<.button class="text" type="button" phx-click="toggle_description_modal" phx-target={@myself}>
147147
<span>{gettext("Done")}</span>

lib/atomic_web/live/activity_live/show.html.heex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
{pretty_display_date(@activity.start)}
6767
</p>
6868
<p>
69-
{"#{display_time(@activity.start)}-#{display_time(@activity.finish)}"}
69+
{"#{display_time(@activity.start)} - #{display_time(@activity.finish)}"}
7070
</p>
7171
</div>
7272
<% else %>
@@ -75,7 +75,7 @@
7575
{pretty_display_date(@activity.start)} - {pretty_display_date(@activity.finish)}
7676
</p>
7777
<p>
78-
{"#{display_time(@activity.start)}-#{display_time(@activity.finish)}"}
78+
{"#{display_time(@activity.start)} - #{display_time(@activity.finish)}"}
7979
</p>
8080
</div>
8181
<% end %>

0 commit comments

Comments
 (0)