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

8 files changed, 205 insertions, 234 deletions

diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index a4d413781..8993ec66d 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -302,7 +302,9 @@ table.mceLayout {
 /* ***************************************
 	MODULES
 *************************************** */
-
+.elgg-module {
+	overflow: hidden;
+}
 .elgg-module-main {
 	background-color: #fff;
 	border: 1px solid #ccc;
@@ -383,7 +385,7 @@ table.mceLayout {
 	margin-left: 5px;
 }
 
-.elgg-list-item {
+.elgg-item {
 	margin: 3px;
 }
 .elgg-menu-metadata {
@@ -426,15 +428,10 @@ input {
 	border-radius: 5px;
 }
 /* default elgg core input field classes */
-.input-text,
-.input-tags,
-.input-url,
-.input-textarea,
-<?php // until we're all on elgg-, need to duplicate ?>
 .elgg-input-text,
 .elgg-input-tags,
 .elgg-input-url,
-.elgg-input-textarea {
+.elgg-input-plaintext {
 	width:98%;
 }
 textarea {
@@ -479,7 +476,76 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 .elgg-button-action.elgg-state-disabled {
 	background-color: #aaa;
 }
-
+/* **************************************
+     DATE PICKER
+*************************************** */
+.ui-datepicker {
+	margin-top: 3px;
+	padding: 3px 3px 0;
+	border: 1px solid #ccc;
+	background-color: white;
+}
+.ui-datepicker-header {
+	padding: 2px 0;
+	border: 1px solid #ccc;
+	background-color: #eee;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+    position: absolute;
+    top: 9px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+    left: 6px;
+}
+.ui-datepicker-next {
+    right: 6px;
+}
+.ui-datepicker-title {
+    line-height: 1.8em;
+    margin: 0 30px;
+    text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin-bottom: 2px;
+}
+.ui-datepicker th {
+	border: none;
+    font-weight: bold;
+    padding: 5px 6px;
+    text-align: center;
+}
+.ui-datepicker td {
+	padding: 1px;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    display: block;
+    padding: 2px;
+	line-height: 1.2em;
+    text-align: right;
+    text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+    color: #555;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+    color: #333;
+	background: #ccc;
+}
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+    border: 1px solid #999;
+    color: #333;
+	background: #ddd;
+}
 /* ***************************************
 	PAGINATION
 *************************************** */
@@ -605,6 +671,18 @@ input[type="submit"]:hover, .elgg-button-submit:hover, .elgg-button-action:hover
 }
 
 /* ***************************************
+	TITLE MENU
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
+}
+
+/* ***************************************
 	FOOTER MENU
 *************************************** */
 .elgg-menu-footer {color:gray}
@@ -1102,6 +1180,10 @@ a.elgg-widget-collapsed:before {
 	ADMIN MISC
 *************************************** */
 
+.elgg-instructs {
+	max-width: 600px;
+}
+
 .manifest_file {
 	background-color:#eee;
 
diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index 0fcbe3619..4a09ca74e 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -47,10 +47,10 @@
 	border-bottom: 1px dotted #CCCCCC;
 }
 
-.elgg-list-item .elgg-subtext {
+.elgg-item .elgg-subtext {
 	margin-bottom: 5px;
 }
-.elgg-list-content {
+.elgg-item .elgg-content {
 	margin: 10px 5px;
 }
 
@@ -65,9 +65,12 @@
 .elgg-gallery td {
 	padding: 5px;
 }
-.elgg-gallery-fluid li {
+.elgg-gallery-fluid > li {
 	float: left;
 }
+.elgg-gallery-users > li {
+	margin: 0 2px;
+}
 
 /* ***************************************
 	Tables
@@ -161,6 +164,9 @@
 	font-style: italic;
 	line-height: 1.2em;
 }
+
+.elgg-river-attachments,
+.elgg-river-message,
 .elgg-river-content {
 	border-left: 1px solid #CCC;
 	font-size: 85%;
@@ -168,9 +174,8 @@
 	margin: 8px 0 5px 0;
 	padding-left: 5px;
 }
-
-<?php //@todo location-dependent styles ?>
-.elgg-river-content .elgg-avatar {
+.elgg-river-attachments .elgg-avatar,
+.elgg-river-attachments .elgg-icon {
 	float: left;
 }
 .elgg-river-layout .elgg-input-dropdown {
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 61dcdb1fe..af4a1882a 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -96,9 +96,6 @@
 .elgg-menu-hz > li > span {
 	/* Google says do this, but why? */
 	position: relative;
-	
-	/* FF2 */
-	display: -moz-inline-box;
 
 	display: inline-block;
 	
@@ -106,6 +103,3 @@
 	zoom: 1;
 	*display: inline;
 }
-
-/* 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 af7b2be19..1fced0196 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -16,9 +16,7 @@ fieldset > div {
 fieldset > div:last-child {
 	margin-bottom: 0;
 }
-.elgg-form-footer {
-}
-.elgg-form-footer-alt {
+.elgg-form-alt > fieldset > .elgg-foot {
 	border-top: 1px solid #CCC;
 	padding: 10px 0;
 }
@@ -251,215 +249,81 @@ input[type="radio"] {
 	margin-right:10px;
 }
 /* ***************************************
-        Datepicker
+      DATE PICKER
 **************************************** */
-
-#ui-datepicker-div, .ui-datepicker-inline, .ui-datepicker-calendar{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	padding: 0;
-	margin: 0;
-	background: #E4ECF5;
-	width: 220px;
-	color: black;
-}
-#ui-datepicker-div {
-	display: none;
-	border: 1px solid #777;
-	z-index: 9999; /*must have*/
-}
-.ui-datepicker-inline {
-	float: left;
-	display: block;
-	border: 0;
-}
-.ui-datepicker-rtl {
-	direction: rtl;
-}
-.ui-datepicker-dialog {
-	padding: 5px !important;
-	border: 4px ridge #ddd !important;
-}
-button.ui-datepicker-trigger {
-	width: 25px;
-}
-img.ui-datepicker-trigger {
-	margin: 2px;
-	vertical-align: middle;
-}
-.ui-datepicker-prompt {
-	float: left;
-	padding: 2px;
-	background: #ddd;
-	color: #000;
-}
-* html .ui-datepicker-prompt {
-	width: 185px;
-}
-.ui-datepicker-control, .ui-datepicker-links, .ui-datepicker-header, .ui-datepicker {
-	clear: both;
-	float: left;
-	width: 218px;
-	color: #fff;
-}
-.ui-datepicker-control {
-	background: #400;
-	padding: 2px 0px;
-}
-.ui-datepicker-links {
-	background: #000;
-	padding: 2px 0px;
-}
-.ui-datepicker-control, .ui-datepicker-links {
-	font-weight: bold;
-	font-size: 80%;
-}
-.ui-datepicker-links label { /* disabled links */
-	padding: 2px 5px;
-	color: #888;
-}
-.ui-datepicker-clear, .ui-datepicker-prev {
-	float: left;
-}
-.ui-datepicker-rtl .ui-datepicker-clear, .ui-datepicker-rtl .ui-datepicker-prev {
-	float: right;
-	text-align: right;
-}
-.ui-datepicker-current {
-	float: left;
-	width: 30%;
-	text-align: center;
-}
-.ui-datepicker-close, .ui-datepicker-next {
-	float: right;
-	text-align: right;
-	padding: 0px 0px 2px 0px;
-}
-.ui-datepicker-rtl .ui-datepicker-close, .ui-datepicker-rtl {
-	float: left;
-	text-align: left;
+.ui-datepicker {
+	margin-top: 3px;
+	background-color: white;
+	border: 1px solid #0054A7;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	overflow: hidden;
 }
+
 .ui-datepicker-header {
-	padding: 1px 0 3px;
 	background: #4690D6;
-	text-align: center;
-	font-weight: bold;
-	height: 1.3em;
-	padding: 0 2px 3px 0;
-}
-.ui-datepicker-header select {
-	background: #333;
-	color: #fff;
-	border: 0px;
-	font-weight: bold;
-}
-.ui-datepicker {
-	background: #ccc;
-	text-align: center;
-	font-size: 100%;
+	color: white;
+	padding: 2px 0;
+	border-bottom: 1px solid #0054A7;
 }
-.ui-datepicker a {
-	display: block;
-	width: 30px;
-}
-.ui-datepicker-title-row {
-	background: #777;
-}
-.ui-datepicker-days-row {
-	background: #eee;
-	color: #666;
-}
-.ui-datepicker-week-col {
-	background: #777;
-	color: #fff;
-}
-.ui-datepicker-days-cell {
-	color: #000;
-	border: 1px solid #ddd;
-}
-.ui-datepicker-days-cell a{
-	display: block;
+.ui-datepicker-header a {
+	color: white;
 }
-.ui-datepicker-week-end-cell {
-	background: #ddd;
-}
-.ui-datepicker-title-row .ui-datepicker-week-end-cell {
-	background: #777;
-}
-.ui-datepicker-days-cell-over {
-	background: #fff;
-	border: 1px solid #777;
-}
-.ui-datepicker-unselectable {
-	color: #E4ECF5;
+.ui-datepicker-prev, .ui-datepicker-next {
+    position: absolute;
+    top: 5px;
+	cursor: pointer;
 }
-.ui-datepicker-today {
-	background: #4690D6 !important;
+.ui-datepicker-prev {
+    left: 6px;
 }
-.ui-datepicker-current-day {
-	background: #999 !important;
+.ui-datepicker-next {
+    right: 6px;
 }
-.ui-datepicker-status {
-	background: #ddd;
-	width: 100%;
-	font-size: 80%;
-	text-align: center;
-}
-        
-/* ________ Datepicker Links _______
-        
-** Reset link properties and then override them with !important */
-#ui-datepicker-div a, .ui-datepicker-inline a {
-	cursor: pointer;
-	margin: 0;
-	padding: 0;
-	background: none;
-	color: #000;
-	align: center !important;
+.ui-datepicker-title {
+    line-height: 1.8em;
+    margin: 0 30px;
+    text-align: center;
+	font-weight: bold;
 }
-.ui-datepicker-inline .ui-datepicker-links a {
-	padding: 0 5px !important;
+.ui-datepicker-calendar {
+	margin: 4px;
 }
-.ui-datepicker-control a, .ui-datepicker-links a {
-	padding: 2px 5px !important;
-	color: #eee !important;
+.ui-datepicker th {
+	color: #0054A7;
+	border: none;
+    font-weight: bold;
+    padding: 5px 6px;
+    text-align: center;
 }
-.ui-datepicker-title-row a {
-	color: #eee !important;
+.ui-datepicker td {
+	padding: 1px;
 }
-.ui-datepicker-control a:hover {
-	background: #fdd !important;
-	color: #333 !important;
+.ui-datepicker td span, .ui-datepicker td a {
+    display: block;
+    padding: 2px;
+	line-height: 1.2em;
+    text-align: right;
+    text-decoration: none;
 }
-.ui-datepicker-links a:hover, .ui-datepicker-title-row a:hover {
-	background: #ddd !important;
-	color: #333 !important;
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+    color: #4690D6;;
+	background: #fafafa;
 }
-        
-/* ___________ MULTIPLE MONTHS _________*/
-        
-.ui-datepicker-multi .ui-datepicker {
-	border: 1px solid #777;
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+    color: #0054A7;
+	background: #eee;
 }
-.ui-datepicker-one-month {
-	float: left;
-	width: 185px;
-}
-.ui-datepicker-new-row {
-	clear: left;
-}
-        
-/* ___________ IE6 IFRAME FIX ________ */
-        
-.ui-datepicker-cover {
-	display: none; /*sorry for IE5*/
-	display/**/: block; /*sorry for IE5*/
-	position: absolute; /*must have*/
-	z-index: -1; /*must have*/
-	filter: mask(); /*must have*/
-	top: -4px; /*must have*/
-	left: -4px; /*must have*/
-	width: 200px; /*must have*/
-	height: 200px; /*must have*/
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+    border: 1px solid #0054A7;
+    color: #0054A7;
+	background: #E4ECF5;
 }
-
diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php
index a5854f8c1..42d898439 100644
--- a/views/default/css/elements/layout.php
+++ b/views/default/css/elements/layout.php
@@ -53,7 +53,7 @@
 	top: 24px;
 	right: 20px;
 	max-width: 500px;
-	z-index: 1000;
+	z-index: 2000;
 }
 .elgg-system-messages li {
 	margin-top: 10px;
@@ -75,9 +75,6 @@
 .elgg-layout {
 	min-height: 360px;
 }
-.elgg-layout-one-column {
-	padding: 10px 0;
-}
 .elgg-layout-one-sidebar {
 	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
 }
diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php
index c4808478b..ef85d4dd5 100644
--- a/views/default/css/elements/modules.php
+++ b/views/default/css/elements/modules.php
@@ -2,6 +2,7 @@
 	Modules
 *************************************** */
 .elgg-module {
+	overflow: hidden;
 	margin-bottom: 20px;
 }
 
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index d930d3a89..b5388715e 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -144,6 +144,11 @@
 	float: right;
 }
 
+.elgg-menu-topbar .elgg-icon {
+	vertical-align: middle;
+	margin-top: -1px;
+}
+
 .elgg-menu-topbar > li > a.elgg-topbar-logo {
 	margin-top: 0;
 	padding-left: 5px;
@@ -160,7 +165,7 @@
 	SITE MENU
 *************************************** */
 .elgg-menu-site {
-	z-index: 7000;
+	z-index: 1;
 }
 
 .elgg-menu-site > li > a {
@@ -208,7 +213,7 @@
 	position: relative;
 	left: -1px;
 	width: 100%;
-	z-index: 7000;
+	z-index: 1;
 	min-width: 150px;
 	border: 1px solid #999;
 	border-top: 0;
@@ -419,22 +424,29 @@ li:hover > .elgg-menu-site-more {
 }
 
 /* ***************************************
-	ENTITY
+	ENTITY AND ANNOTATION
 *************************************** */
-.elgg-menu-entity {
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, elgg-menu-annotation {
 	float: right;
 	margin-left: 15px;
 	font-size: 90%;
 	color: #aaa;
+	line-height: 16px;
+	height: 16px;
 }
-.elgg-menu-entity > li {
-	display: inline-block;
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
 	margin-left: 15px;
 }
-<?php // height depends on line height/font size ?>
-.elgg-menu-entity > li > a {
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
 	color: #aaa;
-	height: 18px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
 }
 
 /* ***************************************
@@ -476,11 +488,24 @@ li:hover > .elgg-menu-site-more {
 	margin-left: 15px;
 	font-size: 90%;
 	color: #aaa;
+	line-height: 16px;
+	height: 16px;
 }
 .elgg-menu-river > li {
 	display: inline-block;
 	margin-left: 5px;
 }
+.elgg-menu-river > li > a {
+	color: #aaa;
+	height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+	display: block;
+}
+.elgg-menu-river > li > span {
+	vertical-align: baseline;
+}
 
 /* ***************************************
 	SIDEBAR EXTRAS (rss, bookmark, etc)
diff --git a/views/default/css/elgg.php b/views/default/css/elgg.php
index 675af860d..4960e6ade 100644
--- a/views/default/css/elgg.php
+++ b/views/default/css/elgg.php
@@ -26,13 +26,12 @@ if ($old_css_view != elgg_get_config('viewpath')) {
 Base CSS
  * CSS reset
  * core
- * helpers
+ * helpers (moved to end to have a higher priority)
  * grid
 
 *******************************************************************************/
 echo elgg_view('css/elements/reset', $vars);
 echo elgg_view('css/elements/core', $vars);
-echo elgg_view('css/elements/helpers', $vars);
 echo elgg_view('css/elements/grid', $vars);
 
 
@@ -61,5 +60,9 @@ echo elgg_view('css/elements/layout', $vars);
 echo elgg_view('css/elements/misc', $vars);
 
 
+// included last to have higher priority
+echo elgg_view('css/elements/helpers', $vars);
+
+
 // in case plugins are still extending the old 'css' view, display it
 echo elgg_view('css', $vars);