aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-27 15:15:43 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-27 15:15:43 +0000
commit5026cb1b92ccd679bf9a425b1c9be401ab56eed7 (patch)
tree971ddded6ce551dcfb7022ab0d1d6db362bc0dfa /views
parentdbdf001b867cb686beb6113d329eaa42b02ed4ca (diff)
downloadelgg-5026cb1b92ccd679bf9a425b1c9be401ab56eed7.tar.gz
elgg-5026cb1b92ccd679bf9a425b1c9be401ab56eed7.tar.bz2
introducing elgg-subtext as replacement for elgg-list-subtitle and elgg-subtitle
git-svn-id: http://code.elgg.org/elgg/trunk@7950 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/annotation/default.php2
-rw-r--r--views/default/annotation/generic_comment.php4
-rw-r--r--views/default/annotation/likes.php2
-rw-r--r--views/default/css/admin.php2
-rw-r--r--views/default/css/elements/core.php6
-rw-r--r--views/default/layout/objects/list/body.php4
6 files changed, 12 insertions, 8 deletions
diff --git a/views/default/annotation/default.php b/views/default/annotation/default.php
index b7ae2146e..dc1337362 100644
--- a/views/default/annotation/default.php
+++ b/views/default/annotation/default.php
@@ -1,6 +1,8 @@
<?php
/**
* Elgg default annotation view
+ *
+ * @uses $vars['annotation']
*/
$owner = get_user($vars['annotation']->owner_guid);
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index eeceba344..f168546c3 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -46,7 +46,7 @@ if ($full_view) {
<p class="mbn">
$delete_button
$commenter_link
- <span class="elgg-subtitle">
+ <span class="elgg-subtext">
$friendlytime
</span>
$comment_text
@@ -63,7 +63,7 @@ HTML;
$on = elgg_echo('on');
$body = <<<HTML
-<span class="elgg-subtitle">
+<span class="elgg-subtext">
$commenter_link $on $entity_link ($friendlytime)
</span>
HTML;
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 20965f456..748d0b601 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -39,7 +39,7 @@ $body = <<<HTML
<p class="mbn">
$delete_button
$user_link $likes_string
- <span class="elgg-list-subtitle">
+ <span class="elgg-subtext">
$friendlytime
</span>
</p>
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 03476ca5b..4aa1b5b52 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -560,7 +560,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
-.elgg-list-subtitle, .elgg-subtitle {
+.elgg-subtext {
color: #666666;
font-size: 85%;
line-height: 1.2em;
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index b86af351b..304ae615e 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -46,12 +46,14 @@
.elgg-list-metadata, .elgg-list-metadata a {
color: #aaaaaa;
}
-.elgg-list-subtitle, .elgg-subtitle {
+.elgg-list-item .elgg-subtext {
+ margin-bottom: 5px;
+}
+.elgg-subtext {
color: #666666;
font-size: 85%;
line-height: 1.2em;
font-style: italic;
- margin-bottom: 5px;
}
.elgg-tags {
margin-bottom: 5px;
diff --git a/views/default/layout/objects/list/body.php b/views/default/layout/objects/list/body.php
index 00bc1c058..5f7fc74f9 100644
--- a/views/default/layout/objects/list/body.php
+++ b/views/default/layout/objects/list/body.php
@@ -5,7 +5,7 @@
* Sample output
* <ul class="elgg-list-metadata"><li>Public</li><li>Like this</li></ul>
* <h3><a href="">Title</a></h3>
- * <p class="elgg-list-subtitle">Posted 3 hours ago by George</p>
+ * <p class="elgg-subtext">Posted 3 hours ago by George</p>
* <p class="elgg-tags"><a href="">one</a>, <a href="">two</a></p>
* <div class="elgg-list-content">Excerpt text</div>
*
@@ -49,7 +49,7 @@ if ($metadata) {
echo $metadata;
}
echo "<h3>$title_link</h3>";
-echo "<p class=\"elgg-list-subtitle\">$subtitle</p>";
+echo "<p class=\"elgg-subtext\">$subtitle</p>";
echo $tags;
if ($content) {
echo "<div class=\"elgg-list-content\">$content</div>";