Merge branch 'master' of github:szmoore/MCTX3420

[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static / style.css

diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css
index 0a21ecd..2b23426 100644 (file)
--- a/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@ -5,16 +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 @@ a:active {
   color: #0066BB;
 }
 
+img {
+  border: none;
+}
+
 .pass {
   color: #7AE309;
   font-weight: bold;
@@ -49,6 +49,7 @@ a:active {
 
 div.centre {
   text-align: center;
+  margin: auto;
 }
 
 .bold {
@@ -109,18 +110,21 @@ input[type="text"]:focus, input[type="password"]:focus {
   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,28 +174,37 @@ input[type="text"]:focus, input[type="password"]:focus {
   display: inline-block;
 }
 
+#header #logout-container {
+  /* Hide until activated by JavaScript */
+  display: none;
+}
+
 #header #date {
   font-size: 12px;
 }
 
-#content  {
+#content-wrap {
   padding: 1em 2em;
-  /* display: none;  Enable in non-debug mode*/
+  max-width: 1280px;
+  margin: 1em auto;
+}
+
+#content  {
+ 
+  /*display: none;  Enable in non-debug mode*/
 }
 
 #sidebar{
   float: left;
-  max-width: 26%;
+  width: 240px;
 }
 
 #sidebar .title {
   font-size: 20px;
-  font-weight: bold;
 }
 
-#sidebar .item {
-  padding: 0.2em;
-  margin-bottom: 0.5em;
+.justify {
+  text-align: justify;
 }
 
 #main {
@@ -200,18 +213,18 @@ input[type="text"]:focus, input[type="password"]:focus {
   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,6 +244,16 @@ input[type="text"]:focus, input[type="password"]:focus {
   box-shadow: 0 0 0.25em #AAAAAA;
 }
 
+.plot {
+       box-sizing: border-box;
+       width: auto;
+       height: 300px;
+       padding: 20px 15px 15px 15px;
+       margin: 15px auto 30px auto;
+       border: 1px solid #ddd;
+       font-size:20px;
+}
+
 /** Hack **/
 .clear {
   clear: both;
@@ -271,4 +294,4 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #login-container #result {
   clear: both;
-}
\ No newline at end of file
+}