Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[admin] Cleanup TW classes #5550

Merged
merged 4 commits into from
Dec 13, 2023
Merged

[admin] Cleanup TW classes #5550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6306ac6
Replace typography classes with standard Tailwind utility classes
elia Dec 13, 2023
e0ae46c
Combine all additional variants in a single plugin
elia Dec 13, 2023
7b0effe
Move the reset of the <summary> element marker to a plugin
elia Dec 13, 2023
adbc203
Move the .body-link CSS component class to a plugin
elia Dec 13, 2023
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
45 changes: 0 additions & 45 deletions admin/app/assets/stylesheets/solidus_admin/application.tailwind.css.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,4 @@
@tailwind components;
@tailwind utilities;

@layer base {
summary {
&::marker,
&::-webkit-details-marker {
@apply hidden;
}

list-style: none;
}
}

@layer components {
.body-tiny {
@apply font-sans font-normal text-xs;
}

.body-tiny-bold {
@apply font-sans font-semibold text-xs;
}

.body-small {
@apply font-sans font-normal text-sm;
}

.body-small-bold {
@apply font-sans font-semibold text-sm;
}

.body-text {
@apply font-sans font-normal text-base;
}

.body-text-bold {
@apply font-sans font-semibold text-base;
}

.body-title {
@apply font-sans font-semibold text-xl;
}

.body-link {
@apply text-blue hover:underline;
}
}

<%= SolidusAdmin::Config.tailwind_stylesheets.map { File.read(_1) }.join("\n") %>
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/layout/feedback/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<span class="underline"><%= t(".give_feedback") %></span>
</span>

<span class="body-small text-center">
<span class="font-normal text-sm text-center">
<%= t(".feedback_description_html") %>
</span>
<% end %>
6 changes: 3 additions & 3 deletions admin/app/components/solidus_admin/layout/navigation/account/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
class="
flex gap-1.5
p-3 mt-2 rounded
body-small-bold text-gray-500
font-semibold text-sm text-gray-500
hover:bg-gray-25 [[open]_>_&]:bg-gray-25
cursor-pointer
">
<%= icon_tag("user-smile-fill", class: "inline-block align-text-bottom shrink-0 w-6 h-6 rounded-[4.81rem] body-small fill-yellow bg-black") %>
<%= icon_tag("user-smile-fill", class: "inline-block align-text-bottom shrink-0 w-6 h-6 rounded-[4.81rem] font-normal text-sm fill-yellow bg-black") %>
<span class="overflow-hidden whitespace-nowrap text-ellipsis leading-6">
<%= @user_label %>
</span>
Expand All @@ -22,7 +22,7 @@
<ul
class="
p-2 mb-1 absolute bottom-full left-0 w-full
body-small text-black bg-white
font-normal text-sm text-black bg-white
border border-gray-100 rounded-lg
shadow-base
">
Expand Down
6 changes: 3 additions & 3 deletions admin/app/components/solidus_admin/layout/navigation/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<%= link_to @store_url, target: :_blank, class: "flex mb-4 px-2 py-1.5 border border-gray-100 rounded-sm shadow-sm" do %>
<div class="flex-grow flex flex-col gap-0.5">
<p class="body-small-bold text-black"><%= @store.name %></p>
<p class="body-tiny text-gray-500"><%= @store.url %></p>
<p class="font-semibold text-sm text-black"><%= @store.name %></p>
<p class="font-normal text-xs text-gray-500"><%= @store.url %></p>
</div>
<%= render component("ui/icon").new(name: 'arrow-right-up-line', class: 'w-4 h-4 fill-gray-400') %>
<% end %>
Expand All @@ -22,7 +22,7 @@

<div class="mt-auto">
<div class="group mb-3">
<label class="flex gap-3 items-center py-0.5 px-3 pb-0.5 rounded hover:text-red-500 hover:bg-gray-50 body-small-bold text-black cursor-pointer">
<label class="flex gap-3 items-center py-0.5 px-3 pb-0.5 rounded hover:text-red-500 hover:bg-gray-50 font-semibold text-sm text-black cursor-pointer">
<%= t('spree.navigation.switch_to_legacy') %>
<div class="flex items-center">
<%= render component("ui/forms/switch").new(size: :s, checked: false, 'data-action': "#{stimulus_id}#setCookie:prevent") %>
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/layout/navigation/item/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
py-1 px-3 rounded
hover:text-red-500 hover:bg-gray-50
<%= "text-red-500 bg-gray-50" if active? %>
<%= @item.top_level ? "body-small-bold text-black" : "body-small text-gray-600" %>
<%= @item.top_level ? "font-semibold text-sm text-black" : "font-normal text-sm text-gray-600" %>
"
>
<i class="w-[1.125rem] h-[1.125rem] body-small flex">
<i class="w-[1.125rem] h-[1.125rem] font-normal text-sm flex">
<% if @item.icon %>
<%= icon_tag(@item.icon, class: "inline-block w-full h-full fill-current") %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/layout/page_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def page_header_back(back_path)

