Merge remote-tracking branch 'upstream/master' into dilatometer

[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 e9a8623..d9f3cbc 100644 (file)
--- a/testing/MCTXWeb/public_html/static/style.css
+++ b/testing/MCTXWeb/public_html/static/style.css
@@ -3,6 +3,13 @@
   font-family: "Open Sans";
   src: url("OpenSans.ttf"),
     url("OpenSans.eot");
+  font-weight: normal;
+}
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("OpenSansBold.ttf");
+  font-weight: bold;
 }
 
 body {
@@ -18,13 +25,6 @@ hr {
   border-bottom: 1px solid gray;
 }
 
-form.controls {
-  background-color: #F9F9F9;
-  border: 1px solid #808080;
-  padding: 1em;
-  margin: 1em auto;
-}
-
 a {
   color: #1188DD;
 }
@@ -47,7 +47,7 @@ img {
   font-weight: bold
 }
 
-div.centre {
+div.centre, p.centre {
   text-align: center;
   margin: auto;
 }
@@ -56,6 +56,23 @@ div.centre {
   font-weight: bold;
 }
 
+.medium {
+  font-size: 115% !important;
+}
+
+.large {
+  font-size: 130% !important;
+}
+
+.normal {
+  font-size: inherit !important;
+}
+
+.small {
+  font-size: 80% !important;
+}
+
+/*
 table {
   border: none;
 }
@@ -69,6 +86,7 @@ table.status, table.status tr, table.status td {
     padding: 0.2em 0.75em;
 }
 
+
 td {
   padding: 0 0.5em;
 }
@@ -78,6 +96,54 @@ th {
   border-bottom: 1px solid gray;
 }
 
+*/
+
+table {
+  border-radius: 3px;
+  border-collapse: collapse;
+  word-wrap: break-word;
+  line-height: 1.3em;
+  width: 100%;
+  margin: 1em auto;
+  vertical-align: middle;
+}
+
+td {
+  padding: 0.2em 0.5em;
+}
+
+tr.pass {
+  color: #000;
+  background-color: #7AE309;
+  font-weight: inherit;
+}
+
+tr.fail, tr.fail .fail {
+  color: #000;
+  background-color: #E30909;
+  font-weight: inherit;
+}
+
+table.centre {
+  margin: auto;
+  text-align: center;
+}
+
+table.horizontal {
+  line-height: 1.6em;
+}
+
+table.horizontal th {
+  text-align: left;
+  border-bottom: 0;
+  width: 15%;
+  font-weight: normal;
+}
+
+table.horizontal.medium th {
+  width: 22%;
+}
+
 img.centre {
   display: block;
   margin: auto;
@@ -110,6 +176,34 @@ input[type="text"]:focus, input[type="password"]:focus {
   box-shadow: 0 0 2px #BBBBBB;
 }
 
+form.nice {
+  line-height: 1.8em;
+}
+
+form.nice p {
+  margin: 0.25em auto;
+}
+
+form.nice input {
+  font-size: 150%;
+}
+
+form.nice label {
+  font-size: 110%;
+}
+
+form.nice input[type="submit"], form.nice input[type="button"] {
+  font-size: inherit;
+  padding: 0.4em 0.8em;
+}
+
+form.controls {
+  background-color: #F9F9F9;
+  border: 1px solid #808080;
+  padding: 1em;
+  margin: 1em auto;
+}
+
 #header-wrap {
   background-color: #2a2a2a;
   border-top: 0.3em solid #1188DD;
@@ -121,7 +215,7 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #header {
   padding: 1.5em 2em;
-  max-width: 1280px;
+  /*max-width: 1920px;*/
   margin: 0 auto;
 }
 
@@ -185,8 +279,9 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #content-wrap {
   padding: 1em 2em;
-  max-width: 1280px;
+  /*max-width: 1920px;*/
   margin: 1em auto;
+  transition: all 0.2s ease 0s;
 }
 
 #content  {
@@ -196,13 +291,32 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 #sidebar{
   float: left;
-  max-width: 26%;
+  width: 240px;
+  transition: all 0.2s ease 0s;
 }
 
 #sidebar .title {
   font-size: 20px;
 }
 
+#sidebar-hide {
+  border-bottom: 1px solid #CCCCCC;
+  border-left: 1px solid #CCCCCC;
+  cursor: pointer;
+  float: right;
+  height: 20px;
+  margin-right: -1.25em;
+  margin-top: -1em;
+  text-align: center;
+  width: 20px;
+}
+
+#sidebar-show {
+  float: left;
+  cursor: pointer;
+  display: none;
+}
+
 .justify {
   text-align: justify;
 }
@@ -214,11 +328,31 @@ input[type="text"]:focus, input[type="password"]:focus {
 }
 
 #main .sub-title {
-  font-size: 18px;
+  font-size: 115%;
   font-weight: bold;
   margin-bottom: 0.25em;
 }
 
+/* Unused ?? */
+.sxs {
+  display: table;
+  table-layout: fixed;
+  width: 100%;
+  border-spacing: 0.5em;
+}
+
+.sxs div {
+  display: table-cell;
+}
+
+.left {
+  float: left;
+}
+
+.right {
+  float: right;
+}
+
 .title {
   font-size: 24px;
   font-weight: bold;
@@ -231,7 +365,7 @@ input[type="text"]:focus, input[type="password"]:focus {
 }
 
 .widget {
-  background-color: #ffffff;
+  background-color: #fff; /*#EBF4FA;*/ /*#ffffff; segmented */
   margin: 0.25em 0.25em 1.5em;
   padding: 1em 1.25em;
   box-shadow: 0 0 3px #CCCCCC;
@@ -246,25 +380,25 @@ input[type="text"]:focus, input[type="password"]:focus {
 
 .plot {
        box-sizing: border-box;
-       width: 850px;
-       height: 450px;
+       width: auto;
+       height: 300px;
        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;
 }
 
+/** For links on the data page **/
+.datalink {
+       color: black;
+       text-decoration:none;
+}
+
+.datalink:hover {
+       color: blue;
+       text-decoration:underline;
+}
+
 /** Hack **/
 .clear {
   clear: both;
@@ -275,6 +409,8 @@ input[type="text"]:focus, input[type="password"]:focus {
   max-width: 100%;
   width: 100%;
   height: 6em;
+  background-color: white;
+  border: 1px solid #ccc;
 }
 
 /** For login.html **/
@@ -306,3 +442,16 @@ input[type="text"]:focus, input[type="password"]:focus {
 #login-container #result {
   clear: both;
 }
+
+#experiment-stop {
+  padding: 0.2em 0.4em;
+  display: none;
+}
+
+#start-widget {
+  display: none;
+}
+
+#pressure-widget {
+  display: none;
+}
\ No newline at end of file