Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/views/announcements/_announcement_card.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<% if announcement.draft? %>
<span class="text-orange border-orange rounded-full border-solid border-[1px] text-sm p-[6px] mr-1 no-underline">Draft</span>
<% end %>
<%= link_to announcement.title, announcement_path(announcement) %>
<%= link_to announcement.title, announcement_path(announcement), class: "font-bold no-underline text-black dark:text-smoke hover:underline" %>
</h2>
<% if organizer_signed_in?(as: :member) && !show_event %>
<div class="flex gap-2">
Expand Down
18 changes: 8 additions & 10 deletions app/views/announcements/_announcement_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,22 @@

<%= form_with model: @announcement, url: announcement_path(@announcement), data: { controller: "tiptap", "tiptap-target": "form", "tiptap-content-value": content, "tiptap-announcement-id-value": @announcement.id, "tiptap-autosave-value": autosave, "turbo-frame": "_top" }.compact do |form| %>
<div class="field">
<%= form.label :title %>
<%= form.text_field :title, placeholder: "#{@event.name}'s June Update", class: "!max-w-none w-full" %>
<%= form.label :title, class: "text-lg" %>
<%= form.text_field :title, placeholder: "#{@event.name}'s June Update", class: "!max-w-none w-full mt-1" %>
</div>

<div class="field">
<%= form.label :content %>
<%= form.label :content, class: "text-lg" %>
<%= form.hidden_field :json_content, data: { "tiptap-target": "contentInput" } %>
<div class="border-smoke dark:border-0 border-[1px] border-solid rounded-md">
<div class="border-smoke dark:border-0 border-[1px] border-solid rounded-md mt-1 relative">
<div class="flex gap-2 bg-snow dark:bg-darkless p-2 rounded-md rounded-b-none dark:border-b-dark border-b-smoke border-b-[1px] border-solid border-0">
<%= render partial: "announcements/format_menu" %>
</div>
<div data-tiptap-target="editor" data-action="click->tiptap#focus" class="dark:bg-darkless bg-snow p-2 rounded-md rounded-t-none py-1 min-h-16"></div>
<div data-tiptap-target="editor" data-action="click->tiptap#focus" class="dark:bg-darkless bg-snow p-2 rounded-md rounded-t-none py-1 min-h-32"></div>
<div class="tooltipped absolute right-1 bottom-1 h-8" aria-label="Styling with Markdown is supported">
<%= inline_icon "markdown", size: 32 %>
</div>
</div>
<p class="h5 muted mt0 mb1">
<%= link_to "https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet#table-of-contents", target: "_blank", class: "flex items-center" do %>
<%= inline_icon "markdown", size: 32 %> Styling with Markdown is supported
<% end %>
</p>
</div>

<%= form.hidden_field :autosave, data: { "tiptap-target": "autosaveInput" } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/events/_followers_modal.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<section class="modal modal--scroll bg-snow" data-behavior="modal" role="dialog" id="edit_followers">
<%= modal_header "Followers" %>
<ul class="grid grid-cols-1 text-left w-full mt-2">
<ul class="grid grid-cols-<%= event_follows.size == 1 ? "1" : "2" %> text-left w-full mt-2">
<% event_follows.each do |event_follow| %>
<li class="overflow-visible card card--hover flex flex-row justify-between items-center gap-2">
<span class="w-full flex gap-2 items-center align-middle">
Expand Down
6 changes: 3 additions & 3 deletions app/views/static_pages/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@
<%# Latest HCB announcement %>
<div class="flex flex-row w-full justify-between items-center">
<h2 class="heading h2 line-height-4 my-2 mr-auto py-2 px-4 ml-0 pl-0 border-none">
HCB announcements
The latest from HCB
</h2>
<%= link_to event_announcement_overview_path(Event.find(EventMappingEngine::EventIds::HACK_CLUB_BANK)), class: "muted", target: :_blank do %>
View all announcements
<%= inline_icon "external", size: 18, class: "ml-1 align-text-top", style: "transform: scale(1.2)" %>
<% end %>
</div>
<div class="flex flex-col gap-2 items-start text-left w-full self-stretch">
<%= render partial: "announcements/announcement_card", collection: Event.find(EventMappingEngine::EventIds::HACK_CLUB_BANK).announcements.published.order(published_at: :desc).last(2), as: :announcement %>
<div class="mb-4 text-left w-full self-stretch">
<%= render partial: "announcements/announcement_card", locals: { announcement: Event.find(EventMappingEngine::EventIds::HACK_CLUB_BANK).announcements.published.order(published_at: :desc).last } %>
</div>

<%= render "static_pages/index/explore" %>
Expand Down