def page_header_title(title, &block)
tag.h1(safe_join([
tag.span(title, class: "body-title"),
tag.span(title, class: "font-semibold text-xl"),
(capture(&block) if block_given?) || "",
]), class: "flex-1 text-2xl font-bold")
end
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/layout/skip_link/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def call
inline-block
focus:p-2
focus:absolute
body-small
font-normal text-sm
text-white
bg-black
}
Expand Down
10 changes: 5 additions & 5 deletions admin/app/components/solidus_admin/orders/cart/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
<table class="table-auto w-full" <%= :hidden if @order.line_items.empty? %>>
<thead>
<tr>
<th class="text-left body-small-bold text-gray-800 bg-gray-15 px-6 py-3 leading-none">Product</th>
<th class="text-left body-small-bold text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16">Quantity</th>
<th class="text-left body-small-bold text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16">Price</th>
<th class="text-left body-small-bold text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16"><span class="sr-only">Actions</span></th>
<th class="text-left font-semibold text-sm text-gray-800 bg-gray-15 px-6 py-3 leading-none">Product</th>
<th class="text-left font-semibold text-sm text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16">Quantity</th>
<th class="text-left font-semibold text-sm text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16">Price</th>
<th class="text-left font-semibold text-sm text-gray-800 bg-gray-15 px-6 py-3 leading-none w-16"><span class="sr-only">Actions</span></th>
</tr>
</thead>
<tbody>
Expand Down Expand Up @@ -53,7 +53,7 @@
<% end %>
</td>
<td class="px-6 py-4">
<span class="text-gray-500 body-small"><%= line_item.single_money.to_html %></span>
<span class="text-gray-500 font-normal text-sm"><%= line_item.single_money.to_html %></span>
</td>
<td class="px-6 py-4 text-right">
<%= form_for(line_item, url: solidus_admin.order_line_item_path(@order, line_item), method: :delete) do |f| %>
Expand Down
8 changes: 4 additions & 4 deletions admin/app/components/solidus_admin/orders/cart/result/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
alt: @variant.name
) %>
<div class="flex-col">
<div class="leading-5 text-black body-small-bold"><%= @variant.name %></div>
<div class="leading-5 text-gray-500 body-small">
<div class="leading-5 text-black font-semibold text-sm"><%= @variant.name %></div>
<div class="leading-5 text-gray-500 font-normal text-sm">
SKU:
<%= @variant.sku %>
<%= @variant.options_text.presence&.prepend("- ") %>
</div>
</div>
</div>
<div class="flex gap-2 items-center">
<span class="text-gray-500 body-small"><%= render component("products/stock").from_variant(@variant) %></span>
<span class="text-black body-small"><%= @variant.display_price.to_html %></span>
<span class="text-gray-500 font-normal text-sm"><%= render component("products/stock").from_variant(@variant) %></span>
<span class="text-black font-normal text-sm"><%= @variant.display_price.to_html %></span>
</div>
<% end %>
<% end %>
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/orders/index/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="<%= stimulus_id %> px-4">
<header class="py-6 flex items-center">
<h1 class="body-title">
<h1 class="font-semibold text-xl">
<%= title %>
</h1>

Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/orders/show/address/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
value: '1'
) %>

<span class="body-text-sm">
<span class="font-normal text-xs">
<%= t(".use_this_address.#{@type}") %>
</span>
</label>
Expand Down
20 changes: 10 additions & 10 deletions admin/app/components/solidus_admin/orders/show/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@

