Merge branch 'master' of https://github.com/szmoore/MCTX3420

ARGH

diff --combined testing/MCTXWeb/public_html/static/style.css
index 85818c9,1dd3718..3a62cb0
--- 1/testing/MCTXWeb/public_html/static/style.css
--- 2/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@@ -5,16 -5,12 +5,12 @@@
      url("OpenSans.eot");
  }
  
- /** Limit max width and auto-center content **/
- html  {
-   max-width: 1280px;
-   margin: 0 auto;
- }
- 
  body {
    font-family: "Open Sans", "Lucida Grande","Lucida Sans",Verdana,Arial;
    font-size: 13px;
    background-color: #F5F5F5;
+   margin: 0;
+   padding: 0;
  }
  
  hr {
@@@ -37,6 -33,10 +33,10 @@@ a:active 
    color: #0066BB;
  }
  
+ img {
+   border: none;
+ }
+ 
  .pass {
    color: #7AE309;
    font-weight: bold;
@@@ -49,6 -49,7 +49,7 @@@
  
  div.centre {
    text-align: center;
+   margin: auto;
  }
  
  .bold {
@@@ -109,18 -110,21 +110,21 @@@ input[type="text"]:focus, input[type="p
    box-shadow: 0 0 2px #BBBBBB;
  }
  
- #header {
+ #header-wrap {
    background-color: #2a2a2a;
-   border-top: 0.8em solid #1188DD;
+   border-top: 0.3em solid #1188DD;
    color: #f2f2f2;
-   padding: 1.5em 2em;
-   margin-top: -1em;
    margin-bottom: 1em;
    box-shadow: 0 0 0.5em #444444;
-   border-radius: 4px;
    transition: all 0.2s ease 0s;
  }
  
+ #header {
+   padding: 1.5em 2em;
+   max-width: 1280px;
+   margin: 0 auto;
+ }
+ 
  #header input[type="button"], #header input[type="submit"] {
    background-color: #808080;
    border: 1px solid #808080;
@@@ -170,12 -174,23 +174,23 @@@
    display: inline-block;
  }
  
+ #header #logout-container {
+   /* Hide until activated by JavaScript */
+   display: none;
+ }
+ 
  #header #date {
    font-size: 12px;
  }
  
- #content  {
+ #content-wrap {
    padding: 1em 2em;
+   max-width: 1280px;
+   margin: 1em auto;
+ }
+ 
+ #content  {
+  
    /*display: none;  Enable in non-debug mode*/
  }
  
@@@ -186,7 -201,6 +201,6 @@@
  
  #sidebar .title {
    font-size: 20px;
-   font-weight: bold;
  }
  
  #sidebar .item {
@@@ -200,18 -214,18 +214,18 @@@
    min-width: 400px;
  }
  
- #main .title {
-   font-size: 24px;
-   font-weight: bold;
-   margin-bottom: 0.5em;
- }
- 
  #main .sub-title {
    font-size: 18px;
    font-weight: bold;
    margin-bottom: 0.25em;
  }
  
+ .title {
+   font-size: 24px;
+   font-weight: bold;
+   margin-bottom: 0.5em;
+ }
+ 
  .graph {
    width: 100%;
    height: 200px;
@@@ -231,27 -245,6 +245,27 @@@
    box-shadow: 0 0 0.25em #AAAAAA;
  }
  
 +.plot {
 +      box-sizing: border-box;
 +      width: 850px;
 +      height: 450px;
 +      padding: 20px 15px 15px 15px;
 +      margin: 15px auto 30px auto;
 +      border: 1px solid #ddd;
 +      background: #fff;
 +      background: linear-gradient(#f6f6f6 0, #fff 50px);
 +      background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
 +      background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
 +      background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
 +      background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
 +      box-shadow: 0 3px 10px rgba(0,0,0,0.15);
 +      -o-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
 +      -ms-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
 +      -moz-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
 +      -webkit-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
 +      font-size:20px;
 +}
 +
  /** Hack **/
  .clear {
    clear: both;
@@@ -292,4 -285,4 +306,4 @@@
  
  #login-container #result {
    clear: both;
 -}
 +}