aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 12:18:48 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-14 12:18:48 +0000
commitebf372775a143da9f285431f28e6b022639691a8 (patch)
tree82320c9b85ed142dabf1515c82ce084e43c77f49 /views/default
parentc9f5c056862553d5102d1dfb7d964ea449573d59 (diff)
downloadelgg-ebf372775a143da9f285431f28e6b022639691a8.tar.gz
elgg-ebf372775a143da9f285431f28e6b022639691a8.tar.bz2
Refs #2391: Baby steps toward getting a unified css -- haven't landed on a name yet, but listing/icon/info seems to make the most sense. Do we need to be worried about naming collisions, since those names are so simple?
git-svn-id: http://code.elgg.org/elgg/trunk@7314 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/css.php34
-rw-r--r--views/default/entities/entity_listing.php6
2 files changed, 22 insertions, 18 deletions
diff --git a/views/default/css.php b/views/default/css.php
index e60ec8e41..923d7c958 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -193,9 +193,22 @@ h2 {
padding-bottom:5px;
}
-/* Float-related */
-.clearfix:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
-.clearfloat {clear:both;}
+.clearfloat { clear:both; }
+
+/* Clearfix! */
+.clearfix:after,
+.listing:after,
+.listing .info:after {
+ content:".";
+ display:block;
+ height:0;
+ clear:both;
+ visibility:hidden;
+}
+
+.listing .icon { float: left; margin-right: 10px; }
+.listing .icon img { width: auto }
+.listing .info { display: table-cell; }
.link {
cursor:pointer;
@@ -1072,10 +1085,7 @@ li.navigation_more ul li {
**************************************** */
.entity_listing {
border-bottom:1px dotted #cccccc;
- clear:both;
- display:block;
- margin:0;
- padding:4px 0 4px;
+ padding:4px 0;
position:relative;
}
.entity_listing:first-child {
@@ -1084,17 +1094,11 @@ li.navigation_more ul li {
.entity_listing:hover {
background-color: #eeeeee;
}
-.entity_listing_icon {
- float:left;
+.entity_listing .icon {
margin-left:3px;
margin-top:3px;
}
-.entity_listing_icon img {
- width: auto;
-}
-.entity_listing_info {
- float:left;
- margin-left:7px;
+.entity_listing .info {
min-height:28px;
width:693px;
}
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
index e547bbc68..11d1edcda 100644
--- a/views/default/entities/entity_listing.php
+++ b/views/default/entities/entity_listing.php
@@ -9,11 +9,11 @@
* @uses string $vars['info'] Info about the entity.
*/
?>
-<div class="entity_listing clearfix">
- <div class="entity_listing_icon">
+<div class="listing entity_listing">
+ <div class="icon">
<?php echo $vars['icon']; ?>
</div>
- <div class="entity_listing_info">
+ <div class="info">
<?php echo $vars['info']; ?>
</div>
</div>