From a9029e09289857d9baf1f95a2eb64a7b837b2d83 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 14 Sep 2016 11:08:40 +0200
Subject: [PATCH 1/4] fixes responsiveness on mobile phone for sample view

---
 .../javascripts/samples/sample_datatable.js   |  4 +--
 app/assets/stylesheets/extend/bootstrap.scss  | 25 +++++++++++++++++++
 app/views/my_modules/results.html.erb         |  4 +--
 app/views/shared/_samples.html.erb            | 10 ++++----
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/samples/sample_datatable.js b/app/assets/javascripts/samples/sample_datatable.js
index 985c3b6c5..d2a40940a 100644
--- a/app/assets/javascripts/samples/sample_datatable.js
+++ b/app/assets/javascripts/samples/sample_datatable.js
@@ -9,13 +9,13 @@ var selectedSample;
 
 table = $("#samples").DataTable({
     order: [[2, "desc"]],
-    dom: "RB<'row'<'col-sm-9 toolbar'l><'col-sm-3'f>>tpi",
+    dom: "RB<'row'<'col-sm-9-custom toolbar'l><'col-sm-3-custom'f>>tpi",
     stateSave: true,
     buttons: [{
         extend: "colvis",
         text: function () {
             return '<span class="glyphicon glyphicon-option-horizontal"></span> ' +
-                '<span class="hidden-xs">' +
+                '<span class="hidden-xs-custom">' +
                 I18n.t('samples.column_visibility') +
                 '</span>';
         },
diff --git a/app/assets/stylesheets/extend/bootstrap.scss b/app/assets/stylesheets/extend/bootstrap.scss
index a33f5763a..fff4f3293 100644
--- a/app/assets/stylesheets/extend/bootstrap.scss
+++ b/app/assets/stylesheets/extend/bootstrap.scss
@@ -23,3 +23,28 @@
     display: none;
   }
 }
+
+@media (min-width: 1075px) {
+  .col-sm-3-custom {
+    width: 25%;
+    float: left;
+  }
+  .col-sm-9-custom {
+    width: 75%;
+    float: left;
+  }
+}
+
+.col-sm-3-custom {
+  position: relative;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
+
+.col-sm-9-custom {
+  position: relative;
+  min-height: 1px;
+  padding-left: 15px;
+  padding-right: 15px;
+}
diff --git a/app/views/my_modules/results.html.erb b/app/views/my_modules/results.html.erb
index 07e5e48a6..c6087de90 100644
--- a/app/views/my_modules/results.html.erb
+++ b/app/views/my_modules/results.html.erb
@@ -6,10 +6,10 @@
   <div class="pull-right">
     <button class="btn btn-greyed" id="results-collapse-btn">
       <span class="glyphicon glyphicon-collapse-up"></span>
-      <span class="hidden-xs"><%= t'my_modules.results.collapse_label' %></button></span>
+      <span class="hidden-xs-custom"><%= t'my_modules.results.collapse_label' %></button></span>
     <button class="btn btn-greyed" id="results-expand-btn">
       <span class="glyphicon glyphicon-collapse-down"></span>
-      <span class="hidden-xs"><%= t'my_modules.results.expand_label' %></button></span>
+      <span class="hidden-xs-custom"><%= t'my_modules.results.expand_label' %></button></span>
   </div>
 
   <% if can_create_result_text_in_module(@my_module) or
diff --git a/app/views/shared/_samples.html.erb b/app/views/shared/_samples.html.erb
index 34cf52d64..bbf5bf839 100644
--- a/app/views/shared/_samples.html.erb
+++ b/app/views/shared/_samples.html.erb
@@ -46,7 +46,7 @@
   <div class="dropdown pull-right" style="display: inline;">
     <button class="btn btn-default dropdown-toggle" type="button" id="addMenu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" <%= "disabled" unless can_add_sample_related_things_to_organization%>>
       <span class="glyphicon glyphicon-plus"></span>
-      <span class="hidden-xs">
+      <span class="hidden-xs-custom">
         <%= t'More' %>
         <span class="caret"></span>
       </span>
@@ -92,14 +92,14 @@
 <div class="toolbarButtons" style="display:none">
   <button type="button" class="btn btn-default editAdd" id="editSample" onclick="onClickEdit()" disabled>
     <span class="glyphicon glyphicon-pencil"></span>
-    <span class="hidden-xs"><%= t("samples.edit_sample") %></span>
+    <span class="hidden-xs-custom"><%= t("samples.edit_sample") %></span>
   </button>
 
   <% if can_delete_samples(@organization) %>
     <button type="button" class="btn btn-default"
       id="deleteSamplesButton" data-target="#deleteSamples" data-toggle="modal" disabled>
       <span class="glyphicon glyphicon-trash"></span>
-      <span class="hidden-xs"><%= t'samples.delete_samples' %></span>
+      <span class="hidden-xs-custom"><%= t'samples.delete_samples' %></span>
         <%= submit_tag MyModulesController::DELETE_SAMPLES, :class => "hidden delete_samples_submit" %>
     </button>
   <% end %>
@@ -108,7 +108,7 @@
     <button type="button" class="btn btn-default"
       id="assignSamples" onclick="$(this).next().click();" disabled>
       <span class="glyphicon glyphicon-ok-circle"></span>
-      <span class="hidden-xs"><%= t'samples.assign_samples_to_module' %></span>
+      <span class="hidden-xs-custom"><%= t'samples.assign_samples_to_module' %></span>
     </button>
     <%= submit_tag MyModulesController::ASSIGN_SAMPLES, :class => "hidden" %>
   <% end %>
@@ -116,7 +116,7 @@
     <button type="button" class="btn btn-default"
       id="unassignSamples" onclick="$(this).next().click();" disabled>
       <span class="glyphicon glyphicon-ban-circle"></span>
-      <span class="hidden-xs"><%= t'samples.unassign_samples_to_module' %></span>
+      <span class="hidden-xs-custom"><%= t'samples.unassign_samples_to_module' %></span>
     </button>
     <%= submit_tag MyModulesController::UNASSIGN_SAMPLES, :class => "hidden" %>
   <% end %>

From aba5305cd62fbb61196fcce178d6f1f36c6e5cf3 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 14 Sep 2016 11:24:19 +0200
Subject: [PATCH 2/4] fixes hound

---
 app/assets/javascripts/samples/sample_datatable.js | 2 +-
 app/assets/stylesheets/extend/bootstrap.scss       | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/samples/sample_datatable.js b/app/assets/javascripts/samples/sample_datatable.js
index d2a40940a..379dd590e 100644
--- a/app/assets/javascripts/samples/sample_datatable.js
+++ b/app/assets/javascripts/samples/sample_datatable.js
@@ -15,7 +15,7 @@ table = $("#samples").DataTable({
         extend: "colvis",
         text: function () {
             return '<span class="glyphicon glyphicon-option-horizontal"></span> ' +
-                '<span class="hidden-xs-custom">' +
+                '<span class='hidden-xs-custom'>' +
                 I18n.t('samples.column_visibility') +
                 '</span>';
         },
diff --git a/app/assets/stylesheets/extend/bootstrap.scss b/app/assets/stylesheets/extend/bootstrap.scss
index fff4f3293..6780df529 100644
--- a/app/assets/stylesheets/extend/bootstrap.scss
+++ b/app/assets/stylesheets/extend/bootstrap.scss
@@ -26,25 +26,26 @@
 
 @media (min-width: 1075px) {
   .col-sm-3-custom {
+    float: left;
     width: 25%;
-    float: left;
   }
+  
   .col-sm-9-custom {
-    width: 75%;
     float: left;
+    width: 75%;
   }
 }
 
 .col-sm-3-custom {
-  position: relative;
   min-height: 1px;
   padding-left: 15px;
   padding-right: 15px;
+  position: relative;
 }
 
 .col-sm-9-custom {
-  position: relative;
   min-height: 1px;
   padding-left: 15px;
   padding-right: 15px;
+  position: relative;
 }

From 386cedda7108ae73658ba7e57310bed1ac33b1e1 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 14 Sep 2016 11:34:24 +0200
Subject: [PATCH 3/4] fixes hound again

---
 app/assets/javascripts/samples/sample_datatable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/samples/sample_datatable.js b/app/assets/javascripts/samples/sample_datatable.js
index 379dd590e..4a982dfa8 100644
--- a/app/assets/javascripts/samples/sample_datatable.js
+++ b/app/assets/javascripts/samples/sample_datatable.js
@@ -15,7 +15,7 @@ table = $("#samples").DataTable({
         extend: "colvis",
         text: function () {
             return '<span class="glyphicon glyphicon-option-horizontal"></span> ' +
-                '<span class='hidden-xs-custom'>' +
+                "<span class='hidden-xs-custom'>" +
                 I18n.t('samples.column_visibility') +
                 '</span>';
         },

From 65415415b6fcf95cdb9816fff17393067b80aa77 Mon Sep 17 00:00:00 2001
From: Mojca Lorber <mojca.lorber@biosistemika.com>
Date: Wed, 14 Sep 2016 11:37:17 +0200
Subject: [PATCH 4/4] fixes hound again again

---
 app/assets/stylesheets/extend/bootstrap.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/extend/bootstrap.scss b/app/assets/stylesheets/extend/bootstrap.scss
index 6780df529..d687e49d8 100644
--- a/app/assets/stylesheets/extend/bootstrap.scss
+++ b/app/assets/stylesheets/extend/bootstrap.scss
@@ -29,7 +29,7 @@
     float: left;
     width: 25%;
   }
-  
+
   .col-sm-9-custom {
     float: left;
     width: 75%;