From f637bea5b073e17564e349e1805203d8a1c927d3 Mon Sep 17 00:00:00 2001 From: Zee Spencer <50284+zspencer@users.noreply.github.com> Date: Sun, 18 Feb 2024 10:18:12 -0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8C=B8=20`Marketplace`:=20De-italicize-al?= =?UTF-8?q?l-things?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - https://github.com/zinc-collective/convene/issues/831 - https://github.com/zinc-collective/convene/issues/1325 - https://github.com/zinc-collective/convene/issues/2153 - https://github.com/zinc-collective/convene/issues/2215 - https://github.com/zinc-collective/convene/issues/1137 - https://github.com/zinc-collective/convene/issues/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 --- .../marketplace/cart/deliveries/_delivery.html.erb | 4 ++-- app/furniture/marketplace/delivery_area_component.html.erb | 4 ++-- app/furniture/marketplace/menu/product_component.html.erb | 2 +- .../marketplace/order/email_receipt_component.html.erb | 2 +- app/furniture/marketplace/orders/_order.html.erb | 6 +++--- app/furniture/marketplace/product_component.html.erb | 6 +++--- app/furniture/marketplace/tax_rate_component.html.erb | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb index 0a2b34af7..9a1ef53b9 100644 --- a/app/furniture/marketplace/cart/deliveries/_delivery.html.erb +++ b/app/furniture/marketplace/cart/deliveries/_delivery.html.erb @@ -4,7 +4,7 @@

Delivering to:

<%= render(delivery.delivery_area) %>
- <%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %> + <%= render(Marketplace::Cart::DeliveryExpectationsComponent.new(cart: delivery.cart)) %>

@@ -13,7 +13,7 @@ <%= number_to_phone(delivery.contact_phone_number) %>
<%= delivery.delivery_address %>
- <%= delivery.delivery_notes %> + <%= delivery.delivery_notes %>

<%= link_to(t("marketplace.cart.deliveries.edit.link_to"), delivery.location(:edit)) %> diff --git a/app/furniture/marketplace/delivery_area_component.html.erb b/app/furniture/marketplace/delivery_area_component.html.erb index 10b2363d7..1539b282a 100644 --- a/app/furniture/marketplace/delivery_area_component.html.erb +++ b/app/furniture/marketplace/delivery_area_component.html.erb @@ -6,7 +6,7 @@ <%- if delivery_area.archived? %> -

(archived)

+

(archived)

<%- end %> <%- end %> @@ -15,7 +15,7 @@ <%= render Marketplace::Cart::DeliveryExpectationsComponent.new(order_by: delivery_area.order_by, delivery_window: delivery_area.delivery_window, cart: example_cart) %>
-
+
<%= price %>
diff --git a/app/furniture/marketplace/menu/product_component.html.erb b/app/furniture/marketplace/menu/product_component.html.erb index d9f610162..1c05632eb 100644 --- a/app/furniture/marketplace/menu/product_component.html.erb +++ b/app/furniture/marketplace/menu/product_component.html.erb @@ -16,7 +16,7 @@ <% end %> -
+
<%= description %>
diff --git a/app/furniture/marketplace/order/email_receipt_component.html.erb b/app/furniture/marketplace/order/email_receipt_component.html.erb index 05cdef8fa..8feba2698 100644 --- a/app/furniture/marketplace/order/email_receipt_component.html.erb +++ b/app/furniture/marketplace/order/email_receipt_component.html.erb @@ -10,7 +10,7 @@

<%= link_to "Order #{order.id}", order.persisted? ? order.location : "#" %>

-

+

<%= placed_at %>

diff --git a/app/furniture/marketplace/orders/_order.html.erb b/app/furniture/marketplace/orders/_order.html.erb index 861cdc944..0203aee07 100644 --- a/app/furniture/marketplace/orders/_order.html.erb +++ b/app/furniture/marketplace/orders/_order.html.erb @@ -14,10 +14,10 @@ <%= humanized_money_with_symbol(ordered_product.price) %> <%- if ordered_product.tax_amount.positive? %> - + <%= ordered_product.tax_rates.map(&:label).to_sentence %> - <%= humanized_money_with_symbol(ordered_product.tax_amount) %> + <%= humanized_money_with_symbol(ordered_product.tax_amount) %> <%- end %> <%- end %>
@@ -35,7 +35,7 @@
<%- order.events.each do |event| %>

<%= event.description%>

-

<%= l(event.created_at, format: :long_ordinal) %>

+

<%= l(event.created_at, format: :long_ordinal) %>

<%- end %>
diff --git a/app/furniture/marketplace/product_component.html.erb b/app/furniture/marketplace/product_component.html.erb index aa3c4b5c5..07067b068 100644 --- a/app/furniture/marketplace/product_component.html.erb +++ b/app/furniture/marketplace/product_component.html.erb @@ -6,7 +6,7 @@
<%= render Marketplace::Product::TitleComponent.new(product:) %> <%- if product.archived? %> - (archived) + (archived) <%- end %>
@@ -17,12 +17,12 @@ <%- end %> <%- end %> -
+
<%= description %>
-
+
<%= tax_rates %>

<%= price %>

diff --git a/app/furniture/marketplace/tax_rate_component.html.erb b/app/furniture/marketplace/tax_rate_component.html.erb index 516f974d0..9da59c56c 100644 --- a/app/furniture/marketplace/tax_rate_component.html.erb +++ b/app/furniture/marketplace/tax_rate_component.html.erb @@ -3,7 +3,7 @@

<%= label %>

<%- end %> -
+
<%= rate %>