-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* 🌸🛠️🧹 `Marketplace`: Tidy up `Marketplace#show` - #1326 - #1187 - 🛠️ `Components`: Makes sure Tailwind notices `Furniture`'s `Component` files - 🧹 `Components` I'm not sure if this is the right path or not but it decouples our `ButtonComponent` from the `button.scss` file, and makes it a bit easier to override the defaults for how we present buttons. - 🌸 Gets rid of the extra `Marketplace::Cart::Delivery::EditButtonComponent` that hangs out underneath the cart - 🌸 Tailors the `Marketplace::Cart::Delivery::EditButtonComponent` better for smaller screens. * 🧹`Components`: Consolidate `margin` and `padding` as `spacing` Again, not sure this is a great idea but I wanted some way to partially overload the default classes a component uses.
- Loading branch information
Showing
5 changed files
with
35 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
<%- if @disabled %> | ||
<span class="no-underline bg-transparent hover:bg-primary-100 text-gray-700 button #{classes}"><%= @label %></span> | ||
<span class="<%= classes %>"><%= @label %></span> | ||
<%- else %> | ||
<%= link_to @label, | ||
@href, | ||
title: @title, | ||
method: @method, | ||
data: data, | ||
class: "no-underline bg-transparent hover:bg-primary-100 text-gray-700 button #{classes}" %> | ||
class: classes %> | ||
<%- end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 6 additions & 5 deletions
11
app/furniture/marketplace/cart/deliveries/_delivery.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
<div id="<%=dom_id(delivery) %>"> | ||
<div class="flex flex-wrap items-center justify-between text-sm"> | ||
<span>Delivering to: <%= render(delivery.delivery_area) if delivery.delivery_area.present? %></span> | ||
<div id="<%=dom_id(delivery) %>" class="flex flex-wrap items-center justify-between text-sm mt-1 sm:mt-2"> | ||
<span> | ||
<span class="font-bold">Delivering to:</span> | ||
<%= render(delivery.delivery_area) if delivery.delivery_area.present? %> | ||
</span> | ||
|
||
<%= render Marketplace::Cart::Delivery::EditButtonComponent.new(delivery) %> | ||
</div> | ||
<%= render Marketplace::Cart::Delivery::EditButtonComponent.new(delivery) %> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters