diff options
| -rw-r--r-- | install/ElggInstaller.php | 2 | ||||
| -rw-r--r-- | install/css/install.css | 38 | ||||
| -rw-r--r-- | views/installation/install/forms/template.php | 2 | ||||
| -rw-r--r-- | views/installation/install/nav.php | 2 | ||||
| -rw-r--r-- | views/installation/install/pages/complete.php | 2 | ||||
| -rw-r--r-- | views/installation/page_shells/default.php | 2 |
6 files changed, 26 insertions, 22 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index df8965bf0..7042f9811 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -733,7 +733,7 @@ class ElggInstaller { 'database.php', 'actions.php', 'admin.php', 'annotations.php', - 'calendar.php', 'configuration.php', 'cron.php', 'entities.php', + 'calendar.php', 'cron.php', 'entities.php', 'extender.php', 'filestore.php', 'group.php', 'location.php', 'mb_wrapper.php', 'memcache.php', 'metadata.php', 'metastrings.php', diff --git a/install/css/install.css b/install/css/install.css index fede97bef..8ce4dfb38 100644 --- a/install/css/install.css +++ b/install/css/install.css @@ -69,7 +69,7 @@ ul { line-height: 0px; } -#elgg_wrapper { +#elgg-wrapper { background: white; width: 800px; margin: auto; @@ -78,21 +78,21 @@ ul { border-right: 1px solid #666666; border-bottom: 1px solid #666666; } -#elgg_header { +#elgg-header { margin: 10px 10px; } -#elgg_sidebar { +#elgg-sidebar { float: left; width: 250px; } -#elgg_content { +#elgg-content { float: left; width: 550px; min-height: 320px; padding-bottom: 60px; position: relative; } -#elgg_footer { +#elgg-footer { width: 800px; height: 20px; clear: both; @@ -101,28 +101,28 @@ ul { margin-bottom: 40px; } -.install_nav { +.install-nav { width: 100%; text-align: right; position: absolute; bottom: 0px; } -#elgg_footer a { +#elgg-footer a { color: white; } -#elgg_footer li { +#elgg-footer li { float: left; list-style: none; margin-right: 20px; } -#elgg_sidebar ol { +#elgg-sidebar ol { padding-left: 30px; } -#elgg_sidebar li { +#elgg-sidebar li { font-size: 1.2em; margin-bottom: 5px; } @@ -155,8 +155,8 @@ input[type="password"] { color:#666666; width:566px; } -.database_settings input[type="text"], -.database_settings input[type="password"] { +.database-settings input[type="text"], +.database-settings input[type="password"] { width:220px; } textarea { @@ -199,7 +199,11 @@ select { padding: 5px; } -.install_nav a { +.install-help { + font-size: 90%; +} + +.install-nav a { font-family: Arial, Helvetica, sans-serif; font-size: 16px; font-weight: bold; @@ -214,18 +218,18 @@ select { float: right; } -.install_nav a:hover { +.install-nav a:hover { text-decoration: none; background: #0054a7; border: 4px solid #0054a7; } -.install_nav .disabled, .install_nav .disabled:hover { +.install-nav .disabled, .install-nav .disabled:hover { background: #555555; border-color: #555555; cursor: default; } -#elgg_system_message { +#elgg-system-message { padding: 3px 10px 3px 10px; margin-bottom: 20px; } @@ -240,7 +244,7 @@ select { background: #F7DAD8; } -#elgg_content li { +#elgg-content li { margin-top: 5px; padding: 5px; } diff --git a/views/installation/install/forms/template.php b/views/installation/install/forms/template.php index c3f70d768..626bfc6c8 100644 --- a/views/installation/install/forms/template.php +++ b/views/installation/install/forms/template.php @@ -18,7 +18,7 @@ foreach ($variables as $field => $params) { $form_body .= '<p>'; $form_body .= "<label>$label</label>"; $form_body .= elgg_view("input/{$params['type']}", $params); - $form_body .= "<span class=\"install_help\">$help</span>"; + $form_body .= "<span class=\"install-help\">$help</span>"; $form_body .= '</p>'; } diff --git a/views/installation/install/nav.php b/views/installation/install/nav.php index 0758653a4..1ecc07d1c 100644 --- a/views/installation/install/nav.php +++ b/views/installation/install/nav.php @@ -27,7 +27,7 @@ if (isset($vars['advance']) && !$vars['advance']) { echo <<<___END -<div class="install_nav"> +<div class="install-nav"> $next $refresh </div> diff --git a/views/installation/install/pages/complete.php b/views/installation/install/pages/complete.php index a63f86330..0c9821fc2 100644 --- a/views/installation/install/pages/complete.php +++ b/views/installation/install/pages/complete.php @@ -7,7 +7,7 @@ echo autop(elgg_echo('install:complete:instructions')); ?> -<div class="install_nav"> +<div class="install-nav"> <?php $url = elgg_get_site_url() . $vars['destination']; $text = elgg_echo('install:complete:gotosite'); diff --git a/views/installation/page_shells/default.php b/views/installation/page_shells/default.php index 27a7c2fe2..fbc5ccbf2 100644 --- a/views/installation/page_shells/default.php +++ b/views/installation/page_shells/default.php @@ -31,7 +31,7 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE); <link rel="stylesheet" href="<?php echo elgg_get_site_url(); ?>install/css/install.css" type="text/css" /> </head> <body> - <div id="elgg_wrapper"> + <div id="elgg-wrapper"> <div id="elgg-header"> <?php echo elgg_view('install/header', $vars); ?> </div> |