From 7734b0dc56787c794c8e46791866b58b3b20a451 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Fri, 1 Dec 2017 00:07:35 +0100
Subject: [PATCH] Remove bottom border of non-form fieldsets

We have too many borders in our layout. Whitespace, tables and headers are separating content areas already, no need additional borders. That only distracts the eye.

Keeps the bottom border for fieldsets that are holding a form. This makes sense as the form buttons sit on top of the bottom border and visually encloses the form field set.
---
 .../stylesheets/spree/backend/shared/_forms.scss     |  3 +++
 backend/app/views/spree/admin/images/index.html.erb  |  2 +-
 .../views/spree/admin/store_credits/index.html.erb   |  2 +-
 .../views/spree/admin/store_credits/show.html.erb    |  2 +-
 backend/app/views/spree/admin/taxons/index.html.erb  | 12 ++++++------
 .../app/views/spree/admin/users/_sidebar.html.erb    |  2 +-
 backend/app/views/spree/admin/users/items.html.erb   |  2 +-
 backend/app/views/spree/admin/users/orders.html.erb  |  2 +-
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_forms.scss b/backend/app/assets/stylesheets/spree/backend/shared/_forms.scss
index 256f5903f0c..cae836b3daa 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_forms.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_forms.scss
@@ -167,6 +167,9 @@ fieldset {
 
   &.no-border-bottom {
     border-bottom: none;
+  }
+
+  &.no-margin-bottom {
     margin-bottom: 0;
   }
 
diff --git a/backend/app/views/spree/admin/images/index.html.erb b/backend/app/views/spree/admin/images/index.html.erb
index 4e8d76e5bce..23a9a996053 100644
--- a/backend/app/views/spree/admin/images/index.html.erb
+++ b/backend/app/views/spree/admin/images/index.html.erb
@@ -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">
diff --git a/backend/app/views/spree/admin/store_credits/index.html.erb b/backend/app/views/spree/admin/store_credits/index.html.erb
index 469eff9f113..8c6d116c7de 100644
--- a/backend/app/views/spree/admin/store_credits/index.html.erb
+++ b/backend/app/views/spree/admin/store_credits/index.html.erb
@@ -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) %>
diff --git a/backend/app/views/spree/admin/store_credits/show.html.erb b/backend/app/views/spree/admin/store_credits/show.html.erb
index 10113a65b5b..7dc132ddb5e 100644
--- a/backend/app/views/spree/admin/store_credits/show.html.erb
+++ b/backend/app/views/spree/admin/store_credits/show.html.erb
@@ -73,7 +73,7 @@
   </tr>
 </table>
 
-<fieldset>
+<fieldset class="no-border-bottom">
   <legend align='center'><%= t('spree.admin.store_credits.history') %></legend>
   <table>
     <colgroup>
diff --git a/backend/app/views/spree/admin/taxons/index.html.erb b/backend/app/views/spree/admin/taxons/index.html.erb
index 730e1e69583..9e3b87d2492 100644
--- a/backend/app/views/spree/admin/taxons/index.html.erb
+++ b/backend/app/views/spree/admin/taxons/index.html.erb
@@ -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>
diff --git a/backend/app/views/spree/admin/users/_sidebar.html.erb b/backend/app/views/spree/admin/users/_sidebar.html.erb
index 5ef30b2bb0d..29df2b1b3e0 100644
--- a/backend/app/views/spree/admin/users/_sidebar.html.erb
+++ b/backend/app/views/spree/admin/users/_sidebar.html.erb
@@ -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>
diff --git a/backend/app/views/spree/admin/users/items.html.erb b/backend/app/views/spree/admin/users/items.html.erb
index 13c2a2b9bff..42c225fe505 100644
--- a/backend/app/views/spree/admin/users/items.html.erb
+++ b/backend/app/views/spree/admin/users/items.html.erb
@@ -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" %>
diff --git a/backend/app/views/spree/admin/users/orders.html.erb b/backend/app/views/spree/admin/users/orders.html.erb
index d99bc715689..34efab81346 100644
--- a/backend/app/views/spree/admin/users/orders.html.erb
+++ b/backend/app/views/spree/admin/users/orders.html.erb
@@ -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" %>