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

Remove bottom border of non-form fieldsets #2425

Merged
merged 1 commit into from
Dec 20, 2017
Merged

Remove bottom border of non-form fieldsets #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions backend/app/assets/stylesheets/spree/backend/shared/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@ fieldset {

&.no-border-bottom {
border-bottom: none;
}

&.no-margin-bottom {
margin-bottom: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/images/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<%= render 'new', product: @product, image: Spree::Image.new(viewable: @product) %>
</div>

<fieldset>
<fieldset class="no-border-bottom">
<legend align="center"><%= t(".upload_images") %></legend>

<div id="upload-zone">
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/store_credits/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<% if @store_credits.any? %>
<% @store_credits.group_by(&:currency).each do |currency, credits| %>
<fieldset class="sc-current-balance">
<fieldset class="sc-current-balance no-border-bottom">
<legend>
<%= currency %> <%= t('spree.admin.store_credits.current_balance') %>
<% total = credits.sum(&:amount_remaining) %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/store_credits/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
</tr>
</table>

<fieldset>
<fieldset class="no-border-bottom">
<legend align='center'><%= t('spree.admin.store_credits.history') %></legend>
<table>
<colgroup>
Expand Down
12 changes: 6 additions & 6 deletions backend/app/views/spree/admin/taxons/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<% admin_breadcrumb(link_to plural_resource_name(Spree::Product), spree.admin_products_path) %>
<% admin_breadcrumb(t('spree.admin.taxons.display_order')) %>

<% content_for :table_filter_title do %>
<%= t('spree.choose_a_taxon_to_sort_products_for') %>
<% end %>
<fieldset class="no-border-bottom">
<legend>
<%= t('spree.choose_a_taxon_to_sort_products_for') %>
</legend>

<% content_for :table_filter do %>
<div data-hook="admin_orders_index_search" class="col-4">
<input type='text' id='taxon_id' />
</div>
<% end %>
</fieldset>

<div class='col-10'>
<div class='col-12'>
<div id='taxon_products' class='list-group'></div>
</div>
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/users/_sidebar.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<% content_for :sidebar do %>
<nav class="menu">
<fieldset class='no-border-top' data-hook="admin_user_lifetime_stats">
<fieldset class="no-border-top no-border-bottom" data-hook="admin_user_lifetime_stats">
<dl id="user-lifetime-stats">
<dt><%= t('spree.total_sales') %>:</dt>
<dd><%= @user.display_lifetime_value.to_html %></dd>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/users/items.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= render 'spree/admin/users/tabs', current: :items %>
<%= render partial: 'spree/admin/users/user_page_actions' %>

<fieldset data-hook="admin_user_items_purchased">
<fieldset data-hook="admin_user_items_purchased" class="no-border-bottom">
<legend><%= t("spree.admin.user.items_purchased") %></legend>

<%= paginate @orders, theme: "solidus_admin" %>
Expand Down
2 changes: 1 addition & 1 deletion backend/app/views/spree/admin/users/orders.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<%= render 'spree/admin/users/tabs', current: :orders %>
<%= render partial: 'spree/admin/users/user_page_actions' %>

<fieldset data-hook="admin_user_order_history">
<fieldset data-hook="admin_user_order_history" class="no-border-bottom">
<legend><%= t("spree.admin.user.order_history") %></legend>

<%= paginate @orders, theme: "solidus_admin" %>
Expand Down