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.

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

4672 header alignment #4716

Closed
wants to merge 14 commits into from
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
4 changes: 2 additions & 2 deletions app/views/adjustments/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
<table class="table">
<thead>
<tr>
<th>Created</th>
<th>Organization</th>
<th class = "text-center">Created</th>
<th >Organization</th>
<th>Storage location</th>
<th>Comment</th>
<th>Summary</th>
Expand Down
6 changes: 3 additions & 3 deletions app/views/items/_item_list.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<tr>
<th>Category</th>
<th>Name</th>
<th>Quantity Per Individual</th>
<th>Fair Market Value (per item)</th>
<th class = "text-right">Quantity Per Individual</th>
<th class = "text-right">Fair Market Value (per item)</th>
<% if Flipper.enabled?(:enable_packs) %>
<% unless current_organization.request_units.empty? %>
<th>Custom Request Units</th>
<% end %>
<% end %>
<th class="text-center">Actions</th>
<th class = "text-right">Actions</th>
</tr>
</thead>
<tbody>
Expand Down
2 changes: 1 addition & 1 deletion app/views/items/_item_row.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<tr data-item-id="<%= item_row.id %>">
<td><%= item_row.item_category && link_to(item_row.item_category&.name, item_category_path(item_row.item_category), class: 'text-blue-500') %></td>
<td><%= item_row.name %></td>
<td><%= item_row.distribution_quantity %></td>
<td class="text-right"> <%= item_row.distribution_quantity %></td>
<td class="numeric"><%= dollar_value(item_row.value_in_cents) %></td>
<% if Flipper.enabled?(:enable_packs) %>
<% unless current_organization.request_units.empty? %>
Expand Down
10 changes: 5 additions & 5 deletions app/views/purchases/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@
<th>Purchases from</th>
<th>Storage Location</th>
<th>Comments</th>
<th>Quantity of Items</th>
<th>Variety of Items</th>
<th>Amount spent</th>
<th>FMV</th>
<th>Purchased Date</th>
<th class= "text-right">Quantity of Items</th>
<th class = "text-right">Variety of Items</th>
<th class = "text-right">Amount spent</th>
<th class = "text-right">FMV</th>
<th class = "text-right">Purchased Date</th>
<th class="text-right">Actions</th>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ staging:
database: <%= ENV['POSTGRESQL_DATABASE'] %>
host: <%= ENV['POSTGRESQL_ADDRESS'] %>

test:
nano config/database.ymltest:
<<: *default
database: diaper_test
timeout: 5000
Expand Down
23 changes: 0 additions & 23 deletions db/migrate/20180704003450_create_flipper_tables.rb

This file was deleted.