Merge branch 'master' of git://github.com/jvasile/Plinth into santiago

This commit is contained in:
Nick Daly 2012-02-22 22:03:02 -06:00
commit d0cedf67a3

View File

@ -3,19 +3,19 @@ body {
padding:0; padding:0;
border:0; /* This removes the border around the viewport in old versions of IE */ border:0; /* This removes the border around the viewport in old versions of IE */
width:100%; width:100%;
background:lightgoldenrodyellow; background:#EEE;
min-width:600px; /* Minimum width of layout - remove line if not required */ min-width:600px; /* Minimum width of layout - remove line if not required */
/* The min-width property does not work in old versions of Internet Explorer */ /* The min-width property does not work in old versions of Internet Explorer */
font-size:90%; font-size:90%;
font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif;
} }
a { a {
color:#369; color:#3D8FE2;
text-decoration:none; text-decoration:none;
} }
a:hover { a:hover {
color:#fff; color:#fff;
background:GoldenRod; background:#3D8FE2;
text-decoration:none; text-decoration:none;
} }
h1, h2, h3 { h1, h2, h3 {
@ -46,7 +46,7 @@ img {
float: left; float: left;
padding-left: 1em; padding-left: 1em;
} }
#headerleft a { color:lightgoldenrodyellow; text-decoration:none; outline: none;} #headerleft a { color:#1D6FE2; text-decoration:none; outline: none;}
#headerright { #headerright {
float:left; float:left;
@ -80,7 +80,7 @@ img {
margin:0 0 0 1px; margin:0 0 0 1px;
padding:3px 10px; padding:3px 10px;
text-align:center; text-align:center;
background:Khaki; background:#EEE;
color:#000; color:#000;
text-decoration:none; text-decoration:none;
position:relative; position:relative;
@ -88,7 +88,7 @@ img {
line-height:1.3em; line-height:1.3em;
} }
#headerright ul li a:hover { #headerright ul li a:hover {
background:GoldenRod; background:lightblue;
color:#fff; color:#fff;
} }
#headerright ul li a.active, #headerright ul li a.active,
@ -106,7 +106,7 @@ img {
#layoutdims { #layoutdims {
clear:both; clear:both;
background:#eee; background:#eee;
background:GoldenRod; background:lightblue;
border-top:4px solid #000; border-top:4px solid #000;
margin:0; margin:0;
padding:6px 15px !important; padding:6px 15px !important;
@ -143,7 +143,7 @@ img {
font-weight:bold; font-weight:bold;
font-size:100%; font-size:100%;
text-align:center; text-align:center;
background:Goldenrod; background:cornflowerblue;
margin-top: 1em; margin-top: 1em;
margin-bottom: 0.4em;} margin-bottom: 0.4em;}
.col2 h3, .col2 h3,
@ -172,16 +172,16 @@ img {
/* 3 Column settings */ /* 3 Column settings */
.threecol { .threecol {
background:#eee; /* right column background colour */ background:#eee; /* right column background colour */
background:Khaki; background:#EEE;
} }
.threecol .colmid { .threecol .colmid {
right:25%; /* width of the right column */ right:25%; /* width of the right column */
background:lightgoldenrodyellow; /* center column background colour */ background:lightblue;
} }
.threecol .colleft { .threecol .colleft {
right:50%; /* width of the middle column */ right:50%; /* width of the middle column */
background:#f4f4f4; /* left column background colour */ background:#f4f4f4; /* left column background colour */
background:Khaki; background:#EEE;
} }
.threecol .col1 { .threecol .col1 {
width:46%; /* width of center column content (column width minus padding on either side) */ width:46%; /* width of center column content (column width minus padding on either side) */
@ -206,7 +206,7 @@ img {
border-top:1px solid #000; border-top:1px solid #000;
padding: 1em; padding: 1em;
font-size:75%; font-size:75%;
background:GoldenRod; background:lightblue;
} }
#footer p { #footer p {
margin:0; margin:0;
@ -216,7 +216,7 @@ img {
form.form { form.form {
margin:0 auto; margin:0 auto;
width:100%; width:100%;
background:khaki; background:#EEE;
position:relative; position:relative;
margin-top:2em; margin-top:2em;
} }
@ -224,7 +224,7 @@ margin-top:2em;
form.form h2 { form.form h2 {
color:#ffffff; color:#ffffff;
font-size:1.2em; font-size:1.2em;
background:goldenrod; background:lightblue;
text-transform:uppercase; text-transform:uppercase;
padding:0.5em 0em 0.5em 0.5em; padding:0.5em 0em 0.5em 0.5em;
margin-bottom: 1em; margin-bottom: 1em;
@ -236,26 +236,26 @@ font-weight:bold;
font-size:1em; font-size:1em;
padding:0.5em 0 0.5em 0.5em; padding:0.5em 0 0.5em 0.5em;
text-align:center; text-align:center;
background:khaki; background:#EEE;
} }
form.form .line, form.form .line,
form.form p { form.form p {
width:94%; width:94%;
display: block; display: block;
background:khaki; background:#EEE;
padding:0.5em 0em 1em 1em; padding:0.5em 0em 1em 1em;
padding-right:0.5em; padding-right:0.5em;
margin-left:0.5em; margin-left:0.5em;
background:lightgoldenrodyellow; background:#1D6FE2;
margin-top: 0em; margin-top: 0em;
margin-bottom: 0em; margin-bottom: 0em;
} }
form.form label { form.form label {
width:100%; width:100%;
display: block; display: block;
background:khaki; background:#EEE;
padding:1em 0 0.5em 0em; padding:1em 0 0.5em 0em;
} }
@ -280,7 +280,7 @@ padding:0.5em 2em 0 0;
form.form .inputtext { form.form .inputtext {
padding:0.2em 0.3em 0.2em 0.3em; padding:0.2em 0.3em 0.2em 0.3em;
background:lightgoldenrodyellow; background:#1D6FE2;
border-bottom: 1px double #171717; border-bottom: 1px double #171717;
border-top: 1px double #171717; border-top: 1px double #171717;
border-left:1px double #333333; border-left:1px double #333333;
@ -291,7 +291,7 @@ form.form .checkbox { text-align: left;}
form.form .inputtextnowidth { form.form .inputtextnowidth {
padding:0.5em 0.5em 0em 0em; padding:0.5em 0.5em 0em 0em;
background:lightgoldenrodyellow; background:#1D6FE2;
border-bottom: 1px double #171717; border-bottom: 1px double #171717;
border-top: 1px double #171717; border-top: 1px double #171717;
border-left:1px double #333333; border-left:1px double #333333;
@ -301,7 +301,7 @@ border-right:1px double #333333;
form.form .textbox{ form.form .textbox{
padding:7px 7px; padding:7px 7px;
width:60%; width:60%;
background:lightgoldenrodyellow; background:#1D6FE2;
border-bottom: 1px double #171717; border-bottom: 1px double #171717;
border-top: 1px double #171717; border-top: 1px double #171717;
border-left:1px double #333333; border-left:1px double #333333;
@ -314,15 +314,15 @@ form.form .button
{ {
margin:0 0 10px 0; margin:0 0 10px 0;
padding:4px 7px; padding:4px 7px;
background:goldenrod; background:lightblue;
border:0px; border:0px;
position: relative; position: relative;
top:10px; top:10px;
width:100px; width:100px;
border-bottom: 1px double Goldenrod; border-bottom: 1px double lightblue;
border-top: 1px double Gold; border-top: 1px double cornflowerblue;
border-left:1px double Goldenrod; border-left:1px double lightblue;
border-right:1px double Gold; border-right:1px double cornflowerblue;
} }
.err {color:red;} .err {color:red;}