aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--_graphics/header_shadow.pngbin0 -> 154 bytes
-rw-r--r--mod/blog/views/default/blog/css.php11
-rw-r--r--mod/blog/views/default/object/blog.php4
-rw-r--r--views/default/annotation/annotate.php2
-rw-r--r--views/default/annotation/generic_comment.php55
-rw-r--r--views/default/annotation/latest_comments.php7
-rw-r--r--views/default/css.php65
7 files changed, 93 insertions, 51 deletions
diff --git a/_graphics/header_shadow.png b/_graphics/header_shadow.png
new file mode 100644
index 000000000..4c07b814a
--- /dev/null
+++ b/_graphics/header_shadow.png
Binary files differ
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index 1a85330e2..3cddd3105 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -9,3 +9,14 @@
* @link http://elgg.org/
*/
?>
+.blogpost {
+ border-bottom:1px dotted #CCCCCC;
+}
+.blogpost .body {
+ margin-top:5px;
+ margin-bottom:10px;
+ display:block;
+}
+.blogpost .body p {
+ line-height: 1.4em;
+} \ No newline at end of file
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 4a56ec0e1..5a86e7e3d 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -61,7 +61,7 @@ if ($full) {
$owner_title = sprintf(elgg_echo('blog:owner_title'), $user->name);
echo <<<___END
-<div class="blog clearfloat">
+<div class="blogpost clearfloat">
<div id="content_header" class="clearfloat">
<div class="content_header_title"><h2>$owner_title</h2></div>
</div>
@@ -77,7 +77,7 @@ echo <<<___END
$comments_link
</p>
<p class="tags">$tags</p>
- <p class="blog body">$body</p>
+ <span class="body">$body</span>
</div>
</div>
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index a1940bed7..e66035204 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -14,7 +14,7 @@
$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
$string .= elgg_echo("{$subtype}:river:annotate") . " <a href=\"{$object->getURL()}\">" . $title . "</a> " . friendly_time($object->time_created);
if(get_context() != 'riverdashboard'){
- $string .= "<div class=\"river_content_display\">";
+ $string .= "<div class='river_content_display'>";
if($comment){
$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
if(strlen($contents) > 200)
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index c747120be..ebcae0f97 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -6,44 +6,41 @@
$owner = get_user($vars['annotation']->owner_guid);
?>
-<div class="generic_comment clearfloat"><!-- start of generic_comment div -->
-
+<div class="generic_comment clearfloat">
<div class="generic_comment_icon">
<?php
- echo elgg_view("profile/icon",
- array(
+ echo elgg_view("profile/icon", array(
'entity' => $owner,
- 'size' => 'small'
- )
- );
+ 'size' => 'tiny'
+ ));
?>
</div>
+
<div class="generic_comment_details">
<?php
-
- // if the user looking at the comment can edit, show the delete link
- if ($vars['annotation']->canEdit()) {
-
- ?>
- <span class="delete_button">
- <?php
-
- echo elgg_view("output/confirmlink",array(
- 'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm'),
- ));
-
- ?>
- </span>
-
- <?php
+ // if the user looking at the comment can edit, show the delete link
+ if ($vars['annotation']->canEdit()) {
+ ?>
+ <span class="delete_button">
+ <?php echo elgg_view("output/confirmlink",array(
+ 'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm')
+ ));
+ ?>
+ </span>
+ <?php
} //end of can edit if statement
?>
<p class="generic_comment_owner">
- <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
+ <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
+ <span class="entity_subtext">
+ <?php echo friendly_time($vars['annotation']->time_created); ?>
+ </span>
</p>
<!-- output the actual comment -->
- <div class="generic_comment_body"><?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?></div>
- </div><div class="clearfloat"></div><!-- end of generic_comment_details -->
-</div><!-- end of generic_comment div --> \ No newline at end of file
+ <div class="generic_comment_body">
+ <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
+ </div>
+ </div>
+</div> \ No newline at end of file
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 85ddfab7b..6ab7163ed 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -5,8 +5,6 @@
if($vars['comments']){
global $CONFIG;
-
- echo "<div class='sidebar container'>";
echo "<h2>" . elgg_echo('latestcomments') . "</h2>";
foreach($vars['comments'] as $comment){
//grab the entity the comment is on
@@ -30,10 +28,9 @@ if($vars['comments']){
$url_display = $objecttitle;
}
- echo "<div class='LatestComment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+ echo "<div class='latest_comment'><span class='generic_comment_icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
echo "<p class='owner_timestamp'><a href=\"{$vars['url']}pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " {$url_display} <small>{$friendlytime}</small></p>";
- echo "<div class='clearfloat'></div></div>";
+ echo "</div>";
}
- echo "</div>";
} \ No newline at end of file
diff --git a/views/default/css.php b/views/default/css.php
index 61b736af6..f7ed1c2db 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -21,10 +21,11 @@
ELGG TABBED NAVIGATION re-usable tabbed navigation
LOGIN / REGISTER login box, register, and lost password page styles
CONTENT HEADER
+ DEFAULT COMMENTS
ENTITY LISTINGS elgg's default entity listings
USER SETTINGS & ADMIN AREA styles for user settings and default admin area
GENERAL FORM ELEMENTS default styles for all elgg input/form elements
-
+ FRIENDS PICKER
*/
@@ -642,7 +643,7 @@ h2 {
line-height:1.2em;
color:#bababa;
position: relative;
- top:-8px;
+ top:-6px;
left:0;
}
#breadcrumbs a {
@@ -914,6 +915,53 @@ select.styled .select_option {
}
+/* ***************************************
+ DEFAULT COMMENTS
+**************************************** */
+.generic_comment {
+ border-bottom:1px dotted #cccccc;
+ clear:both;
+ display:block;
+ margin:0;
+ padding:5px 0 7px;
+ position:relative;
+}
+.generic_comment:first-child {
+ border-top:1px dotted #cccccc;
+}
+.generic_comment_icon {
+ float:left;
+ margin-left:3px;
+ margin-top:3px;
+}
+.generic_comment_icon img {
+ width: auto;
+}
+.generic_comment_details {
+ float:left;
+ margin-left:7px;
+ min-height:28px;
+ width:693px;
+}
+.generic_comment_details p {
+ margin:0;
+}
+.generic_comment_owner {
+ font-size: 1.1em;
+ line-height:1.2em;
+ color:#666666;
+}
+.generic_comment_owner a {
+ color:#0054A7;
+}
+.generic_comment_owner .entity_subtext {
+ color:#666666;
+ font-size: 90%;
+}
+.generic_comment_body {
+ margin:3px 0 5px 0;
+}
+
/* ***************************************
DEFAULT ENTITY LISTINGS
@@ -997,12 +1045,6 @@ select.styled .select_option {
.admin_settings {
margin-bottom:20px;
}
-/*
-.user_settings p,
-.admin_settings p {
- margin-bottom:6px;
-}
-*/
.user_settings h3,
.admin_settings h3 {
background:#e4e4e4;
@@ -1312,7 +1354,7 @@ a.action_button:focus {
/* ***************************************
- FRIENDS PICKER SLIDER
+ FRIENDS PICKER
*************************************** */
.friends_picker_container h3 {
font-size:4em !important;
@@ -1340,11 +1382,6 @@ a.action_button:focus {
padding:0;
width: 730px;
height: auto;
-/*
- background: #dedede;
- -webkit-border-radius: 8px;
- -moz-border-radius: 8px;
-*/
}
.friendspicker_savebuttons {
background: white;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 20:36:28 +0000