aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/core/likes/display.php2
-rw-r--r--views/default/core/members/sidebar.php4
-rw-r--r--views/default/core/settings/account/default_access.php2
-rw-r--r--views/default/core/settings/account/email.php2
-rw-r--r--views/default/core/settings/account/language.php2
-rw-r--r--views/default/core/settings/account/notifications.php2
-rw-r--r--views/default/core/settings/account/password.php2
-rw-r--r--views/default/core/settings/statistics/numentities.php2
-rw-r--r--views/default/core/settings/statistics/online.php2
-rw-r--r--views/default/core/settings/tools/plugin.php2
-rw-r--r--views/default/css/elements/chrome.php9
-rw-r--r--views/default/css/elements/grid.php2
-rw-r--r--views/default/css/elements/layout_objects.php47
-rw-r--r--views/default/css/elements/page_layout.php66
-rw-r--r--views/default/css/elements/reset.php3
-rw-r--r--views/default/output/tagcloud.php2
16 files changed, 64 insertions, 87 deletions
diff --git a/views/default/core/likes/display.php b/views/default/core/likes/display.php
index db194c04d..680486863 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-popup-module elgg-likes-list hidden clearfix'>";
+ $list .= "<div class='elgg-module elgg-module-popup 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 fba0270e5..217003504 100644
--- a/views/default/core/members/sidebar.php
+++ b/views/default/core/members/sidebar.php
@@ -14,7 +14,7 @@ $body = elgg_view_form('members/tag_search', $params);
$params = array(
'title' => elgg_echo('members:searchtag'),
'body' => $body,
- 'class' => 'elgg-aside-module',
+ 'class' => 'elgg-module-aside',
);
echo elgg_view('layout/objects/module', $params);
@@ -30,6 +30,6 @@ $body = elgg_view_form('members/name_search', $params);
$params = array(
'title' => elgg_echo('members:searchname'),
'body' => $body,
- 'class' => 'elgg-aside-module',
+ 'class' => 'elgg-module-aside',
);
echo elgg_view('layout/objects/module', $params);
diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php
index 4c4e44757..67a0a4137 100644
--- a/views/default/core/settings/account/default_access.php
+++ b/views/default/core/settings/account/default_access.php
@@ -13,7 +13,7 @@ if (elgg_get_config('allow_user_default_access')) {
$default_access = elgg_get_config('default_access');
}
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('default_access:settings'); ?></h3>
</div>
diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php
index 1222a46ef..3782d39a8 100644
--- a/views/default/core/settings/account/email.php
+++ b/views/default/core/settings/account/email.php
@@ -10,7 +10,7 @@ $user = elgg_get_page_owner_entity();
if ($user) {
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('email:settings'); ?></h3>
</div>
diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php
index 15d6ebea5..c8fef3a46 100644
--- a/views/default/core/settings/account/language.php
+++ b/views/default/core/settings/account/language.php
@@ -10,7 +10,7 @@ $user = elgg_get_page_owner_entity();
if ($user) {
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('user:set:language'); ?></h3>
</div>
diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php
index 1a54b1a98..decf000ea 100644
--- a/views/default/core/settings/account/notifications.php
+++ b/views/default/core/settings/account/notifications.php
@@ -10,7 +10,7 @@ global $NOTIFICATION_HANDLERS;
$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
</div>
diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php
index 524cc0ce0..0ee215f9c 100644
--- a/views/default/core/settings/account/password.php
+++ b/views/default/core/settings/account/password.php
@@ -10,7 +10,7 @@ $user = elgg_get_page_owner_entity();
if ($user) {
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('user:set:password'); ?></h3>
</div>
diff --git a/views/default/core/settings/statistics/numentities.php b/views/default/core/settings/statistics/numentities.php
index dce668ae9..fa393f14a 100644
--- a/views/default/core/settings/statistics/numentities.php
+++ b/views/default/core/settings/statistics/numentities.php
@@ -11,7 +11,7 @@ $entity_stats = get_entity_statistics(get_loggedin_userid());
if ($entity_stats) {
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
</div>
diff --git a/views/default/core/settings/statistics/online.php b/views/default/core/settings/statistics/online.php
index 728248442..76acec183 100644
--- a/views/default/core/settings/statistics/online.php
+++ b/views/default/core/settings/statistics/online.php
@@ -16,7 +16,7 @@ if ($log) {
}
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
</div>
diff --git a/views/default/core/settings/tools/plugin.php b/views/default/core/settings/tools/plugin.php
index 8fcc87bee..50cc55b50 100644
--- a/views/default/core/settings/tools/plugin.php
+++ b/views/default/core/settings/tools/plugin.php
@@ -23,7 +23,7 @@ if ($user_guid) {
if (elgg_view("usersettings/{$plugin}/edit")) {
?>
-<div class="elgg-module elgg-info-module">
+<div class="elgg-module elgg-module-info">
<div class="elgg-head">
<h3><?php echo elgg_echo($plugin); ?></h3>
</div>
diff --git a/views/default/css/elements/chrome.php b/views/default/css/elements/chrome.php
index 6ff7279ee..dd2896ecf 100644
--- a/views/default/css/elements/chrome.php
+++ b/views/default/css/elements/chrome.php
@@ -120,4 +120,11 @@ h2 {
}
.elgg-text ol {
list-style-type: decimal;
-} \ No newline at end of file
+}
+
+.elgg-subtext {
+ color: #666666;
+ font-size: 85%;
+ line-height: 1.2em;
+ font-style: italic;
+}
diff --git a/views/default/css/elements/grid.php b/views/default/css/elements/grid.php
index 04c9a46b5..a800a2842 100644
--- a/views/default/css/elements/grid.php
+++ b/views/default/css/elements/grid.php
@@ -67,4 +67,4 @@
line-height: 0;
font-size: xx-large;
content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/layout_objects.php b/views/default/css/elements/layout_objects.php
index ebb45bbf3..efb3d29b3 100644
--- a/views/default/css/elements/layout_objects.php
+++ b/views/default/css/elements/layout_objects.php
@@ -5,8 +5,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
@@ -17,6 +15,7 @@
*
* @todo check what happens with long <pre> tags or large images
*/
+?>
.elgg-body {
width: auto;
word-wrap: break-word;
@@ -72,12 +71,6 @@
.elgg-list-item .elgg-subtext {
margin-bottom: 5px;
}
-.elgg-subtext {
- color: #666666;
- font-size: 85%;
- line-height: 1.2em;
- font-style: italic;
-}
.elgg-tags {
margin-bottom: 5px;
}
@@ -110,49 +103,33 @@ table.styled td.column-one {
table.styled tr:hover {
background: #E4E4E4;
}
+
/* ***************************************
Modules
*************************************** */
-
-.elgg-aside-module {
+.elgg-module-aside {
margin-bottom: 20px;
}
-.elgg-aside-module .elgg-head {
+.elgg-module-aside .elgg-head {
border-bottom: 1px solid #CCCCCC;
margin-bottom: 5px;
padding-bottom: 5px;
}
-
-.elgg-group-module {
- margin-bottom: 20px;
-}
-.elgg-group-module > .elgg-head {
- padding: 5px 5px 3px;
- background-color: #e4e4e4;
- border-bottom: 1px solid #cccccc;
- -moz-border-radius: 4px 4px 0 0;
-}
-.elgg-group-module > .elgg-head h3 {
- color: #333333;
-}
-
-.elgg-info-module {
+.elgg-module-info {
margin-bottom: 20px;
}
-.elgg-info-module .elgg-head {
+.elgg-module-info > .elgg-head {
background: #e4e4e4;
padding: 5px;
margin-bottom: 10px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
}
-
<?php //@todo should not assume h3 ?>
-.elgg-info-module .elgg-head h3 {
+.elgg-module-info > .elgg-head h3 {
color: #333333;
}
-
-.elgg-popup-module {
+.elgg-module-popup {
background-color: white;
border: 1px solid #cccccc;
z-index: 9999;
@@ -162,6 +139,7 @@ table.styled tr:hover {
-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
}
+
/* ***************************************
OWNER BLOCK
*************************************** */
@@ -176,7 +154,6 @@ table.styled tr:hover {
/* ***************************************
WIDGETS
*************************************** */
-
.elgg-widgets {
float: right;
min-height: 30px;
@@ -307,10 +284,10 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
.elgg-state-error {
background-color:red;
}
-
.elgg-system-message p {
margin:0;
}
+
/* ***************************************
RIVER
*************************************** */
@@ -341,7 +318,7 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
}
<?php //@todo location-dependent styles ?>
-.elgg-river-content .elgg-user-icon {
+.elgg-river-content .elgg-avatar {
float: left;
}
.elgg-river-layout .elgg-input-dropdown {
@@ -449,4 +426,4 @@ a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {
}
.elgg-tagcloud {
text-align: justify;
-} \ No newline at end of file
+}
diff --git a/views/default/css/elements/page_layout.php b/views/default/css/elements/page_layout.php
index ebb201225..13c6ce1d1 100644
--- a/views/default/css/elements/page_layout.php
+++ b/views/default/css/elements/page_layout.php
@@ -1,15 +1,31 @@
<?php
/**
+ * Page Layout
*
+ * Contains CSS for the page shell and page layout
+ *
+ * Classic layout: 990 wide centered. Used in default page shell
*/
?>
/* ***************************************
PAGE LAYOUT
*************************************** */
-<?php //@todo should be in base/reset ?>
-body {
- background-color: white;
+/***** CLASSIC LAYOUT ******/
+.elgg-classic .elgg-page-header > .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
+ height: 90px;
+}
+.elgg-classic .elgg-page-body > .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
+}
+.elgg-classic .elgg-page-footer > .elgg-inner {
+ width: 990px;
+ margin: 0 auto;
+ padding: 5px 0;
+ border-top: 1px solid #DEDEDE;
}
/***** TOPBAR ******/
@@ -25,7 +41,6 @@ body {
.elgg-page-topbar > .elgg-inner {
padding: 2px 10px 2px 8px;
}
-
<?php //@todo location-dependent styles ?>
.elgg-page-topbar a {
color: #eeeeee;
@@ -41,7 +56,7 @@ body {
color: #71cbff;
text-decoration: none;
}
-/* elgg logo and user avatar need to be adjusted slightly */
+<?php // elgg logo and user avatar need to be adjusted slightly ?>
.elgg-page-topbar img {
margin-top: -1px;
}
@@ -56,7 +71,6 @@ body {
}
/***** PAGE HEADER ******/
-
.elgg-page-header {
x-overflow: hidden;
position: relative;
@@ -65,15 +79,9 @@ body {
background-repeat: repeat-x;
background-position: bottom left;
}
-
-<?php //@todo Put all elgg-classic styles together ?>
-.elgg-classic .elgg-page-header > .elgg-inner {
- width: 990px;
- margin: 0 auto;
- height: 90px;
+.elgg-page-header > .elgg-inner {
position: relative;
}
-
.elgg-site-title, .elgg-site-title:hover {
font-size: 2em;
line-height: 1.4em;
@@ -85,14 +93,9 @@ body {
}
/***** PAGE BODY ******/
-
.elgg-page-body > .elgg-inner {
min-height: 360px;
}
-.elgg-classic .elgg-page-body > .elgg-inner {
- width: 990px;
- margin: 0 auto;
-}
#elgg-layout-one-column {
padding: 10px 0;
}
@@ -106,11 +109,6 @@ body {
background-repeat: repeat-y;
background-position: right top;
}
-.elgg-main {
- position: relative;
- min-height: 360px;
- padding: 10px;
-}
.elgg-aside {
padding: 20px 10px;
position: relative;
@@ -126,37 +124,31 @@ body {
width: 160px;
margin: 0 10px 0 0;
}
-
+.elgg-main {
+ position: relative;
+ min-height: 360px;
+ padding: 10px;
+}
.elgg-main .elgg-header {
padding-bottom: 3px;
border-bottom: 1px solid #CCCCCC;
margin-bottom: 10px;
}
-
<?php //@todo location-dependent styles ?>
.elgg-main .elgg-header h2 {
float: left;
max-width: 530px;
margin-right: 10px;
}
-
.elgg-main > .elgg-header a {
float: right;
}
/***** PAGE FOOTER ******/
-
.elgg-page-footer {
position: relative;
z-index: 999;
}
-.elgg-classic .elgg-page-footer > .elgg-inner {
- width: 990px;
- margin: 0 auto;
- padding: 5px 0;
- border-top: 1px solid #DEDEDE;
-}
-
<?php //@todo location-dependent styles ?>
.elgg-page-footer a {
float: left;
@@ -168,11 +160,9 @@ body {
float: left;
width: 100%;
}
-.elgg-page-footer .elgg-inner,
-.elgg-page-footer .elgg-inner a,
-.elgg-page-footer .elgg-inner p {
+.elgg-page-footer, .elgg-page-footer a {
color: #999999;
}
-.elgg-page-footer .elgg-inner a:hover {
+.elgg-page-footer a:hover {
color: #666666;
}
diff --git a/views/default/css/elements/reset.php b/views/default/css/elements/reset.php
index b5f77675e..5a88180af 100644
--- a/views/default/css/elements/reset.php
+++ b/views/default/css/elements/reset.php
@@ -28,6 +28,9 @@ table, caption, tbody, tfoot, thead, tr, th, td {
font-family: inherit;
vertical-align: baseline;
}
+body {
+ background-color: white;
+}
img {
border-width:0;
border-color:transparent;
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index c8d741342..2f76d9cbe 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 elgg-aside-module',
+ 'class' => 'elgg-tagcloud elgg-module-aside',
);
echo elgg_view('layout/objects/module', $params);
} else {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 20:04:01 +0000