From fd23d7ea58d6b824f2e35e68d39cb485fe223089 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 26 Apr 2011 19:58:46 +0000 Subject: Fixes #3388: .elgg-icon is now middle-aligned by default git-svn-id: http://code.elgg.org/elgg/trunk@9028 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/core.php | 5 ++++- views/default/css/elements/navigation.php | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'views/default/css/elements') diff --git a/views/default/css/elements/core.php b/views/default/css/elements/core.php index c5d99512f..61dcdb1fe 100644 --- a/views/default/css/elements/core.php +++ b/views/default/css/elements/core.php @@ -105,4 +105,7 @@ /* Inline-block: IE 6, 7 */ zoom: 1; *display: inline; -} \ No newline at end of file +} + +/* Looks much better when middle-aligned with surrounding text */ +.elgg-icon {vertical-align:middle} \ No newline at end of file diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index 25b45bbee..e4709cb27 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -135,10 +135,6 @@ margin-top: 1px; } -.elgg-menu-topbar > li > a > span { - vertical-align: middle; -} - .elgg-menu-topbar > li > a:hover { color: #4690D6; text-decoration: none; -- cgit v1.2.3 From 56ba85a9571c854c6054ad70b88dc15660a053fa Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 26 Apr 2011 20:17:02 +0000 Subject: Fixes #3380: .elgg-icon-user states are now consistent with other elgg-icons git-svn-id: http://code.elgg.org/elgg/trunk@9029 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/icons.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'views/default/css/elements') diff --git a/views/default/css/elements/icons.php b/views/default/css/elements/icons.php index 08948df50..1bc056072 100644 --- a/views/default/css/elements/icons.php +++ b/views/default/css/elements/icons.php @@ -224,10 +224,10 @@ .elgg-icon-undo { background-position: 0 -1206px; } -.elgg-icon-user:hover { +.elgg-icon-user { background-position: 0 -1224px; } -.elgg-icon-user { +.elgg-icon-user:hover { background-position: 0 -1242px; } .elgg-icon-users:hover { -- cgit v1.2.3 From 3f293fe7b5deae93bc90e8f9f30a6b5ae221ea2e Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 20 May 2011 02:51:33 +0000 Subject: Refs #3340 pulls dashboard out as plugin git-svn-id: http://code.elgg.org/elgg/trunk@9108 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/users.php | 13 -------- mod/dashboard/manifest.xml | 16 ++++++++++ mod/dashboard/start.php | 42 +++++++++++++++++++++++++ mod/dashboard/views/default/dashboard/blurb.php | 17 ++++++++++ pages/dashboard.php | 29 ----------------- views/default/core/dashboard/blurb.php | 17 ---------- views/default/css/elements/misc.php | 4 --- 7 files changed, 75 insertions(+), 63 deletions(-) create mode 100644 mod/dashboard/manifest.xml create mode 100644 mod/dashboard/start.php create mode 100644 mod/dashboard/views/default/dashboard/blurb.php delete mode 100644 pages/dashboard.php delete mode 100644 views/default/core/dashboard/blurb.php (limited to 'views/default/css/elements') diff --git a/engine/lib/users.php b/engine/lib/users.php index 43b6980b2..a7765a5e5 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1128,18 +1128,6 @@ function collections_page_handler($page_elements) { } } -/** - * Page handler for dashboard - * - * @param array $page_elements Page elements - * - * @return void - */ -function dashboard_page_handler($page_elements) { - require_once(dirname(dirname(dirname(__FILE__))) . "/pages/dashboard.php"); -} - - /** * Page handler for registration * @@ -1525,7 +1513,6 @@ function users_init() { elgg_register_page_handler('friends', 'friends_page_handler'); elgg_register_page_handler('friendsof', 'friends_of_page_handler'); - elgg_register_page_handler('dashboard', 'dashboard_page_handler'); elgg_register_page_handler('register', 'registration_page_handler'); elgg_register_page_handler('resetpassword', 'elgg_user_resetpassword_page_handler'); elgg_register_page_handler('login', 'elgg_user_login_page_handler'); diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml new file mode 100644 index 000000000..b5e9cff2e --- /dev/null +++ b/mod/dashboard/manifest.xml @@ -0,0 +1,16 @@ + + + User Dashboard + Core developers + 1.8 + bundled + A widget-based dashboard for your users + http://www.elgg.org/ + See COPYRIGHT.txt + GNU Public License version 2 + + elgg_version + 2010030101 + + advanced + \ No newline at end of file diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php new file mode 100644 index 000000000..4fa048b3d --- /dev/null +++ b/mod/dashboard/start.php @@ -0,0 +1,42 @@ + 'dashboard', + 'href' => 'dashboard', + 'text' => elgg_view_icon('home') . elgg_echo('dashboard'), + 'priority' => 450, + 'section' => 'alt', + )); +} + +function dashboard_page_handler() { + // Ensure that only logged-in users can see this page + gatekeeper(); + + // Set context and title + elgg_set_context('dashboard'); + elgg_set_page_owner_guid(elgg_get_logged_in_user_guid()); + $title = elgg_echo('dashboard'); + + // wrap intro message in a div + $intro_message = elgg_view('dashboard/blurb'); + + $params = array( + 'content' => $intro_message, + 'num_columns' => 3, + 'show_access' => false, + ); + $widgets = elgg_view_layout('widgets', $params); + + $body = elgg_view_layout('one_column', array('content' => $widgets)); + + echo elgg_view_page($title, $body); +} diff --git a/mod/dashboard/views/default/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php new file mode 100644 index 000000000..202be1dc5 --- /dev/null +++ b/mod/dashboard/views/default/dashboard/blurb.php @@ -0,0 +1,17 @@ + + +
+ 'dashboard-info', + 'class' => 'elgg-inner elgg-border-plain pam mhs mbl mtn', + 'value' => elgg_echo("dashboard:nowidgets"), + )); + +?> +
\ No newline at end of file diff --git a/pages/dashboard.php b/pages/dashboard.php deleted file mode 100644 index 31cc9087d..000000000 --- a/pages/dashboard.php +++ /dev/null @@ -1,29 +0,0 @@ - $intro_message, - 'num_columns' => 3, - 'show_access' => false, -); -$widgets = elgg_view_layout('widgets', $params); - -$body = elgg_view_layout('one_column', array('content' => $widgets)); - -echo elgg_view_page($title, $body); \ No newline at end of file diff --git a/views/default/core/dashboard/blurb.php b/views/default/core/dashboard/blurb.php deleted file mode 100644 index 0c4e3947a..000000000 --- a/views/default/core/dashboard/blurb.php +++ /dev/null @@ -1,17 +0,0 @@ - - -
- 'dashboard-info', - 'class' => 'elgg-inner pas mhs mbl', - 'value' => elgg_echo("dashboard:nowidgets"), - )); - -?> -
\ No newline at end of file diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index c8ba4f735..ebac2b91f 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -8,10 +8,6 @@ z-index: 100; } -#dashboard-info .elgg-inner { - border: 2px solid #dedede; -} - /* *************************************** AVATAR UPLOADING & CROPPING *************************************** */ -- cgit v1.2.3 From 5c1f26521ed42546d23f3968226fcb30e9f0a7db Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 13:12:14 +0000 Subject: Refs #3407 adds a footer for forms git-svn-id: http://code.elgg.org/elgg/trunk@9167 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/blog/views/default/forms/blog/save.php | 12 +++++++----- mod/groups/actions/groups/delete.php | 7 ++++++- mod/groups/views/default/forms/groups/delete.php | 17 ----------------- mod/groups/views/default/forms/groups/edit.php | 12 +++++++++++- mod/groups/views/default/forms/groups/invite.php | 2 ++ mod/groups/views/default/groups/edit.php | 6 ------ .../views/default/forms/invitefriends/invite.php | 2 ++ .../notifications/subscriptions/forminternals.php | 2 +- views/default/css/elements/forms.php | 9 +++++++++ views/default/forms/avatar/crop.php | 6 +++--- views/default/forms/avatar/upload.php | 5 +++-- views/default/forms/comments/add.php | 14 +++++++++----- views/default/forms/usersettings/save.php | 2 +- 13 files changed, 54 insertions(+), 42 deletions(-) delete mode 100644 mod/groups/views/default/forms/groups/delete.php (limited to 'views/default/css/elements') diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php index b2d20579f..cf5a4032e 100644 --- a/mod/blog/views/default/forms/blog/save.php +++ b/mod/blog/views/default/forms/blog/save.php @@ -135,13 +135,15 @@ $body_input $categories_input -
+
+
$save_status $saved -
+
-$guid_input -$container_guid_input + $guid_input + $container_guid_input -$action_buttons + $action_buttons +
___HTML; diff --git a/mod/groups/actions/groups/delete.php b/mod/groups/actions/groups/delete.php index 932d03355..2ff6c339c 100644 --- a/mod/groups/actions/groups/delete.php +++ b/mod/groups/actions/groups/delete.php @@ -3,7 +3,12 @@ * Delete a group */ -$guid = (int) get_input('group_guid'); +$guid = (int) get_input('guid'); +if (!$guid) { + // backward compatible + elgg_deprecated_notice("Use 'guid' for group delete action", 1.8); + $guid = (int)get_input('group_guid'); +} $entity = get_entity($guid); if (!$entity->canEdit()) { diff --git a/mod/groups/views/default/forms/groups/delete.php b/mod/groups/views/default/forms/groups/delete.php deleted file mode 100644 index 28c2eb9bf..000000000 --- a/mod/groups/views/default/forms/groups/delete.php +++ /dev/null @@ -1,17 +0,0 @@ - 'group_guid', - 'value' => $vars['entity']->getGUID(), -)); - -echo elgg_view('input/submit', array( - 'class' => "elgg-button elgg-button-delete right", - 'value' => elgg_echo('groups:delete'), - 'onclick' => "return confirm('$warning');", -)); diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php index 1a4e95513..b67134c63 100644 --- a/mod/groups/views/default/forms/groups/edit.php +++ b/mod/groups/views/default/forms/groups/edit.php @@ -126,7 +126,7 @@ if ($tools) { } } ?> -
+
elgg_echo('save'))); + +if (isset($vars['entity'])) { + $delete_url = 'action/groups/delete?guid=' . $vars['entity']->getGUID(); + echo elgg_view('output/confirmlink', array( + 'text' => elgg_echo('groups:delete'), + 'href' => $delete_url, + 'confirm' => elgg_echo('groups:deletewarning'), + 'class' => 'elgg-button elgg-button-delete float-alt', + )); +} ?>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php index a49bbe2fb..83139c2ee 100644 --- a/mod/groups/views/default/forms/groups/invite.php +++ b/mod/groups/views/default/forms/groups/invite.php @@ -12,9 +12,11 @@ $friends = elgg_get_logged_in_user_entity()->getFriends('', 0); if ($friends) { echo elgg_view('input/friendspicker', array('entities' => $friends, 'name' => 'user_guid', 'highlight' => 'all')); + echo '
'; echo elgg_view('input/hidden', array('name' => 'forward_url', 'value' => $forward_url)); echo elgg_view('input/hidden', array('name' => 'group_guid', 'value' => $group->guid)); echo elgg_view('input/submit', array('value' => elgg_echo('invite'))); + echo '
'; } else { echo elgg_echo('groups:nofriendsatall'); } \ No newline at end of file diff --git a/mod/groups/views/default/groups/edit.php b/mod/groups/views/default/groups/edit.php index 2434bd14f..5076cc49a 100644 --- a/mod/groups/views/default/groups/edit.php +++ b/mod/groups/views/default/groups/edit.php @@ -10,9 +10,3 @@ $entity = elgg_extract('entity', $vars, null); $form_vars = array('enctype' => 'multipart/form-data'); $body_vars = array('entity' => $entity); echo elgg_view_form('groups/edit', $form_vars, $body_vars); - -if ($entity) { - echo '
'; - echo elgg_view_form('groups/delete', array(), array('entity' => $entity)); - echo '
'; -} diff --git a/mod/invitefriends/views/default/forms/invitefriends/invite.php b/mod/invitefriends/views/default/forms/invitefriends/invite.php index 2597598de..5af8b5da0 100644 --- a/mod/invitefriends/views/default/forms/invitefriends/invite.php +++ b/mod/invitefriends/views/default/forms/invitefriends/invite.php @@ -27,7 +27,9 @@ if (elgg_get_config('allow_registration')) {
HTML; + echo '
'; echo elgg_view('input/submit', array('value' => elgg_echo('send'))); + echo '
'; } else { echo elgg_echo('invitefriends:registration_disabled'); } diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php index d286d37a3..b059db487 100644 --- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php +++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php @@ -325,7 +325,7 @@ if (!isset($vars['replacement'])) { ?> -
+
elgg_echo('save'), diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 0230cbc54..4e302dff1 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -16,6 +16,12 @@ fieldset > div { fieldset > div:last-child { margin-bottom: 0; } +.elgg-form-footer { +} +.elgg-form-footer-alt { + border-top: 1px solid #CCC; + padding: 10px 0; +} label { font-weight: bold; @@ -76,6 +82,9 @@ input[type="radio"] { /* *************************************** FRIENDS PICKER *************************************** */ +.friends-picker-main-wrapper { + margin-bottom: 15px; +} .friends-picker-container h3 { font-size:4em !important; text-align: left; diff --git a/views/default/forms/avatar/crop.php b/views/default/forms/avatar/crop.php index 857a54e1f..3deec66bd 100644 --- a/views/default/forms/avatar/crop.php +++ b/views/default/forms/avatar/crop.php @@ -8,11 +8,10 @@ $master_image = $vars['entity']->getIcon('master'); ?> -
+
<?php echo elgg_echo('avatar'); ?>
- -
+
'guid', 'value' => $vars['entity' echo elgg_view('input/submit', array('value' => elgg_echo('avatar:create'))); ?> +
diff --git a/views/default/forms/avatar/upload.php b/views/default/forms/avatar/upload.php index 08db1f7e0..b099b8c4c 100644 --- a/views/default/forms/avatar/upload.php +++ b/views/default/forms/avatar/upload.php @@ -5,11 +5,12 @@ * @uses $vars['entity'] */ -echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid)); ?>

'avatar')); ?> -
+
+
+ 'guid', 'value' => $vars['entity']->guid)); ?> elgg_echo('upload'))); ?>
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php index 6d674838a..40e574338 100644 --- a/views/default/forms/comments/add.php +++ b/views/default/forms/comments/add.php @@ -18,16 +18,20 @@ if (isset($vars['entity']) && elgg_is_logged_in()) { echo elgg_view('input/submit', array('value' => elgg_echo('comment'))); } else { ?> -
- - 'generic_comment')); ?> -
+
+ + 'generic_comment')); ?> +
+
elgg_echo("generic_comments:post"))); +?> +
+ 'entity_guid', 'value' => $vars['entity']->getGUID() )); -} \ No newline at end of file +} diff --git a/views/default/forms/usersettings/save.php b/views/default/forms/usersettings/save.php index 62593e699..35871144b 100644 --- a/views/default/forms/usersettings/save.php +++ b/views/default/forms/usersettings/save.php @@ -1,7 +1,7 @@ '; +$form_body .= '
'; $form_body .= elgg_view('input/submit', array('value' => elgg_echo('save'))); $form_body .= '
'; -- cgit v1.2.3 From 2ae5e96cc9d928a8d13c01d5bf152b99d18aec17 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 16:51:51 +0000 Subject: Fixes #3556 limiting width of account text boxes git-svn-id: http://code.elgg.org/elgg/trunk@9177 36083f99-b078-4883-b0ff-0f9b5a30f544 --- pages/account/forgotten_password.php | 4 +++- pages/account/register.php | 7 ++++++- pages/account/reset_password.php | 2 +- views/default/css/elements/forms.php | 5 +++++ views/default/forms/user/requestnewpassword.php | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) (limited to 'views/default/css/elements') diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php index 7679eaa55..bf6ef87e0 100644 --- a/pages/account/forgotten_password.php +++ b/pages/account/forgotten_password.php @@ -13,7 +13,9 @@ if (elgg_is_logged_in()) { $title = elgg_echo("user:password:lost"); $content = elgg_view_title($title); -$content .= elgg_view_form('user/requestnewpassword'); +$content .= elgg_view_form('user/requestnewpassword', array( + 'class' => 'elgg-form-account', +)); $body = elgg_view_layout("one_column", array('content' => $content)); diff --git a/pages/account/register.php b/pages/account/register.php index 58544ef49..5eb2b4001 100644 --- a/pages/account/register.php +++ b/pages/account/register.php @@ -35,7 +35,10 @@ $register_url = elgg_get_site_url() . 'action/register'; if (elgg_get_config('https_login')) { $register_url = str_replace("http:", "https:", $register_url); } -$form_params = array('action' => $register_url); +$form_params = array( + 'action' => $register_url, + 'class' => 'elgg-form-account float', +); $body_params = array( 'friend_guid' => $friend_guid, @@ -43,6 +46,8 @@ $body_params = array( ); $content .= elgg_view_form('register', $form_params, $body_params); +$content .= elgg_view('help/register'); + $body = elgg_view_layout("one_column", array('content' => $content)); echo elgg_view_page($title, $body); diff --git a/pages/account/reset_password.php b/pages/account/reset_password.php index 019ec3add..6515bfc5d 100644 --- a/pages/account/reset_password.php +++ b/pages/account/reset_password.php @@ -25,7 +25,7 @@ $params = array( 'guid' => $user_guid, 'code' => $code, ); -$form = elgg_view_form('user/passwordreset', array(), $params); +$form = elgg_view_form('user/passwordreset', array('class' => 'elgg-form-account'), $params); $title = elgg_echo('resetpassword'); $content = elgg_view_title(elgg_echo('resetpassword')) . $form; diff --git a/views/default/css/elements/forms.php b/views/default/css/elements/forms.php index 4e302dff1..af7b2be19 100644 --- a/views/default/css/elements/forms.php +++ b/views/default/css/elements/forms.php @@ -79,6 +79,11 @@ input[type="radio"] { padding-right: 10px; } +.elgg-form-account input[type="text"], +.elgg-form-account input[type="password"] { + width: 300px; +} + /* *************************************** FRIENDS PICKER *************************************** */ diff --git a/views/default/forms/user/requestnewpassword.php b/views/default/forms/user/requestnewpassword.php index f2f276417..970938327 100644 --- a/views/default/forms/user/requestnewpassword.php +++ b/views/default/forms/user/requestnewpassword.php @@ -11,7 +11,7 @@
- +
'username')); ?>
-- cgit v1.2.3 From e92e934d81ebf561b29d440a720f76345e550b4b Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 17:11:25 +0000 Subject: made the widget edit area slightly darker to provide contrast with content area git-svn-id: http://code.elgg.org/elgg/trunk@9179 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/modules.php | 1 + 1 file changed, 1 insertion(+) (limited to 'views/default/css/elements') diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index a5b907ddc..c4808478b 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -197,6 +197,7 @@ a.elgg-widget-edit-button { width: 96%; padding: 2%; border-bottom: 2px solid #dedede; + background-color: #f9f9f9; } .elgg-widget-content { padding: 10px; -- cgit v1.2.3 From 4d11e2d761919130aa572203e303baa0d8fe00d8 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 20:06:30 +0000 Subject: topbar icons were pushing the site title. Forced the elgg logo and avatar to behave. Adding overflow hidden to the topbar div would prevent future problems but cause issues for those adding drop down menus git-svn-id: http://code.elgg.org/elgg/trunk@9183 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 3 ++- engine/lib/users.php | 1 + views/default/css/elements/navigation.php | 13 ++++++++++++- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'views/default/css/elements') diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 170750849..08f3d5e7c 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2002,8 +2002,9 @@ function elgg_init() { elgg_register_menu_item('topbar', array( 'name' => 'elgg_logo', 'href' => 'http://www.elgg.org/', - 'text' => "\"Elgg", + 'text' => "\"Elgg", 'priority' => 1, + 'link_class' => 'elgg-topbar-logo', )); // Sets a blacklist of words in the current language. diff --git a/engine/lib/users.php b/engine/lib/users.php index 8333888a2..59bfa1259 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1453,6 +1453,7 @@ function users_pagesetup() { 'href' => $user->getURL(), 'text' => "\"$user-name\" title=\"$title\" class=\"$class\" />", 'priority' => 100, + 'link_class' => 'elgg-topbar-avatar', )); elgg_register_menu_item('topbar', array( diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index e4709cb27..ff27acd4b 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -130,7 +130,7 @@ } .elgg-menu-topbar > li > a { - padding: 2px 15px; + padding: 2px 15px 0; color: #eee; margin-top: 1px; } @@ -144,6 +144,17 @@ float: right; } +.elgg-menu-topbar > li > a.elgg-topbar-logo { + margin-top: 0; + width: 38px; + height: 20px; +} + +.elgg-menu-topbar > li > a.elgg-topbar-avatar { + width: 18px; + height: 18px; +} + /* *************************************** SITE MENU *************************************** */ -- cgit v1.2.3 From fd7f5c9e22c0d129d786bbefb7bde6bd09ef4bb4 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 11 Jun 2011 20:22:47 +0000 Subject: moved the elgg logo to the left by 10 pixels git-svn-id: http://code.elgg.org/elgg/trunk@9184 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/navigation.php | 1 + 1 file changed, 1 insertion(+) (limited to 'views/default/css/elements') diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php index ff27acd4b..d930d3a89 100644 --- a/views/default/css/elements/navigation.php +++ b/views/default/css/elements/navigation.php @@ -146,6 +146,7 @@ .elgg-menu-topbar > li > a.elgg-topbar-logo { margin-top: 0; + padding-left: 5px; width: 38px; height: 20px; } -- cgit v1.2.3 From 282969c0901fa0a8644cc5c59fe19c6500178d29 Mon Sep 17 00:00:00 2001 From: cash Date: Sun, 12 Jun 2011 17:52:53 +0000 Subject: Fixes #3409 fixed small viewport issue with default theme git-svn-id: http://code.elgg.org/elgg/trunk@9190 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/css/elements/layout.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'views/default/css/elements') diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index d52938aee..a5854f8c1 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -15,6 +15,10 @@ PAGE LAYOUT *************************************** */ /***** DEFAULT LAYOUT ******/ + +.elgg-page-default { + min-width: 998px; +} .elgg-page-default .elgg-page-header > .elgg-inner { width: 990px; margin: 0 auto; @@ -35,7 +39,6 @@ .elgg-page-topbar { background: #333333 url(_graphics/toptoolbar_background.gif) repeat-x top left; border-bottom: 1px solid #000000; - min-width: 998px; position: relative; height: 24px; z-index: 9000; -- cgit v1.2.3