Merge pull request #134 from mcshakes/small-ux-improvements

Made the buttons a little cleaner

Author: loriculberson

app/assets/stylesheets/custom.css.erb

@@ -412,3 +412,12 @@ table {
   margin-bottom: 20px;
 }
 
+.user-addresses {
+  text-align: center;
+}
+
+#address {
+  font-size: 2em;
+  font-weight: bold;
+  margin-bottom: 10px;
+}

app/views/addresses/index.html.erb

@@ -1,18 +1,21 @@
-<div class="container">
+<div class="container user-addresses">
+  <div class="pull-right"><%= link_to "Add a New Address", new_address_path, method: :get, class: "btn btn-success" %></div>
   <div class="col-sm-12">
     <h1>Your Address Info</h1>
   </div>
 
-  <h4><%= link_to "Add a New Address", new_address_path %></h4>
-  <% @addresses.each do |address| %>
-    <div class="col-sm-4">
-      <%= address.street %>
-      <%= address.city %> 
-      <%= address.state %>
-      <%= address.country %>
-    <p><%= link_to "Edit Existing Address", edit_address_path(address) %></p>
-    <p><%= link_to "Delete Existing Address", address_path(address), method: :delete %></p>
-
+    <div class="col-sm-12" id="address">
+      <% @addresses.each do |address| %>
+        <div class="col-sm-4">
+          <p><%= address.street %></p>
+          <p><%= address.city %>
+        <%= address.state %>
+          <%= address.country %></p>
+          <div class="btn-group btn-group-xs">
+            <%= link_to "Edit Existing Address", edit_address_path(address), method: :get, class: "btn btn-default" %>
+            <%= link_to "Delete Existing Address", address_path(address), method: :delete, class: "btn btn-danger" %>
+          </div>
+        </div>
+      <% end %>
     </div>
-  <% end %>
 </div>

app/views/users/show.html.erb

@@ -1,6 +1,9 @@
-<div class="btn-group col-sm-12">
-  <%= link_to "Edit Personal Info", edit_user_path(current_user), method: :get, class: "btn btn-success pull-right" %>
-  <%= link_to "Update Your Address", addresses_path, method: :get, class: "btn btn-default pull-right" %><br><br>
+
+<div class="col-sm-12">
+  <div class="btn-group pull-right">
+    <%= link_to "Update Your Address", addresses_path, method: :get, class: "btn btn-default" %>
+    <%= link_to "Edit Personal Info", edit_user_path(current_user), method: :get, class: "btn btn-success" %>
+  </div>
 </div>
 
 <h1 class><%= current_user.first_name %>'s Account</h1>
@@ -31,28 +34,16 @@
 
         <% order.items.each do |item| %>
           <tr class="" border ="1">
-            <td class="large-column"> <%= link_to item.display_name, vendor_item_path(slug: item.vendor.slug, id:item.id), 
+            <td class="large-column"> <%= link_to item.display_name, vendor_item_path(slug: item.vendor.slug, id:item.id),
                                       data: { target: "#modal" } %></td>
             <td class="large-column"> <%= link_to item.vendor.name, vendor_items_path(slug: item.vendor.slug) %></td>
             <td class="small-column"> <%= quantity_of_item(item, order) %></td>
             <td class="medium-column"> <%= number_to_currency(line_item_price(item, order)) %></td>
   </div>
         <% end %>
-    </table> 
+    </table>
 </div>
 
     <% end %>
           </tr>
 <% end %>
-
-
-      
-
-
-
-
-
-
-
-
-