<% panel.with_section(class: 'flex flex-col gap-6') do %>
<div class="flex flex-col gap-2">
<span class="body-small-bold"><%= t(".customer") %></span>
<span class="font-semibold text-sm"><%= t(".customer") %></span>
<% if @order.user %>
<div class="body-small"><%= customer_name(@order.user) || tag.span(t('.no_name'), class: "text-gray-500") %></div>
<div class="body-small body-link"><%= link_to @order.user.email, spree.admin_user_path(@order.user) %></div>
<div class="body-small text-gray-500"><%= t(".orders_count", count: @order.user.orders.complete.count) %></div>
<div class="font-normal text-sm"><%= customer_name(@order.user) || tag.span(t('.no_name'), class: "text-gray-500") %></div>
<div class="font-normal text-sm body-link"><%= link_to @order.user.email, spree.admin_user_path(@order.user) %></div>
<div class="font-normal text-sm text-gray-500"><%= t(".orders_count", count: @order.user.orders.complete.count) %></div>
<% else %>
<%= render component('orders/show/customer_search').new(order: @order) %>
<% end %>
</div>

<div class="flex flex-col gap-2">
<span class="body-small-bold"><%= t('.order_email') %></span>
<div class="body-small">
<span class="font-semibold text-sm"><%= t('.order_email') %></span>
<div class="font-normal text-sm">
<% if @order.email? %>
<%= @order.email %>
<% else %>
Expand All @@ -45,8 +45,8 @@
</div>

<div class="flex flex-col gap-2">
<span class="body-small-bold"><%= @order.class.human_attribute_name(:ship_address) %></span>
<div class="body-small">
<span class="font-semibold text-sm"><%= @order.class.human_attribute_name(:ship_address) %></span>
<div class="font-normal text-sm">
<% if @order.ship_address %>
<%= format_address @order.ship_address %>
<% else %>
Expand All @@ -56,8 +56,8 @@
</div>

<div class="flex flex-col gap-2">
<span class="body-small-bold"><%= @order.class.human_attribute_name(:bill_address) %></span>
<div class="body-small">
<span class="font-semibold text-sm"><%= @order.class.human_attribute_name(:bill_address) %></span>
<div class="font-normal text-sm">
<% if @order.bill_address.blank? %>
<%= link_to t(".add_billing"), solidus_admin.edit_order_bill_address_path(@order), class: 'body-link' %>
<% elsif @order.bill_address == @order.ship_address %>
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/orders/show/customer_search/result/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<button type="submit" class="flex gap-2 grow items-center">
<%= render component("ui/icon").new(name: "user-line", class: 'w-5 h-5 m-2') %>
<div class="flex-col text-left">
<div class="leading-5 text-black body-small-bold"><%= @name %></div>
<div class="leading-5 text-gray-500 body-small"><%= @customer.email %></div>
<div class="leading-5 text-black font-semibold text-sm"><%= @name %></div>
<div class="leading-5 text-gray-500 font-normal text-sm"><%= @customer.email %></div>
</div>
</button>
<% end %>
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/orders/show/email/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<%= render component("ui/modal").new(title: t(".title"), close_path: close_path) do |modal| %>
<%= form_for @order, url: close_path, html: { id: form_id} do |f| %>
<%= render component("ui/forms/field").text_field(f, :email) %>
<label class="body-small mt-4 block">
<label class="font-normal text-sm mt-4 block">
<%= t('.guest_checkout') %>:
<output class="body-small-bold"><%= @order.user ? t('.no') : t('.yes') %></output>
<output class="font-semibold text-sm"><%= @order.user ? t('.no') : t('.yes') %></output>
<%= render component('ui/toggletip').new(text: t('.guest_checkout_tip'), class: "align-middle") %>
</label>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/products/show/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
name: "#{f.object_name}[promotionable]",
checked: f.object.promotionable
) %>
<span class="body-text-sm"><%= Spree::Product.human_attribute_name :promotionable %></span>
<span class="font-normal text-xs"><%= Spree::Product.human_attribute_name :promotionable %></span>
<%= render component("ui/toggletip").new(text: t(".hints.promotionable_html")) %>
</label>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/refunds_and_returns/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%= page_header do %>
<%= page_header_title safe_join([
tag.div(t(".title")),
tag.div(t(".subtitle"), class: "body-small text-gray-500"),
tag.div(t(".subtitle"), class: "font-normal text-sm text-gray-500"),
]) %>
<% end %>
<%= page_header do %>
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/shipping/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%= page_header do %>
<%= page_header_title safe_join([
tag.div(t(".title")),
tag.div(t(".subtitle"), class: "body-small text-gray-500"),
tag.div(t(".subtitle"), class: "font-normal text-sm text-gray-500"),
]) %>
<% end %>

Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/taxes/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<%= page_header do %>
<%= page_header_title safe_join([
tag.div(t(".title")),
tag.div(t(".subtitle"), class: "body-small text-gray-500"),
tag.div(t(".subtitle"), class: "font-normal text-sm text-gray-500"),
]) %>
<% end %>

