Skip to content

Commit

Permalink
🌸 Marketplace: De-italicize-all-things
Browse files Browse the repository at this point in the history
- zinc-collective#831
- zinc-collective#1325
- zinc-collective#2153
- zinc-collective#2215
- zinc-collective#1137
- zinc-collective#2169

@anaulin has mentioned at least twice how she despises italics; but no
one has taken on the task.

So I did a quick skim-through for all the `italic` that lives within the
`Marketplace`, and removed them in place of:

- Making text size smaller
- Making text color grayer
  • Loading branch information
zspencer committed Mar 25, 2024
1 parent c6310eb commit f637bea
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions app/furniture/marketplace/cart/deliveries/_delivery.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<h3 class="font-bold">Delivering to:</h3>
<p>
<%= render(delivery.delivery_area) %><br />
<span class="text-sm font-light italic"><%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %></span>
<span class="text-sm font-light"><%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %></span>
</p>

<div class="rounded p-2 bg-orange-50 mb-3">
Expand All @@ -13,7 +13,7 @@
<%= number_to_phone(delivery.contact_phone_number) %><br />
<%= delivery.delivery_address %><br />

<span class="italic text-gray-800"><%= delivery.delivery_notes %></span>
<span class="text-gray-800"><%= delivery.delivery_notes %></span>
</p>
<p class="text-sm">
<%= link_to(t("marketplace.cart.deliveries.edit.link_to"), delivery.location(:edit)) %>
Expand Down
4 changes: 2 additions & 2 deletions app/furniture/marketplace/delivery_area_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</h3>

<%- if delivery_area.archived? %>
<p class="italic">(archived)</p>
<p class="text-sm">(archived)</p>
<%- end %>
<%- end %>

Expand All @@ -15,7 +15,7 @@
<%= render Marketplace::Cart::DeliveryExpectationsComponent.new(order_by: delivery_area.order_by, delivery_window: delivery_area.delivery_window, cart: example_cart) %>
</div>

<div class="text-right mt-3 italic">
<div class="text-right mt-3">
<%= price %>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/furniture/marketplace/menu/product_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<% end %>


<div class="text-sm italic">
<div class="text-sm">
<%= description %>
</div>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<h3 class="w-full text-center">
<%= link_to "Order #{order.id}", order.persisted? ? order.location : "#" %>
</h3>
<p class="w-full text-center text-sm italic">
<p class="w-full text-center text-sm">
<%= placed_at %>
</p>

Expand Down
6 changes: 3 additions & 3 deletions app/furniture/marketplace/orders/_order.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
<span class="col-span-2 text-right"><%= humanized_money_with_symbol(ordered_product.price) %></span>

<%- if ordered_product.tax_amount.positive? %>
<span class="col-span-4 text-sm italic mb-4">
<span class="col-span-4 text-sm mb-4">
<%= ordered_product.tax_rates.map(&:label).to_sentence %>
</span>
<span class="col-span-2 text-right text-sm italic"><%= humanized_money_with_symbol(ordered_product.tax_amount) %></span>
<span class="col-span-2 text-right text-sm"><%= humanized_money_with_symbol(ordered_product.tax_amount) %></span>
<%- end %>
<%- end %>
<hr class="col-span-6 mb-4" />
Expand All @@ -35,7 +35,7 @@
<div class="grid grid-cols-2">
<%- order.events.each do |event| %>
<p><%= event.description%></p>
<p class="italic text-right"><%= l(event.created_at, format: :long_ordinal) %></p>
<p class="text-right"><%= l(event.created_at, format: :long_ordinal) %></p>
<%- end %>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions app/furniture/marketplace/product_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<figcaption class="px-2 pt-4 sm:px-4">
<%= render Marketplace::Product::TitleComponent.new(product:) %>
<%- if product.archived? %>
<span class="italic">(archived)</span>
<span class="text-sm">(archived)</span>
<%- end %>
</figcaption>
</figure>
Expand All @@ -17,12 +17,12 @@
<%- end %>
<%- end %>

<div class="text-sm italic">
<div class="text-sm">
<%= description %>
</div>

<div class="text-right mt-3">
<div class="text-xs italic">
<div class="text-xs">
<%= tax_rates %>
</div>
<p><%= price %></p>
Expand Down
2 changes: 1 addition & 1 deletion app/furniture/marketplace/tax_rate_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h3><%= label %></h3>
<%- end %>

<div class="italic">
<div>
<%= rate %>
</div>

Expand Down

0 comments on commit f637bea

Please sign in to comment.