aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2016-08-26 16:43:51 +0000
committerzsloan2016-08-26 16:43:51 +0000
commit2efd33c5dc88ce0663b2a64bf456eb8dbc678f23 (patch)
tree7eaa6f250243b1e891f6d0fd4f4a11444f52e54b
parent5ad7e4634f2e8b5cc5b10442da2dd80385e9aee6 (diff)
downloadgenenetwork2-2efd33c5dc88ce0663b2a64bf456eb8dbc678f23.tar.gz
Fixed appearance (border width mostly) of basic stats table on trait page
Removed unnecessary datatables javascript code that referred to basic stats table
-rw-r--r--wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css6
-rw-r--r--wqflask/wqflask/templates/show_trait.html32
-rw-r--r--wqflask/wqflask/templates/show_trait_statistics.html4
3 files changed, 5 insertions, 37 deletions
diff --git a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
index 461fd089..2c20f635 100644
--- a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
+++ b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
@@ -261,7 +261,7 @@ th {
}
.table-bordered th,
.table-bordered td {
- border: 1px solid #ddd !important;
+ border: 1px solid #000 !important;
}
}
@font-face {
@@ -2114,7 +2114,7 @@ th {
padding: 5px;
}
.table-bordered {
- border: 1px solid #ddd;
+ border: 1px solid #000;
}
.table-bordered > thead > tr > th,
.table-bordered > tbody > tr > th,
@@ -2122,7 +2122,7 @@ th {
.table-bordered > thead > tr > td,
.table-bordered > tbody > tr > td,
.table-bordered > tfoot > tr > td {
- border: 1px solid #ddd;
+ border: 1px solid #000;
}
.table-bordered > thead > tr > th,
.table-bordered > thead > tr > td {
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index 1890cf3f..59e0185e 100644
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -254,38 +254,6 @@
} );
{% endif %}
- if (Object.keys(js_data.sample_group_types).length > 1) {
- $('#stats_table').DataTable( {
- "columnDefs": [
- { "orderable": false, "targets": [0, 1, 2, 3] }
- ],
- "order": [],
- "sDom": "tr",
- "iDisplayLength": -1,
- "autoWidth": false,
- "bLengthChange": true,
- "bDeferRender": true,
- "bSortClasses": false,
- "paging": false
- } );
- }
- else {
- $('#stats_table').DataTable( {
- "columnDefs": [
- { "orderable": false, "targets": [0, 1] }
- ],
- "order": [],
- "sDom": "tr",
- "iDisplayLength": -1,
- "autoWidth": false,
- "bLengthChange": true,
- "bDeferRender": true,
- "bSortClasses": false,
- "paging": false
- } );
-
- }
-
var slider = document.getElementById('p_range_slider');
noUiSlider.create(slider, {
start: [-1.0, 1.0],
diff --git a/wqflask/wqflask/templates/show_trait_statistics.html b/wqflask/wqflask/templates/show_trait_statistics.html
index 62d6dcfd..8e237868 100644
--- a/wqflask/wqflask/templates/show_trait_statistics.html
+++ b/wqflask/wqflask/templates/show_trait_statistics.html
@@ -25,8 +25,8 @@
<div class="tab-content">
<div class="tab-pane active" id="stats_tab">
- <div style="padding: 20px" class="form-horizontal">
- <table border="1" id="stats_table" style="width: 450px; float: left;" class="table table-hover table-striped cell-border"></table>
+ <div style="padding: 20px;" class="form-horizontal">
+ <table id="stats_table" style="width: 450px; float: left;" class="table table-hover table-striped table-bordered"></table>
</div>
</div>
<div class="tab-pane" id="histogram_tab">