Merge pull request #1511 from YaleSTC/1492_ui_bugs

[1492] UI bugs
YaleSTC · Mar 8, 2016 · 9146e87 · 9146e87
2 parents a1ef04a + b379bf8
commit 9146e87
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/app/assets/stylesheets/_mixins.scss b/app/assets/stylesheets/_mixins.scss
@@ -1,5 +1,5 @@
 @mixin giant-number {
-	font-size: $font-size-base * 3;
+	font-size: $font-size-base * 2.5;
 }
 
 @mixin placeholder-extended ($color: $placeholderText, $font-style: italic){

diff --git a/app/assets/stylesheets/app_configs/_edit.css.scss b/app/assets/stylesheets/app_configs/_edit.css.scss
@@ -0,0 +1 @@
+#app_config_reset_tos_for_users { width: auto; }
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -59,3 +59,4 @@
 @import "users/*";
 @import "equipment_models/*";
 @import "blackouts/*";
+@import "app_configs/*";
diff --git a/app/assets/stylesheets/equipment_models/_table.scss b/app/assets/stylesheets/equipment_models/_table.scss
@@ -1,4 +1,4 @@
-#table_equipment_models {
+#table_equipment_models, #table_woo {
   th, td {
     vertical-align: middle;
   }

diff --git a/app/views/equipment_models/show.html.erb b/app/views/equipment_models/show.html.erb
@@ -94,10 +94,10 @@
 <section id="details">
   <h2>Details</h2><hr />
   <div class="row">
-    <div class="col-md-4">
+    <div class="col-md-3">
       <h4>Late Fee</h4>
       <div class="giant-numbers">
-        <%= number_to_currency @equipment_model.late_fee %> / day
+        <%= number_to_currency @equipment_model.late_fee %>/day
       </div>
     </div>
     <div class="col-md-3">
@@ -106,7 +106,7 @@
         <%= number_to_currency @equipment_model.replacement_fee %>
       </div>
     </div>
-    <div class="col-md-2">
+    <div class="col-md-3">
       <h4>Max. Per User</h4>
       <div class="giant-numbers">
         <%= intify @equipment_model.maximum_per_user %>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		#app_config_reset_tos_for_users { width: auto; }