1 files changed, 70 insertions, 51 deletions

diff --git a/install/css/install.css b/install/css/install.css
index 8ce4dfb38..e7290c130 100644
--- a/install/css/install.css
+++ b/install/css/install.css
@@ -62,37 +62,44 @@ ul {
 	list-style: none;
 }
 
-.clearfloat {
-	clear:both;
-	height:0;
-	font-size: 1px;
-	line-height: 0px;
-}
-
-#elgg-wrapper {
-	background: white;
-	width: 800px;
+.elgg-page {
+	width: 880px;
 	margin: auto;
-	padding: 5px 40px;
 	margin-top: 20px;
+}
+.elgg-page-header {
 	border-right: 1px solid #666666;
+	padding: 15px 50px 10px;
+	background: white;
+}
+.elgg-page-body {
 	border-bottom: 1px solid #666666;
+	border-right: 1px solid #666666;
+	padding: 0 40px 5px;
+	background: white;
 }
-#elgg-header {
-	margin: 10px 10px;
+
+.elgg-page-body:after,
+.elgg-page-header:after {
+	display: block;
+	content: '.';
+	line-height: 0;
+	height: 0;
+	visibility: hidden;
+	clear: both;
 }
-#elgg-sidebar {
+
+.elgg-sidebar {
 	float: left;
 	width: 250px;
 }
-#elgg-content {
-	float: left;
-	width: 550px;
+.elgg-body {
+	overflow: hidden;
 	min-height: 320px;
-	padding-bottom: 60px;
+	padding-bottom: 10px;
 	position: relative;
 }
-#elgg-footer {
+.elgg-page-footer {
 	width: 800px;
 	height: 20px;
 	clear: both;
@@ -101,28 +108,28 @@ ul {
 	margin-bottom: 40px;
 }
 
-.install-nav {
+.elgg-install-nav {
 	width: 100%;
 	text-align: right;
 	position: absolute;
 	bottom: 0px;
 }
 
-#elgg-footer a {
+.elgg-page-footer a {
 	color: white;
 }
 
-#elgg-footer li {
+.elgg-page-footer li {
 	float: left;
 	list-style: none;
 	margin-right: 20px;
 }
 
-#elgg-sidebar ol {
+.elgg-sidebar ol {
 	padding-left: 30px;
 }
 
-#elgg-sidebar li {
+.elgg-sidebar li {
 	font-size: 1.2em;
 	margin-bottom: 5px;
 }
@@ -142,58 +149,57 @@ h3 {
 	margin: 15px 0 5px;
 }
 
+form > div {
+	margin-bottom: 15px;
+}
 label {
 	font-weight: bold;
-	color:#333333;
+	color: #333333;
 	font-size: 140%;
 }
+.elgg-combo-label {
+	font-size: 120%;
+}
 input[type="text"],
 input[type="password"]  {
 	font: 120% Arial, Helvetica, sans-serif;
 	padding: 5px;
 	border: 1px solid #cccccc;
-	color:#666666;
-	width:566px;
+	color: #666666;
+	width: 96%;
 }
 .database-settings input[type="text"],
 .database-settings input[type="password"] {
-	width:220px;
-}
-textarea {
-	width: 100%;
-	height: 100%;
-	font: 120% Arial, Helvetica, sans-serif;
-	border: solid 1px #cccccc;
-	padding: 5px;
-	color:#666666;
+	width: 220px;
 }
-textarea:focus, input[type="password"]:focus, input[type="text"]:focus {
+input[type="password"]:focus, input[type="text"]:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
-	color:#333333;
+	color: #333333;
 }
 input[type="submit"] {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
 	font-weight: bold;
-	color: #ffffff;
+	color: #fff;
 	background: #4690d6;
 	border: 4px solid #4690d6;
+	
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
+	border-radius: 4px;
+	
 	width: auto;
 	height: 35px;
-	padding: 2px 6px 2px 6px;
-	margin: 10px 0 10px 0;
+	padding: 2px 6px;
+	margin: 10px 0;
 	cursor: pointer;
 	float: right;
 }
-
 input[type="submit"]:hover {
 	background: #0054a7;
 	border: 4px solid #0054a7;
 }
-
 select {
 	display: block;
 	padding: 5px;
@@ -203,48 +209,61 @@ select {
 	font-size: 90%;
 }
 
-.install-nav a {
+.elgg-require-database {
+	padding-bottom: 50px;
+}
+
+.elgg-install-nav a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
 	font-weight: bold;
 	color: #ffffff;
 	background: #4690d6;
 	border: 4px solid #4690d6;
+	
 	-webkit-border-radius: 4px;
 	-moz-border-radius: 4px;
-	padding: 2px 9px 2px 9px;
+	border-radius: 4px;
+	
+	padding: 2px 9px;
 	margin: 10px;
 	cursor: pointer;
 	float: right;
 }
 
-.install-nav a:hover {
+.elgg-install-nav a:hover {
 	text-decoration: none;
 	background: #0054a7;
 	border: 4px solid #0054a7;
 }
-.install-nav .disabled, .install-nav .disabled:hover {
+.elgg-install-nav .elgg-state-disabled,
+.elgg-install-nav .elgg-state-disabled:hover {
 	background: #555555;
 	border-color: #555555;
 	cursor: default;
 }
 
-#elgg-system-message {
+.elgg-system-messages li {
 	padding: 3px 10px 3px 10px;
 	margin-bottom: 20px;
 }
 
-.success {
+.elgg-state-success {
 	border: 1px solid #00cc00;
 	background: #ccffcc;
 }
 
-.error {
+.elgg-state-error {
 	border: 1px solid #D3322A;
 	background: #F7DAD8;
 }
 
-#elgg-content li {
+.elgg-state-warning {
+	border: 1px solid #ded0a9;
+	background: #FEF5AA;
+}
+
+.elgg-body li {
 	margin-top: 5px;
 	padding: 5px;
 }