diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 3313f5ac6036a820d8f546ff1b6840e00d3c9eaa..aa769a4b9580ccccef378565a2b1df951f6e6d1e 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1475,12 +1475,6 @@ function system_site_information_settings() { '#type' => 'fieldset', '#title' => t('Front page'), ); - $form['front_page']['default_nodes_main'] = array( - '#type' => 'select', '#title' => t('Number of posts on front page'), - '#default_value' => variable_get('default_nodes_main', 10), - '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), - '#description' => t('The maximum number of posts displayed on overview pages such as the front page.') - ); $form['front_page']['site_frontpage'] = array( '#type' => 'textfield', '#title' => t('Default front page'), @@ -1489,6 +1483,13 @@ function system_site_information_settings() { '#description' => t('Optionally, specify a relative URL to display as the front page. Leave blank to display the default content feed.'), '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='), ); + $form['front_page']['default_nodes_main'] = array( + '#type' => 'select', '#title' => t('Number of posts on front page'), + '#default_value' => variable_get('default_nodes_main', 10), + '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30)), + '#description' => t('The maximum number of posts displayed on overview pages such as the front page.'), + '#access' => (variable_get('site_frontpage')=='node'), + ); $form['error_page'] = array( '#type' => 'fieldset', '#title' => t('Error pages'), @@ -3130,4 +3131,4 @@ function system_action_delete_orphans_post($orphaned) { function system_actions_remove_orphans() { actions_synchronize(TRUE); drupal_goto('admin/config/system/actions/manage'); -} +} \ No newline at end of file diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css index 39e78051a1af3136955c97a5d1eb69b2972b0c29..614d32a1ed25d19335ad4809a49a86af8d48f6b0 100644 --- a/themes/bartik/css/style.css +++ b/themes/bartik/css/style.css @@ -459,10 +459,6 @@ h1#site-name { #main-menu { clear: both; } -#main-menu-links a { - color: #d9d9d9; - padding: 0.6em 1em 0.4em; -} #main-menu-links { font-size: 0.929em; margin: 0;