X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=testing%2FMCTXWeb%2Fpublic_html%2Fstatic%2Fstyle.css;h=e9a8623e6c6c42f8bbd453e426a660ddf710171b;hb=1780973fb10ed5ef2a69d861b14e8f58cdc4369f;hp=88a4c9f55da74de8d7ebad397ba56324eb3188d4;hpb=bda41ea25e069e422578d2f2cfaee49f0e2cbdc9;p=matches%2FMCTX3420.git

diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css
index 88a4c9f..e9a8623 100644
--- 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 {
@@ -29,8 +25,31 @@ form.controls {
   margin: 1em auto;
 }
 
+a {
+  color: #1188DD;
+}
+
+a:active {
+  color: #0066BB;
+}
+
+img {
+  border: none;
+}
+
+.pass {
+  color: #7AE309;
+  font-weight: bold;
+}
+
+.fail {
+  color: #E30909;
+  font-weight: bold
+}
+
 div.centre {
   text-align: center;
+  margin: auto;
 }
 
 .bold {
@@ -79,24 +98,34 @@ input[type="button"]:active, input[type="submit"]:active {
   background-color: #E8E8E8;
 }
 
-/* IE8 width bugfix */
+
 input[type="text"], input[type="password"] {
-  width: 100%;
+  width: 100%; /* IE8 width bugfix */
+  border-radius: 3px;
+  border: 1px solid #CCCCCC;
+  font-size: 16px;
 }
 
-#header {
+input[type="text"]:focus, input[type="password"]:focus {
+  box-shadow: 0 0 2px #BBBBBB;
+}
+
+#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 input[type="button"], input[type="submit"] {
+#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;
   box-shadow: none;
@@ -104,7 +133,7 @@ input[type="text"], input[type="password"] {
   cursor: pointer;
 }
 
-#header input[type="button"]:hover, input[type="submit"]:hover {
+#header input[type="button"]:hover, #header input[type="submit"]:hover {
   background-color: #606060;
   border: 1px solid #606060;
 }
@@ -114,15 +143,18 @@ input[type="text"], input[type="password"] {
   display: table;
 }
 
+#header #leftnav > div, #header #leftnav > span {
+  display: table-cell;
+  vertical-align: middle;
+  padding-left: 1em;  
+}
+
 #header #leftnav a {
   color: #2a2a2a;
 }
 
-#header #title {
+#title {
   font-size: 30px;
-  display: table-cell;
-  vertical-align: middle;
-  padding-left: 1em;
 }
 
 #header #rightnav {
@@ -142,48 +174,57 @@ input[type="text"], input[type="password"] {
   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*/
 }
 
 #sidebar{
-  float: right;
+  float: left;
   max-width: 26%;
 }
 
 #sidebar .title {
   font-size: 20px;
-  font-weight: bold;
 }
 
-#sidebar .item {
-  padding: 0.2em;
-  margin-bottom: 0.5em;
+.justify {
+  text-align: justify;
 }
 
 #main {
   overflow: auto;
-  margin-right: 25%;
-  padding-right: 2em;
+  padding-left: 2em;
   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;
@@ -194,6 +235,7 @@ input[type="text"], input[type="password"] {
   margin: 0.25em 0.25em 1.5em;
   padding: 1em 1.25em;
   box-shadow: 0 0 3px #CCCCCC;
+  border: 1px solid #CCCCCC;
   transition: all 0.2s ease 0s;
   overflow: auto;
 }
@@ -202,6 +244,27 @@ input[type="text"], input[type="password"] {
   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;
@@ -212,4 +275,34 @@ input[type="text"], input[type="password"] {
   max-width: 100%;
   width: 100%;
   height: 6em;
-}
\ No newline at end of file
+}
+
+/** For login.html **/
+#login-container {
+  margin: 0 auto;
+  width: 400px;
+  padding: 1.8em 0 0;
+  color: #606060;
+  line-height: 1.8em;
+}
+
+#login-container form {
+  padding: 1em 2em;
+}
+
+#login-container input {
+  font-size: 24px;
+}
+
+#login-container label {
+  font-size: 14px;
+}
+
+#login-container input[type=submit] {
+  font-size: inherit;
+  padding: 0.4em 0.8em;
+}
+
+#login-container #result {
+  clear: both;
+}