Skip to content
This repository was archived by the owner on Jul 24, 2020. It is now read-only.

Commit 9146e87

Browse files
committed
Merge pull request #1511 from YaleSTC/1492_ui_bugs
[1492] UI bugs
2 parents a1ef04a + b379bf8 commit 9146e87

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

app/assets/stylesheets/_mixins.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@mixin giant-number {
2-
font-size: $font-size-base * 3;
2+
font-size: $font-size-base * 2.5;
33
}
44

55
@mixin placeholder-extended ($color: $placeholderText, $font-style: italic){
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#app_config_reset_tos_for_users { width: auto; }

app/assets/stylesheets/application.css.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@
5959
@import "users/*";
6060
@import "equipment_models/*";
6161
@import "blackouts/*";
62+
@import "app_configs/*";

app/assets/stylesheets/equipment_models/_table.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#table_equipment_models {
1+
#table_equipment_models, #table_woo {
22
th, td {
33
vertical-align: middle;
44
}

app/views/equipment_models/show.html.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@
9494
<section id="details">
9595
<h2>Details</h2><hr />
9696
<div class="row">
97-
<div class="col-md-4">
97+
<div class="col-md-3">
9898
<h4>Late Fee</h4>
9999
<div class="giant-numbers">
100-
<%= number_to_currency @equipment_model.late_fee %> / day
100+
<%= number_to_currency @equipment_model.late_fee %>/day
101101
</div>
102102
</div>
103103
<div class="col-md-3">
@@ -106,7 +106,7 @@
106106
<%= number_to_currency @equipment_model.replacement_fee %>
107107
</div>
108108
</div>
109-
<div class="col-md-2">
109+
<div class="col-md-3">
110110
<h4>Max. Per User</h4>
111111
<div class="giant-numbers">
112112
<%= intify @equipment_model.maximum_per_user %>

0 commit comments

Comments
 (0)