MCTX3420 Web Interface

From bb0959bbec05c36ab1118ddefc4894faf28f0fa0 Mon Sep 17 00:00:00 2001 From: Jeremy Tan Date: Thu, 3 Oct 2013 20:46:34 +0800 Subject: [PATCH] Restyle login page --- testing/MCTXWeb/public_html/index.html | 23 +------ testing/MCTXWeb/public_html/login.html | 66 ++++++++++++++++++++ testing/MCTXWeb/public_html/static/style.css | 62 +++++++++++++++--- 3 files changed, 120 insertions(+), 31 deletions(-) create mode 100644 testing/MCTXWeb/public_html/login.html diff --git a/testing/MCTXWeb/public_html/index.html b/testing/MCTXWeb/public_html/index.html index a9269f8..3d9d616 100644 --- a/testing/MCTXWeb/public_html/index.html +++ b/testing/MCTXWeb/public_html/index.html @@ -25,8 +25,7 @@ //Validate! return false; }); - //$("#cam1").setCamera(); - //$("#strain-graphs").setStrainGraphs(); + $("#errorlog").setErrorLog(); }); @@ -85,26 +84,6 @@ - - - diff --git a/testing/MCTXWeb/public_html/login.html b/testing/MCTXWeb/public_html/login.html new file mode 100644 index 0000000..9227988 --- /dev/null +++ b/testing/MCTXWeb/public_html/login.html @@ -0,0 +1,66 @@ + + + + MCTX3420 Web Interface + + + + + + + + + + + + + + + + +

+ +

+ + diff --git a/testing/MCTXWeb/public_html/static/style.css b/testing/MCTXWeb/public_html/static/style.css index 4f0df9b..f12cfdf 100644 --- a/testing/MCTXWeb/public_html/static/style.css +++ b/testing/MCTXWeb/public_html/static/style.css @@ -29,6 +29,14 @@ form.controls { margin: 1em auto; } +a { + color: #1188DD; +} + +a:active { + color: #0066BB; +} + div.centre { text-align: center; } @@ -79,9 +87,16 @@ 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; +} + +input[type="text"]:focus, input[type="password"]:focus { + box-shadow: 0 0 2px #BBBBBB; } #header { @@ -114,15 +129,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 { @@ -151,7 +169,7 @@ input[type="text"], input[type="password"] { } #sidebar{ - float: right; + float: left; max-width: 26%; } @@ -167,8 +185,7 @@ input[type="text"], input[type="password"] { #main { overflow: auto; - margin-right: 25%; - padding-right: 2em; + padding-left: 2em; min-width: 400px; } @@ -194,6 +211,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; } @@ -212,4 +230,30 @@ input[type="text"], input[type="password"] { max-width: 100%; width: 100%; height: 6em; +} + +/** For login.html **/ +#login { + margin: 0 auto; + width: 400px; + padding: 1.8em 0 0; + color: #606060; + line-height: 1.8em; +} + +#login form { + padding: 1em 2em; +} + +#login input { + font-size: 24px; +} + +#login label { + font-size: 14px; +} + +#login input[type=submit], #login input[type=submit] { + font-size: inherit; + padding: 0.4em 0.8em; } \ No newline at end of file -- 2.20.1

Username
Password
	- - Force -