From 9d94339ea0fe9f04d1f5f5fcb70c743ab720086e Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 15 Oct 2020 14:04:53 -0500
Subject: Replaced styling from show_trait_transform_and_filter.html with CSS

* wqflask/wqflask/static/new/css/show_trait.css - Added styles for elements in show_trait_transform_and_filter.html
* wqflask/wqflask/templates/show_trait_transform_and_filter.html - Replaced styling in template with classes
---
 wqflask/wqflask/static/new/css/show_trait.css      | 13 ++++++++++
 .../templates/show_trait_transform_and_filter.html | 28 +++++++++++-----------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/wqflask/wqflask/static/new/css/show_trait.css b/wqflask/wqflask/static/new/css/show_trait.css
index f20b840e..f9c3dcd9 100644
--- a/wqflask/wqflask/static/new/css/show_trait.css
+++ b/wqflask/wqflask/static/new/css/show_trait.css
@@ -138,4 +138,17 @@ span.p-range-upper {
 .corr-location {
   width: 50px;
   display: inline;
+}
+
+div.block-by-index-div {
+  margin-bottom: 10px;
+}
+
+div.block-by-attribute-div {
+  margin-top:10px;
+  margin-bottom:10px;
+}
+
+div.normalize-div {
+  margin-top:10px;
 }
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/show_trait_transform_and_filter.html b/wqflask/wqflask/templates/show_trait_transform_and_filter.html
index b4118b04..3956a34f 100644
--- a/wqflask/wqflask/templates/show_trait_transform_and_filter.html
+++ b/wqflask/wqflask/templates/show_trait_transform_and_filter.html
@@ -5,7 +5,7 @@
                 needed.
             </p>
 
-            <div id="blockMenuSpan" class="input-append" style="margin-bottom: 10px;">
+            <div id="blockMenuSpan" class="input-append block-by-index-div">
                 <label for="remove_samples_field">Block samples by index:</label>
                 <input type="text" id="remove_samples_field" placeholder="Example: 3, 5-10, 12">
                 <select id="block_group" size="1">
@@ -22,7 +22,7 @@
                   Please check that your input is formatted correctly, e.g. <strong>3, 5-10, 12</strong>
             </div>
             {% if sample_groups[0].attributes %}
-            <div class="input-append" style="margin-top:10px; margin-bottom:10px;">
+            <div class="input-append block-by-attribute-div">
                 <label for="exclude_menu">Block samples by group:</label>
                 <select id="exclude_menu" size=1>
                   {% for attribute in sample_groups[0].attributes %}
@@ -47,18 +47,18 @@
                 </select>
               </span>
               <br>
-              <div style="margin-top:10px;">
-              <input type="button" id="normalize" class="btn btn-success" value="Normalize">
-              <select id="norm_method" class="select optional span2">
-                {% if negative_vals_exist == "false" %}
-                <option value="log2">Log2</option>
-                <option value="log10">Log10</option>
-                {% endif %}
-                <option value="zscore">Z-score</option>
-                <option value="qnorm">Quantile</option>
-                <option value="sqrt">Square Root</option>
-                <option value="invert">Invert +/-</option>
-              </select>
+              <div class="normalize-div">
+                <input type="button" id="normalize" class="btn btn-success" value="Normalize">
+                <select id="norm_method" class="select optional span2">
+                  {% if negative_vals_exist == "false" %}
+                  <option value="log2">Log2</option>
+                  <option value="log10">Log10</option>
+                  {% endif %}
+                  <option value="zscore">Z-score</option>
+                  <option value="qnorm">Quantile</option>
+                  <option value="sqrt">Square Root</option>
+                  <option value="invert">Invert +/-</option>
+                </select>
               </div>
               <!--
               {% if sample_groups[0].sample_qnorm is not none %}
-- 
cgit v1.2.3