Merge branch 'revision-view' of bitbucket.org:nottinghamtec/pyrigs into revision-view

RIGS/templates/RIGS/index.html

@@ -13,61 +13,6 @@
 {% endblock %}
 
 {% block content %}
-
-<style>
-    /* columns of same height styles */
-
-.row-full-height {
-  height: 100%;
-}
-.col-full-height {
-  height: 100%;
-  vertical-align: middle;
-}
-.row-same-height {
-  display: table;
-  width: 100%;
-  /* fix overflow */
-  table-layout: fixed;
-}
-.col-xs-height {
-  display: table-cell;
-  float: none !important;
-}
-
-@media (min-width: 768px) {
-  .col-sm-height {
-    display: table-cell;
-    float: none !important;
-  }
-}
-@media (min-width: 992px) {
-  .col-md-height {
-    display: table-cell;
-    float: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .col-lg-height {
-    display: table-cell;
-    float: none !important;
-  }
-}
-
-/* vertical alignment styles */
-
-.col-top {
-  vertical-align: top;
-}
-.col-middle {
-  vertical-align: middle;
-}
-.col-bottom {
-  vertical-align: bottom;
-}
-
-</style>
-
     <div class="col-sm-12">
         <h1>R<small>ig</small> I<small>nformation</small> G<small>athering</small> S<small>ystem</small></h1>
     </div>
@@ -75,8 +20,8 @@
         <p><h4 class="list-group-item-heading" style="margin:0;">Welcome back, {{ user.get_full_name }}, there are {{ rig_count }} rigs coming up.</h4>
         </p>
     </div>
-    <div class="row"><div class="row-same-height">
+    <div class="row">
-    <div class="col-sm-6 col-sm-height col-top">
+    <div class="col-sm-6">
         
         <div class="list-group">
             <div class="list-group-item" style="background-color: #eee;">
@@ -133,9 +78,9 @@
             <div class="list-group-item" style="background-color: #eee;"></div>
         </div>
     </div>
-    <div class="col-sm-6 col-sm-height col-top" >
+    <div class="col-sm-6" >
         {% include 'RIGS/activity_feed.html' %}    
         
     </div>
-</div></div>
+</div>
 {% endblock %}