6 files changed, 28 insertions, 37 deletions

diff --git a/views/default/css/elements/components.php b/views/default/css/elements/components.php
index f675ab7cb..77313fa1a 100644
--- a/views/default/css/elements/components.php
+++ b/views/default/css/elements/components.php
@@ -7,17 +7,6 @@
  * @package Elgg.Core
  * @subpackage UI
  */
-/**
- * elgg-body fills the space available to it.
- * It uses hidden text to expand itself. The combination of auto width, overflow
- * hidden, and the hidden text creates this effect.
- *
- * This allows us to float fixed width divs to either side of an .elgg-body div
- * without having to specify the body div's width.
- *
- * @todo check what happens with long <pre> tags or large images
- * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
- */
 ?>
 
 /* ***************************************
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 627cae55c..74f21ee59 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -46,13 +46,28 @@
 	*overflow:visible;
 }
 
-<?php //@todo isn't this only needed if we use display:table-cell? ?>
+<?php
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+
+//@todo isn't this only needed if we use display:table-cell?
+?>
 .elgg-body:after,
 .elgg-col-last:after {
 	display: block;
 	visibility: hidden;
 	height: 0 !important;
 	line-height: 0;
+	overflow: hidden;
 	
 	/* Stretch to fill up available space */
 	font-size: xx-large;
@@ -68,8 +83,9 @@
 /* Enabled nesting of dropdown/flyout menus */
 .elgg-menu > li { position: relative; }
 
-/* Separators should only come between list items */
-.elgg-menu > li:last-child:after { display: none } 
+.elgg-menu > li:last-child::after {
+	display: none;
+}
 
 /* Maximize click target */
 .elgg-menu > li > a { display: block }
diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php
index d14c341a7..81db81747 100644
--- a/views/default/css/elements/forms.php
+++ b/views/default/css/elements/forms.php
@@ -41,7 +41,7 @@ input, textarea {
 	box-sizing: border-box;
 }
 
-input:focus, textarea:focus {
+input[type=text]:focus, textarea:focus {
 	border: solid 1px #4690d6;
 	background: #e4ecf5;
 	color:#333;
@@ -72,7 +72,7 @@ input[type="radio"] {
 	width:auto;
 }
 .elgg-input-checkboxes.elgg-horizontal li,
-.elgg-input-radio.elgg-horizontal li {
+.elgg-input-radios.elgg-horizontal li {
 	display: inline;
 	padding-right: 10px;
 }
diff --git a/views/default/css/elements/helpers.php b/views/default/css/elements/helpers.php
index e6f59260d..e9a9e0a30 100644
--- a/views/default/css/elements/helpers.php
+++ b/views/default/css/elements/helpers.php
@@ -33,27 +33,10 @@
 	float: right;
 }
 
-.right {
-	float: right;
-}
-
-.left {
-	float: left;
-}
-
 .link {
 	cursor: pointer;
 }
 
-<?php @todo // do we need something like large and small? ?>
-.large {
-	font-size: 120%;
-}
-
-.small {
-	font-size: 80%;
-}
-
 .elgg-discover .elgg-discoverable {
 	display: none;
 }
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index bf1046dda..d5b20896a 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -130,9 +130,9 @@
 }
 
 .elgg-menu-topbar > li > a {
-	padding: 2px 15px 0;
+	padding-top: 2px;
 	color: #eee;
-	margin-top: 1px;
+	margin: 1px 15px 0;
 }
 
 .elgg-menu-topbar > li > a:hover {
@@ -372,7 +372,10 @@
 	position: absolute;
 	z-index: 10000;
 
-	width: 165px;
+	overflow: hidden;
+
+	min-width: 165px;
+	max-width: 250px;
 	border: solid 1px;
 	border-color: #E5E5E5 #999 #999 #E5E5E5;
 	background-color: #FFF;
diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php
index f080a29b2..d93b28d2c 100644
--- a/views/default/css/elements/typography.php
+++ b/views/default/css/elements/typography.php
@@ -139,7 +139,7 @@ h6 { font-size: 0.8em; }
 .elgg-output dt { font-weight: bold }
 .elgg-output dd { margin: 0 0 1em 1em }
 
-.elgg-output ul, ol {
+.elgg-output ul, .elgg-output ol {
 	margin: 0 1.5em 1.5em 0;
 	padding-left: 1.5em;
 }