git.ucc.asn.au
/
matches
/
MCTX3420.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
f12cfdf
..
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");
}
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;
body {
font-family: "Open Sans", "Lucida Grande","Lucida Sans",Verdana,Arial;
font-size: 13px;
background-color: #F5F5F5;
+ margin: 0;
+ padding: 0;
}
hr {
}
hr {
@@
-37,8
+33,23
@@
a:active {
color: #0066BB;
}
color: #0066BB;
}
+img {
+ border: none;
+}
+
+.pass {
+ color: #7AE309;
+ font-weight: bold;
+}
+
+.fail {
+ color: #E30909;
+ font-weight: bold
+}
+
div.centre {
text-align: center;
div.centre {
text-align: center;
+ margin: auto;
}
.bold {
}
.bold {
@@
-99,18
+110,21
@@
input[type="text"]:focus, input[type="password"]:focus {
box-shadow: 0 0 2px #BBBBBB;
}
box-shadow: 0 0 2px #BBBBBB;
}
-#header {
+#header
-wrap
{
background-color: #2a2a2a;
background-color: #2a2a2a;
- border-top: 0.
8
em solid #1188DD;
+ border-top: 0.
3
em solid #1188DD;
color: #f2f2f2;
color: #f2f2f2;
- padding: 1.5em 2em;
- margin-top: -1em;
margin-bottom: 1em;
box-shadow: 0 0 0.5em #444444;
margin-bottom: 1em;
box-shadow: 0 0 0.5em #444444;
- border-radius: 4px;
transition: all 0.2s ease 0s;
}
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;
#header input[type="button"], #header input[type="submit"] {
background-color: #808080;
border: 1px solid #808080;
@@
-160,27
+174,37
@@
input[type="text"]:focus, input[type="password"]:focus {
display: inline-block;
}
display: inline-block;
}
+#header #logout-container {
+ /* Hide until activated by JavaScript */
+ display: none;
+}
+
#header #date {
font-size: 12px;
}
#header #date {
font-size: 12px;
}
-#content
{
+#content
-wrap
{
padding: 1em 2em;
padding: 1em 2em;
+ max-width: 1280px;
+ margin: 1em auto;
+}
+
+#content {
+
+ /*display: none; Enable in non-debug mode*/
}
#sidebar{
float: left;
}
#sidebar{
float: left;
-
max-width: 26%
;
+
width: 240px
;
}
#sidebar .title {
font-size: 20px;
}
#sidebar .title {
font-size: 20px;
- font-weight: bold;
}
}
-#sidebar .item {
- padding: 0.2em;
- margin-bottom: 0.5em;
+.justify {
+ text-align: justify;
}
#main {
}
#main {
@@
-189,18
+213,18
@@
input[type="text"]:focus, input[type="password"]:focus {
min-width: 400px;
}
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;
}
#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;
.graph {
width: 100%;
height: 200px;
@@
-220,6
+244,16
@@
input[type="text"]:focus, input[type="password"]:focus {
box-shadow: 0 0 0.25em #AAAAAA;
}
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;
/** Hack **/
.clear {
clear: both;
@@
-233,7
+267,7
@@
input[type="text"]:focus, input[type="password"]:focus {
}
/** For login.html **/
}
/** For login.html **/
-#login {
+#login
-container
{
margin: 0 auto;
width: 400px;
padding: 1.8em 0 0;
margin: 0 auto;
width: 400px;
padding: 1.8em 0 0;
@@
-241,19
+275,23
@@
input[type="text"]:focus, input[type="password"]:focus {
line-height: 1.8em;
}
line-height: 1.8em;
}
-#login form {
+#login
-container
form {
padding: 1em 2em;
}
padding: 1em 2em;
}
-#login input {
+#login
-container
input {
font-size: 24px;
}
font-size: 24px;
}
-#login label {
+#login
-container
label {
font-size: 14px;
}
font-size: 14px;
}
-#login
input[type=submit], #login
input[type=submit] {
+#login
-container
input[type=submit] {
font-size: inherit;
padding: 0.4em 0.8em;
font-size: inherit;
padding: 0.4em 0.8em;
-}
\ No newline at end of file
+}
+
+#login-container #result {
+ clear: both;
+}
UCC
git Repository :: git.ucc.asn.au