Merge branch 'master' of github.com:Elgg/Elgg

8 files changed, 159 insertions, 72 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index b41649c06..a4d413781 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -100,6 +100,7 @@ h6 { font-size: 0.8em; }
 
 a {
 	color: #333;
+	text-decoration: none;
 }
 a:hover {
 	color: black;
@@ -115,6 +116,9 @@ p {
 	margin-bottom: 15px;
 }
 
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 2em }
+
 table.mceLayout {
 	width:100% !important;
 }
@@ -154,6 +158,13 @@ table.mceLayout {
 .center {
 	text-align: center;
 }
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+
 /* ***************************************
 	PAGE WRAPPER
 *************************************** */
@@ -225,6 +236,17 @@ table.mceLayout {
 	border: 2px solid #ddd;
 	cursor: pointer;
 }
+.elgg-message.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-message.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
 
 /* ***************************************
 	BODY
@@ -266,6 +288,7 @@ table.mceLayout {
 	background-color: #111;
 	border: 1px solid #999;
 	padding: 10px 20px;
+	margin-bottom: 10px;
 }
 .elgg-page-footer a {
 	color: #ddd;
@@ -330,7 +353,11 @@ table.mceLayout {
 	width: 100%;
 	border-top: 1px solid #ccc;
 }
-.elgg-table-alt td {
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, th {
 	padding: 2px 4px;
 	border-bottom: 1px solid #ccc;
 }
@@ -402,10 +429,18 @@ input {
 .input-text,
 .input-tags,
 .input-url,
-.input-textarea {
+.input-textarea,
+<?php // until we're all on elgg-, need to duplicate ?>
+.elgg-input-text,
+.elgg-input-tags,
+.elgg-input-url,
+.elgg-input-textarea {
 	width:98%;
 }
-input[type="submit"], .elgg-button-submit, .elgg-button-action {
+textarea {
+	height: 100px;
+}
+input[type="submit"], .elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	font-size: 14px;
 	font-weight: bold;
 	color: white;
@@ -429,9 +464,22 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 	background-color: #000;
 	text-decoration: none;
 }
-.elgg-button-submit, .elgg-button-action {
+.elgg-button-submit, .elgg-button-action, .elgg-button-cancel {
 	padding: 4px 8px;
 }
+.elgg-button-cancel {
+	color: #333;
+	background-color: #999;
+}
+.elgg-button-cancel:hover {
+	color: #222;
+	background-color: #666;
+	text-decoration: none;
+}
+.elgg-button-action.elgg-state-disabled {
+	background-color: #aaa;
+}
+
 /* ***************************************
 	PAGINATION
 *************************************** */
@@ -637,6 +685,9 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-menu-admin-footer > li {
 	padding-right: 25px;
 }
+.elgg-menu-longtext {
+	float: right;
+}
 
 /* ***************************************
 	WIDGETS
@@ -672,6 +723,16 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-widgets-add-panel li a {
 	display: block;
 }
+.elgg-widget-single.elgg-state-available {
+	color: #333;
+	cursor: pointer;
+}
+.elgg-widget-single.elgg-state-available:hover {
+	border-color: #aaa;
+}
+.elgg-widget-single.elgg-state-unavailable {
+	color: #888;
+}
 
 .elgg-module-widget {
 	background-color: #dedede;
@@ -684,18 +745,17 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 .elgg-module-widget > .elgg-head {
 	background-color: #f5f5f5;
-	height: 30px;
-	line-height: 30px;
+	height: 26px;
 	overflow: hidden;
 }
 .elgg-module-widget > .elgg-head h3 {
 	float: left;
-	padding: 0 45px 0 20px;
+	padding: 4px 45px 0 20px;
 	color: #333;
 }
 .elgg-module-widget > .elgg-head a {
 	position: absolute;
-	top: 5px;
+	top: 4px;
 	display: inline-block;
 	width: 18px;
 	height: 18px;
@@ -797,9 +857,10 @@ a.elgg-widget-collapsed:before {
 	margin-bottom: 5px;
 }
 
-a.elgg-longtext-control {
-	float: right;
+.elgg-longtext-control {
 	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
 }
 
 /* ***************************************
@@ -1032,58 +1093,11 @@ a.elgg-longtext-control {
 .right {float:right}
 .elgg-toggle {cursor:pointer}
 
-/* ***************************************
-	STATES
-*************************************** */
-
-.elgg-state-active {
-	background:#ccc;
-	color: #333;
-}
-
-.elgg-state-inactive {
-	background:#dedede;
-}
-
-.elgg-state-available {
-	color: #333;
-	cursor: pointer;
-}
-
-.elgg-state-available:hover {
-	border-color: #aaa;
-}
-
-.elgg-state-unavailable {
-	color: #888;
-}
-
-.elgg-state-success {
-	background: #e6efc2;
-	color: #264409;
-	border-color: #c6d880;
-}
-
-.elgg-state-error {
-	background: #fbe3e4;
-	color: #8a1f11;
-	border-color: #fbc2c4;
-	font-weight: bold;
-}
-
-p.elgg-state-error {
-	padding: 5px;
-}
-
 <?php //@todo elgg-drag-handle instead? ?>
 .elgg-state-draggable .elgg-head {
 	cursor: move;
 }
 
-<?php //What to do with states that don't have default styles? ?>
-.elgg-state-selected {}
-.elgg-state-disabled {}
-
 /* ***************************************
 	ADMIN MISC
 *************************************** */
@@ -1122,8 +1136,8 @@ form.admin_plugins_simpleview .elgg-button-submit {
 	margin-right: 10px;
 }
 ul.admin_plugins {
-	margin-bottom:0;
-	padding-left:0;
+	margin-bottom: 0;
+	padding-left: 0;
 	list-style: none;
 }
 .elgg-plugin {
@@ -1173,6 +1187,22 @@ ul.admin_plugins {
 .elgg-plugin.elgg-state-active {
 	background: white;
 }
+.elgg-plugin.elgg-state-inactive {
+	background: #dedede;
+}
+
+.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
 
 .admin_notices {
 	padding-bottom: 15px;
@@ -1200,3 +1230,35 @@ ul.admin_plugins {
 .add-user form {
 	width:300px;
 }
+
+/****************************************
+	Markdown Text
+****************************************/
+
+.elgg-markdown {
+	margin: 15px;
+}
+
+.elgg-markdown h1,
+.elgg-markdown h2,
+.elgg-markdown h3,
+.elgg-markdown h4,
+.elgg-markdown h5,
+.elgg-markdown h6 {
+	margin: 1em 0 1em -15px;
+	color: #333;
+}
+
+.elgg-markdown ol {
+	list-style: decimal;
+	padding-left: 2em;
+}
+
+.elgg-markdown ul {
+	list-style: disc;
+	padding-left: 2em;
+}
+
+.elgg-markdown p {
+	margin: 15px 0;
+}
\ No newline at end of file
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index c5d99512f..61dcdb1fe 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -105,4 +105,7 @@
 	/* Inline-block: IE 6, 7 */
 	zoom: 1;
 	*display: inline;
-}
\ No newline at end of file
+}
+
+/* Looks much better when middle-aligned with surrounding text */
+.elgg-icon {vertical-align:middle}
\ No newline at end of file
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index 0230cbc54..af7b2be19 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,6 +16,12 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
+.elgg-form-footer {
+}
+.elgg-form-footer-alt {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
 
 label {
 	font-weight: bold;
@@ -73,9 +79,17 @@ input[type="radio"] {
 	padding-right: 10px;
 }
 
+.elgg-form-account input[type="text"],
+.elgg-form-account input[type="password"] {
+	width: 300px;
+}
+
 /* ***************************************
 	FRIENDS PICKER
 *************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
 .friends-picker-container h3 {
 	font-size:4em !important;
 	text-align: left;
diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php
index 08948df50..1bc056072 100644
--- a/views/default/css/elements/icons.php
+++ b/views/default/css/elements/icons.php
@@ -224,10 +224,10 @@
 .elgg-icon-undo {
 	background-position: 0 -1206px;
 }
-.elgg-icon-user:hover {
+.elgg-icon-user {
 	background-position: 0 -1224px;
 }
-.elgg-icon-user {
+.elgg-icon-user:hover {
 	background-position: 0 -1242px;
 }
 .elgg-icon-users:hover {
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index d52938aee..a5854f8c1 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -15,6 +15,10 @@
 	PAGE LAYOUT
 *************************************** */
 /***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
 .elgg-page-default .elgg-page-header > .elgg-inner {
 	width: 990px;
 	margin: 0 auto;
@@ -35,7 +39,6 @@
 .elgg-page-topbar {
 	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
 	border-bottom: 1px solid #000000;
-	min-width: 998px;
 	position: relative;
 	height: 24px;
 	z-index: 9000;
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index c8ba4f735..ebac2b91f 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -8,10 +8,6 @@
 	z-index: 100;
 }
 
-#dashboard-info .elgg-inner {
-	border: 2px solid #dedede;
-}
-
 /* ***************************************
 	AVATAR UPLOADING & CROPPING
 *************************************** */
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index a5b907ddc..c4808478b 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -197,6 +197,7 @@ a.elgg-widget-edit-button {
 	width: 96%;
 	padding: 2%;
 	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
 }
 .elgg-widget-content {
 	padding: 10px;
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 25b45bbee..d930d3a89 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,15 +130,11 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px;
+	padding: 2px 15px 0;
 	color: #eee;
 	margin-top: 1px;
 }
 
-.elgg-menu-topbar > li > a > span {
-	vertical-align: middle;
-}
-
 .elgg-menu-topbar > li > a:hover {
 	color: #4690D6;
 	text-decoration: none;
@@ -148,6 +144,18 @@
 	float: right;
 }
 
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
 /* ***************************************
 	SITE MENU
 *************************************** */