Expand Down
3 changes: 2 additions & 1 deletion admin/app/components/solidus_admin/ui/dropdown/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ def initialize(text: nil, size: :m, direction: :left, **attributes)
@attributes[:"data-controller"] = "#{stimulus_id} #{attributes[:"data-controller"]}"
@attributes[:"data-action"] = "turbo:before-cache@window->#{stimulus_id}#close #{attributes[:"data-action"]}"
@attributes[:class] = "
#{@size == :m ? 'body-text' : 'body-small'}
font-normal
#{@size == :m ? 'text-base' : 'text-sm'}
#{@attributes[:class]}
"
end
Expand Down
5 changes: 2 additions & 3 deletions admin/app/components/solidus_admin/ui/forms/field/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
<div class="flex gap-1 items-center">
<span class="
text-gray-700
body-tiny-bold
body-text-xs-semibold
font-semibold text-xs
"><%= @label %></span>

<%= render component('ui/toggletip').new(text: @tip) if @tip.present? %>
Expand All @@ -19,7 +18,7 @@

<% if @hint.present? || @error.present? %>
<div class="
body-tiny
font-normal text-xs
[:disabled~&]:text-gray-300 text-gray-500
flex gap-1 flex-col
">
Expand Down
6 changes: 3 additions & 3 deletions admin/app/components/solidus_admin/ui/forms/input/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

class SolidusAdmin::UI::Forms::Input::Component < SolidusAdmin::BaseComponent
SIZES = {
s: "form-control-sm px-3 py-1.5 body-small",
m: "form-control-md px-3 py-1.5 body-small",
l: "form-control-lg px-3 py-1.5 body-text"
s: "form-control-sm px-3 py-1.5 font-normal text-sm",
m: "form-control-md px-3 py-1.5 font-normal text-sm",
l: "form-control-lg px-3 py-1.5 font-normal text-base"
}.freeze

HEIGHTS = {
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/ui/forms/switch_field/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<label class="flex flex-wrap items-center gap-2 w-full border border-gray-100 rounded px-4 py-2">
<div class="flex gap-1 items-center grow py-2">
<span class="text-gray-700 body-tiny-bold body-text-bold"><%= @label %></span>
<span class="text-gray-700 font-semibold text-base"><%= @label %></span>

<%= render component("ui/toggletip").new(text: @tip) if @tip.present? %>
</div>
Expand All @@ -10,7 +10,7 @@
<% if @hint.present? || @error.present? %>
<div
class="
w-full body-small [:disabled~&]:text-gray-300 text-gray-500 flex gap-1 flex-col pt-2 pb-4
w-full font-normal text-sm [:disabled~&]:text-gray-300 text-gray-500 flex gap-1 flex-col pt-2 pb-4
"
>
<%= tag.span @hint if @hint.present? %>
Expand Down
2 changes: 1 addition & 1 deletion admin/app/components/solidus_admin/ui/panel/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<% if @title %>
<section class="border-gray-100 border-t w-full first-of-type:border-t-0 p-6">
<h2>
<span class="body-title"><%= @title %></span>
<span class="font-semibold text-xl"><%= @title %></span>
<%= render component("ui/toggletip").new(text: @title_hint) if @title_hint %>
</h2>
</section>
Expand Down
4 changes: 2 additions & 2 deletions admin/app/components/solidus_admin/ui/resource_item/component.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
alt: @title,
) if @thumbnail %>
<div class="flex-col">
<div class="leading-5 text-black body-small-bold"><%= @title %></div>
<div class="leading-5 text-gray-500 body-small"><%= @subtitle %></div>
<div class="leading-5 text-black font-semibold text-sm"><%= @title %></div>
<div class="leading-5 text-gray-500 font-normal text-sm"><%= @subtitle %></div>
</div>
</div>
6 changes: 3 additions & 3 deletions admin/app/components/solidus_admin/ui/tab/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

class SolidusAdmin::UI::Tab::Component < SolidusAdmin::BaseComponent
SIZES = {
s: %w[h-7 px-1.5 body-small-bold],
m: %w[h-9 px-3 body-small-bold],
l: %w[h-12 px-4 body-text-bold],
s: %w[h-7 px-1.5 font-semibold text-sm],
m: %w[h-9 px-3 font-semibold text-sm],
l: %w[h-12 px-4 font-semibold text-base],
}

def initialize(text:, tag: :a, size: :m, current: false, disabled: false, **attributes)
Expand Down
Loading