diff --git a/core/includes/form.inc b/core/includes/form.inc index 4689711..dcf6b9d 100644 --- a/core/includes/form.inc +++ b/core/includes/form.inc @@ -4185,13 +4185,13 @@ function form_pre_render_button($element) { $element['#attributes']['class'][] = 'button'; if (!empty($element['#button_type'])) { - $element['#attributes']['class'][] = 'button-' . $element['#button_type']; + $element['#attributes']['class'][] = 'button--' . $element['#button_type']; } // @todo Various JavaScript depends on this button class. $element['#attributes']['class'][] = 'form-submit'; if (!empty($element['#attributes']['disabled'])) { - $element['#attributes']['class'][] = 'form-button-disabled'; + $element['#attributes']['class'][] = 'is-disabled'; } return $element; @@ -4222,14 +4222,14 @@ function form_pre_render_image_button($element) { $element['#attributes']['class'][] = 'image-button'; if (!empty($element['#button_type'])) { - $element['#attributes']['class'][] = 'image-button-' . $element['#button_type']; + $element['#attributes']['class'][] = 'image-button--' . $element['#button_type']; } // @todo Various JavaScript depends on this button class. $element['#attributes']['class'][] = 'form-submit'; - if (!empty($element['#attributes']['disabled'])) { - $element['#attributes']['class'][] = 'image-button-disabled'; - } + // if (!empty($element['#attributes']['disabled'])) { + // $element['#attributes']['class'][] = 'image-button-disabled'; + // } return $element; } diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 1ecd819..40160b2 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -1092,6 +1092,7 @@ function install_settings_form($form, &$form_state, &$install_state) { $form['actions'] = array('#type' => 'actions'); $form['actions']['save'] = array( '#type' => 'submit', + '#button_type' => 'primary', '#value' => t('Save and continue'), '#limit_validation_errors' => array( array('driver'), @@ -1384,6 +1385,7 @@ function install_select_profile_form($form, &$form_state, $install_state) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', + '#button_type' => 'primary', '#value' => t('Save and continue'), ); return $form; @@ -1580,6 +1582,7 @@ function install_select_language_form($form, &$form_state, $files = array()) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', + '#button_type' => 'primary', '#value' => t('Save and continue'), ); return $form; @@ -2468,6 +2471,7 @@ function _install_configure_form($form, &$form_state, &$install_state) { $form['actions'] = array('#type' => 'actions'); $form['actions']['submit'] = array( '#type' => 'submit', + '#button_type' => 'danger', '#value' => t('Save and continue'), '#weight' => 15, ); diff --git a/core/themes/seven/css/components/buttons.css b/core/themes/seven/css/components/buttons.css new file mode 100644 index 0000000..3e387e6 --- /dev/null +++ b/core/themes/seven/css/components/buttons.css @@ -0,0 +1,71 @@ +/** + * @file + * Structural styles for Seven’s UI buttons + * + * Apply these classes to any element (,