From c196bced9203625b4fa35d8d2752b70893ad3488 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 1 Jun 2021 20:59:33 +0000
Subject: Make the container div for the trait table have a minimum width
 scaling off of the trait table width, to avoid the border overlapping with
 the table

---
 wqflask/wqflask/show_trait/show_trait.py            | 2 --
 wqflask/wqflask/templates/show_trait.html           | 2 +-
 wqflask/wqflask/templates/show_trait_edit_data.html | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index a02da872..9ee6a16d 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -624,8 +624,6 @@ def get_table_widths(sample_groups, sample_column_width, has_num_cases=False):
         trait_table_width += 80
     trait_table_width += len(sample_groups[0].attributes) * 88
 
-    trait_table_width = str(trait_table_width) + "px"
-
     return stats_table_width, trait_table_width
 
 
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index fc14822c..3dbf5f57 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -102,7 +102,7 @@
                         <div id="outlier_alert_placeholder"></div>
                     </div>
                 </div>                
-                <div class="panel panel-default">
+                <div class="panel panel-default" {% if (trait_table_width|int > 1100) %}style="min-width: {{ trait_table_width|int + 30 }}px;"{% endif %}>
                     <div class="panel-heading" data-toggle="collapse" data-parent="#accordion" data-target="#collapseSix" aria-expanded="true">
                         <h3 class="panel-title">
                              <span class="glyphicon glyphicon-chevron-up"></span> Review and Edit Data
diff --git a/wqflask/wqflask/templates/show_trait_edit_data.html b/wqflask/wqflask/templates/show_trait_edit_data.html
index 0d34bebc..5939c953 100644
--- a/wqflask/wqflask/templates/show_trait_edit_data.html
+++ b/wqflask/wqflask/templates/show_trait_edit_data.html
@@ -53,7 +53,7 @@
         </div>
       </div>
       {% set outer_loop = loop %}
-      <div class="sample_group" style="width:{{ trait_table_width }};">
+      <div class="sample_group" style="width:{{ trait_table_width }}px;">
         <div style="position: relative;">
           <div class="inline-div"><h3 style="float: left;">{{ sample_type.header }}<span name="transform_text"></span></h3></div>
         </div>
-- 
cgit v1.2.3