Skip to content

Commit b83bb33

Browse files
committed
Merge pull request #134 from mcshakes/small-ux-improvements
Made the buttons a little cleaner
2 parents f09e9b3 + fecde59 commit b83bb33

File tree

3 files changed

+32
-29
lines changed

3 files changed

+32
-29
lines changed

app/assets/stylesheets/custom.css.erb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,3 +412,12 @@ table {
412412
margin-bottom: 20px;
413413
}
414414

415+
.user-addresses {
416+
text-align: center;
417+
}
418+
419+
#address {
420+
font-size: 2em;
421+
font-weight: bold;
422+
margin-bottom: 10px;
423+
}

app/views/addresses/index.html.erb

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
<div class="container">
1+
<div class="container user-addresses">
2+
<div class="pull-right"><%= link_to "Add a New Address", new_address_path, method: :get, class: "btn btn-success" %></div>
23
<div class="col-sm-12">
34
<h1>Your Address Info</h1>
45
</div>
56

6-
<h4><%= link_to "Add a New Address", new_address_path %></h4>
7-
<% @addresses.each do |address| %>
8-
<div class="col-sm-4">
9-
<%= address.street %>
10-
<%= address.city %>
11-
<%= address.state %>
12-
<%= address.country %>
13-
<p><%= link_to "Edit Existing Address", edit_address_path(address) %></p>
14-
<p><%= link_to "Delete Existing Address", address_path(address), method: :delete %></p>
15-
7+
<div class="col-sm-12" id="address">
8+
<% @addresses.each do |address| %>
9+
<div class="col-sm-4">
10+
<p><%= address.street %></p>
11+
<p><%= address.city %>
12+
<%= address.state %>
13+
<%= address.country %></p>
14+
<div class="btn-group btn-group-xs">
15+
<%= link_to "Edit Existing Address", edit_address_path(address), method: :get, class: "btn btn-default" %>
16+
<%= link_to "Delete Existing Address", address_path(address), method: :delete, class: "btn btn-danger" %>
17+
</div>
18+
</div>
19+
<% end %>
1620
</div>
17-
<% end %>
1821
</div>

app/views/users/show.html.erb

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
<div class="btn-group col-sm-12">
2-
<%= link_to "Edit Personal Info", edit_user_path(current_user), method: :get, class: "btn btn-success pull-right" %>
3-
<%= link_to "Update Your Address", addresses_path, method: :get, class: "btn btn-default pull-right" %><br><br>
1+
2+
<div class="col-sm-12">
3+
<div class="btn-group pull-right">
4+
<%= link_to "Update Your Address", addresses_path, method: :get, class: "btn btn-default" %>
5+
<%= link_to "Edit Personal Info", edit_user_path(current_user), method: :get, class: "btn btn-success" %>
6+
</div>
47
</div>
58

69
<h1 class><%= current_user.first_name %>'s Account</h1>
@@ -31,28 +34,16 @@
3134

3235
<% order.items.each do |item| %>
3336
<tr class="" border ="1">
34-
<td class="large-column"> <%= link_to item.display_name, vendor_item_path(slug: item.vendor.slug, id:item.id),
37+
<td class="large-column"> <%= link_to item.display_name, vendor_item_path(slug: item.vendor.slug, id:item.id),
3538
data: { target: "#modal" } %></td>
3639
<td class="large-column"> <%= link_to item.vendor.name, vendor_items_path(slug: item.vendor.slug) %></td>
3740
<td class="small-column"> <%= quantity_of_item(item, order) %></td>
3841
<td class="medium-column"> <%= number_to_currency(line_item_price(item, order)) %></td>
3942
</div>
4043
<% end %>
41-
</table>
44+
</table>
4245
</div>
4346

4447
<% end %>
4548
</tr>
4649
<% end %>
47-
48-
49-
50-
51-
52-
53-
54-
55-
56-
57-
58-

0 commit comments

Comments
 (0)