aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/annotation/generic_comment.php6
-rw-r--r--views/default/core/likes/display.php2
-rw-r--r--views/default/core/members/sidebar.php2
-rw-r--r--views/default/css/admin.php3
-rw-r--r--views/default/css/elements/core.php13
-rw-r--r--views/default/css/elements/misc.php13
-rw-r--r--views/default/output/tagcloud.php2
7 files changed, 14 insertions, 27 deletions
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index a7ab0a956..eeceba344 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="entity-subtext">
+ <span class="elgg-subtitle">
$friendlytime
</span>
$comment_text
@@ -63,8 +63,8 @@ HTML;
$on = elgg_echo('on');
$body = <<<HTML
-<span class="entity-subtext">
- $commenter_link $on <span class='entity-title'>$entity_link</span> ($friendlytime)
+<span class="elgg-subtitle">
+ $commenter_link $on $entity_link ($friendlytime)
</span>
HTML;
diff --git a/views/default/core/likes/display.php b/views/default/core/likes/display.php
index bd0a8fa95..db194c04d 100644
--- a/views/default/core/likes/display.php
+++ b/views/default/core/likes/display.php
@@ -52,7 +52,7 @@ if ($num_of_likes) {
'class' => 'elgg-like-toggle',
);
$list = elgg_view('output/url', $params);
- $list .= "<div class='elgg-likes-list hidden clearfix'>";
+ $list .= "<div class='elgg-popup-module elgg-likes-list hidden clearfix'>";
$list .= list_annotations($guid, 'likes', 99);
$list .= "</div>";
}
diff --git a/views/default/core/members/sidebar.php b/views/default/core/members/sidebar.php
index 821547f99..fba0270e5 100644
--- a/views/default/core/members/sidebar.php
+++ b/views/default/core/members/sidebar.php
@@ -14,6 +14,7 @@ $body = elgg_view_form('members/tag_search', $params);
$params = array(
'title' => elgg_echo('members:searchtag'),
'body' => $body,
+ 'class' => 'elgg-aside-module',
);
echo elgg_view('layout/objects/module', $params);
@@ -29,5 +30,6 @@ $body = elgg_view_form('members/name_search', $params);
$params = array(
'title' => elgg_echo('members:searchname'),
'body' => $body,
+ 'class' => 'elgg-aside-module',
);
echo elgg_view('layout/objects/module', $params);
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 54feccc31..bbd38ce12 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -653,3 +653,6 @@ ul.admin_plugins {
top: 2px;
background: white;
}
+.add-user form {
+ width:300px;
+} \ No newline at end of file
diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php
index 374903c59..597313f0c 100644
--- a/views/default/css/elements/core.php
+++ b/views/default/css/elements/core.php
@@ -40,14 +40,14 @@
margin-left: 15px;
font-size: 90%;
}
-.elgg-list-metadata li {
+.elgg-list-metadata > li {
float: left;
margin-left: 15px;
}
.elgg-list-metadata, .elgg-list-metadata a {
color: #aaaaaa;
}
-.elgg-list-subtitle {
+.elgg-list-subtitle, .elgg-subtitle {
color: #666666;
font-size: 85%;
line-height: 1.2em;
@@ -106,13 +106,8 @@
-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
}
-.elgg-sidebar .elgg-module {
- margin-top: 20px;
-}
-.elgg-sidebar .elgg-module .elgg-head {
- border-bottom: 1px solid #CCCCCC;
- margin-bottom: 5px;
- padding-bottom: 5px;
+.elgg-owner-block {
+ margin-bottom: 20px;
}
/* ***************************************
WIDGETS
diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php
index 73d237b47..f5dd78821 100644
--- a/views/default/css/elements/misc.php
+++ b/views/default/css/elements/misc.php
@@ -9,17 +9,8 @@
LIKES
*************************************** */
.elgg-likes-list {
- background-color: white;
- border:1px solid #cccccc;
width: 345px;
- height: auto;
position: absolute;
- text-align: left;
- z-index: 9999;
- -webkit-border-radius: 6px;
- -moz-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);
}
/* ***************************************
@@ -272,10 +263,6 @@ table.styled tr:hover {
background: #E4E4E4;
}
-.add-user form {
- width:300px;
-}
-
/* ***************************************
FRIENDS PICKER
*************************************** */
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index b47b66005..c8d741342 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -66,7 +66,7 @@ if (!empty($vars['tagcloud']) && is_array($vars['tagcloud'])) {
$params = array(
'title' => elgg_echo('tagcloud'),
'body' => $cloud,
- 'class' => 'elgg-tagcloud',
+ 'class' => 'elgg-tagcloud elgg-aside-module',
);
echo elgg_view('layout/objects/module', $params);
} else {