1 files changed, 24 insertions, 29 deletions
diff --git a/uploader/templates/base.html b/uploader/templates/base.html
index c124b13..c37e1f3 100644
--- a/uploader/templates/base.html
+++ b/uploader/templates/base.html
@@ -23,25 +23,24 @@
   </head>
 
   <body>
-    <header id="header" class="container-fluid">
-      <div class="row">
-        <span class="header col-lg-9">GeneNetwork Data Quality Control and Upload</span>
-        <nav class="header-nav col-lg-3">
-          <ul class="nav justify-content-end">
-            <li>
-              {%if user_logged_in()%}
-              <a href="{{url_for('oauth2.logout')}}"
-                 title="Log out of the system">{{user_email()}} &mdash; Log Out</a>
-              {%else%}
-              <a href="{{authserver_authorise_uri()}}"
-                 title="Log in to the system">Log In</a>
-              {%endif%}
-            </li>
-          </ul>
-        </nav>
+    <header id="header">
+      <span id="header-text">GeneNetwork Data Quality Control and Upload</span>
+      <nav id="header-nav">
+        <ul class="nav justify-content-end">
+          <li>
+            {%if user_logged_in()%}
+            <a href="{{url_for('oauth2.logout')}}"
+               title="Log out of the system">{{user_email()}} &mdash; Log Out</a>
+            {%else%}
+            <a href="{{authserver_authorise_uri()}}"
+               title="Log in to the system">Log In</a>
+            {%endif%}
+          </li>
+        </ul>
+      </nav>
     </header>
 
-    <aside id="nav-sidebar" class="container-fluid">
+    <aside id="nav-sidebar">
       <ul class="nav flex-column">
         <li {%if activemenu=="home"%}class="activemenu"{%endif%}>
           <a href="/" >Home</a></li>
@@ -90,9 +89,9 @@
       </ul>
     </aside>
 
-    <main id="main" class="main container-fluid">
+    <main id="main" class="main">
 
-      <div class="pagetitle row">
+      <div id="pagetitle" class="pagetitle">
         <span class="title">GN Uploader: {%block pagetitle%}{%endblock%}</span>
         <nav>
           <ol class="breadcrumb">
@@ -108,14 +107,12 @@
         </nav>
       </div>
 
-      <div class="row">
-        <div class="container-fluid">
-          <div class="col-md-8 main-content">
-            {%block contents%}{%endblock%}
-          </div>
-          <div class="sidebar-content col-md-4">
-            {%block sidebarcontents%}{%endblock%}
-          </div>
+      <div id="all-content">
+        <div id="main-content">
+          {%block contents%}{%endblock%}
+        </div>
+        <div id="sidebar-content">
+          {%block sidebarcontents%}{%endblock%}
         </div>
       </div>
     </main>
@@ -127,7 +124,5 @@
                  filename='js/bootstrap.min.js')}}"></script>
     <script type="text/javascript" src="/static/js/misc.js"></script>
     {%block javascript%}{%endblock%}
-
   </body>
-
 </html>