Merge pull request #1365 from YaleSTC/1363_availability_display_55

[1363] Fix overflowing availability number [v5.5]
YaleSTC · Dec 9, 2015 · d6ef452 · d6ef452
2 parents e268785 + a38bfd7
commit d6ef452
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 * This file will be updated whenever a new release is put into production.
 * Any problems should be reported via the "report an issue" link in the footer of the application.
 
+## v5.5.1 - 2016-01-11
+### Fixed
+* The equipment model availability numbers no longer overflow when they are two digits long ([#1363](https://github.com/YaleSTC/reservations/issues/1363)).
+
 ## v5.5.0 - 2015-11-23
 ### Fixed
 * The dropdown menu that appears when clicking on the reserver in a list of reservations is no longer blocked in a short table ([#724](https://github.com/YaleSTC/reservations/issues/724)).

diff --git a/app/assets/stylesheets/catalog/_index.css.scss b/app/assets/stylesheets/catalog/_index.css.scss
@@ -38,6 +38,11 @@
   margin-bottom: 19px;
 }
 
+.availability-num {
+  @include giant-number;
+  text-align: center;
+}
+
 .caption_cat { padding: 0px 9px 0px 9px; }
 
 a.not-qualified-icon {

diff --git a/app/views/catalog/_equipment_model_div.html.erb b/app/views/catalog/_equipment_model_div.html.erb
@@ -7,13 +7,13 @@
   </h4>
 
   <hr class="special-hr"/>
-    <div class="col-md-2">
-      <span class="giant-numbers" id="availability_<%= equipment_model.id %>">
+    <div class="col-md-3 availability-num">
+      <span id="availability_<%= equipment_model.id %>">
         <%= availability_hash[equipment_model.id] %>
       </span>
     </div>
 
-    <p class="model_availability col-md-10">
+    <p class="model_availability col-md-9">
       <%= available_string %>
     </p>