diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/book/book-navigation.tpl.php | 2 | ||||
-rw-r--r-- | modules/color/color.module | 4 | ||||
-rw-r--r-- | modules/comment/comment.tpl.php | 4 | ||||
-rw-r--r-- | modules/field/field.form.inc | 2 | ||||
-rw-r--r-- | modules/forum/forum-topic-navigation.tpl.php | 2 | ||||
-rw-r--r-- | modules/help/help.admin.inc | 2 | ||||
-rw-r--r-- | modules/node/node.admin.inc | 2 | ||||
-rw-r--r-- | modules/node/node.tpl.php | 2 | ||||
-rw-r--r-- | modules/poll/poll.module | 2 | ||||
-rw-r--r-- | modules/profile/profile-listing.tpl.php | 2 | ||||
-rw-r--r-- | modules/system/defaults.css | 8 | ||||
-rw-r--r-- | modules/system/maintenance-page.tpl.php | 4 | ||||
-rw-r--r-- | modules/system/page.tpl.php | 8 | ||||
-rw-r--r-- | modules/system/system.admin.inc | 8 | ||||
-rw-r--r-- | modules/user/user.admin.inc | 2 |
15 files changed, 27 insertions, 27 deletions
diff --git a/modules/book/book-navigation.tpl.php b/modules/book/book-navigation.tpl.php index b8d624ab5..8ec9bd7e5 100644 --- a/modules/book/book-navigation.tpl.php +++ b/modules/book/book-navigation.tpl.php @@ -35,7 +35,7 @@ <?php print $tree; ?> <?php if ($has_links): ?> - <div class="page-links clear-block"> + <div class="page-links clearfix"> <?php if ($prev_url) : ?> <a href="<?php print $prev_url; ?>" class="page-previous" title="<?php print t('Go to previous page'); ?>"><?php print t('‹ ') . $prev_title; ?></a> <?php endif; ?> diff --git a/modules/color/color.module b/modules/color/color.module index b9e30f67b..395c883dc 100644 --- a/modules/color/color.module +++ b/modules/color/color.module @@ -229,11 +229,11 @@ function theme_color_scheme_form($form) { drupal_add_css($path . $info['preview_css']); $output = ''; - $output .= '<div class="color-form clear-block">'; + $output .= '<div class="color-form clearfix">'; // Color schemes $output .= drupal_render($form['scheme']); // Palette - $output .= '<div id="palette" class="clear-block">'; + $output .= '<div id="palette" class="clearfix">'; foreach (element_children($form['palette']) as $name) { $output .= drupal_render($form['palette'][$name]); } diff --git a/modules/comment/comment.tpl.php b/modules/comment/comment.tpl.php index 9802cc25d..7d8be3b03 100644 --- a/modules/comment/comment.tpl.php +++ b/modules/comment/comment.tpl.php @@ -26,7 +26,7 @@ * @see theme_comment() */ ?> -<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' ' . $status ?> clear-block"> +<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' ' . $status ?> clearfix"> <?php print $picture ?> <?php if ($comment->new): ?> @@ -42,7 +42,7 @@ <div class="content"> <?php print $content ?> <?php if ($signature): ?> - <div class="user-signature clear-block"> + <div class="user-signature clearfix"> <?php print $signature ?> </div> <?php endif; ?> diff --git a/modules/field/field.form.inc b/modules/field/field.form.inc index df3d278a4..beff3bbb4 100644 --- a/modules/field/field.form.inc +++ b/modules/field/field.form.inc @@ -205,7 +205,7 @@ function field_multiple_value_form($field, $instance, $items, &$form, &$form_sta ); // Add wrappers for the fields and 'more' button. - $form_element['#prefix'] = '<div class="clear-block" id="' . $field_name_url_str . '-add-more-wrapper"><div id="' . $field_name_url_str . '-items">'; + $form_element['#prefix'] = '<div class="clearfix" id="' . $field_name_url_str . '-add-more-wrapper"><div id="' . $field_name_url_str . '-items">'; $form_element[$field_name . '_add_more']['#prefix'] = '<div class="field-add-more">'; $form_element[$field_name . '_add_more']['#suffix'] = '</div></div></div>'; } diff --git a/modules/forum/forum-topic-navigation.tpl.php b/modules/forum/forum-topic-navigation.tpl.php index 362c2410b..cbaada544 100644 --- a/modules/forum/forum-topic-navigation.tpl.php +++ b/modules/forum/forum-topic-navigation.tpl.php @@ -24,7 +24,7 @@ */ ?> <?php if ($prev || $next): ?> - <div class="forum-topic-navigation clear-block"> + <div class="forum-topic-navigation clearfix"> <?php if ($prev): ?> <a href="<?php print $prev_url; ?>" class="topic-previous" title="<?php print t('Go to previous forum topic') ?>">‹ <?php print $prev_title ?></a> <?php endif; ?> diff --git a/modules/help/help.admin.inc b/modules/help/help.admin.inc index 5b038c729..f3f0041c3 100644 --- a/modules/help/help.admin.inc +++ b/modules/help/help.admin.inc @@ -60,7 +60,7 @@ function help_links_as_list() { // Output pretty four-column list $count = count($modules); $break = ceil($count / 4); - $output = '<div class="clear-block"><div class="help-items"><ul>'; + $output = '<div class="clearfix"><div class="help-items"><ul>'; $i = 0; foreach ($modules as $module => $name) { $output .= '<li>' . l($name, 'admin/help/' . $module) . '</li>'; diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index 9fabbf689..29005bb94 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -280,7 +280,7 @@ function theme_node_filter_form($form) { */ function theme_node_filters($form) { $output = ''; - $output .= '<ul class="clear-block">'; + $output .= '<ul class="clearfix">'; if (!empty($form['current'])) { foreach (element_children($form['current']) as $key) { $output .= '<li>' . drupal_render($form['current'][$key]) . '</li>'; diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php index a5bda033a..cfa42ce6f 100644 --- a/modules/node/node.tpl.php +++ b/modules/node/node.tpl.php @@ -49,7 +49,7 @@ * @see template_preprocess_node() */ ?> -<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clear-block"> +<div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?> clearfix"> <?php print $picture ?> diff --git a/modules/poll/poll.module b/modules/poll/poll.module index fe82f98b4..e6e2774b6 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -219,7 +219,7 @@ function poll_form(&$node, $form_state) { $form['choice_wrapper'] = array( '#tree' => FALSE, '#weight' => -4, - '#prefix' => '<div class="clear-block" id="poll-choice-wrapper">', + '#prefix' => '<div class="clearfix" id="poll-choice-wrapper">', '#suffix' => '</div>', ); diff --git a/modules/profile/profile-listing.tpl.php b/modules/profile/profile-listing.tpl.php index 07c111b5d..6b48189ad 100644 --- a/modules/profile/profile-listing.tpl.php +++ b/modules/profile/profile-listing.tpl.php @@ -36,7 +36,7 @@ * @see template_preprocess_profile_listing() */ ?> -<div class="profile clear-block"> +<div class="profile clearfix"> <?php print $picture; ?> <div class="name"> diff --git a/modules/system/defaults.css b/modules/system/defaults.css index 7e97e881b..a23131d50 100644 --- a/modules/system/defaults.css +++ b/modules/system/defaults.css @@ -31,7 +31,7 @@ th { ** Markup free clearing ** Details: http://www.positioniseverything.net/easyclearing.html */ -.clear-block:after { +.clearfix:after { content: "."; display: block; height: 0; @@ -39,15 +39,15 @@ th { visibility: hidden; } -.clear-block { +.clearfix { display: inline-block; } /* Hides from IE-mac \*/ -* html .clear-block { +* html .clearfix { height: 1%; } -.clear-block { +.clearfix { display: block; } /* End hide from IE-mac */ diff --git a/modules/system/maintenance-page.tpl.php b/modules/system/maintenance-page.tpl.php index 3a6139306..baaacd9cd 100644 --- a/modules/system/maintenance-page.tpl.php +++ b/modules/system/maintenance-page.tpl.php @@ -55,7 +55,7 @@ </div> <!-- /header --> - <div id="container" class="clear-block"> + <div id="container" class="clearfix"> <?php if (!empty($left)): ?> <div id="sidebar-left" class="column sidebar"> @@ -68,7 +68,7 @@ <div id="content"> <?php if (!empty($title)): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?> <?php if (!empty($messages)): print $messages; endif; ?> - <div id="content-content" class="clear-block"> + <div id="content-content" class="clearfix"> <?php print $content; ?> </div> <!-- /content-content --> </div> <!-- /content --> diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index da1be7eca..94d2e0a85 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -120,17 +120,17 @@ </div> <!-- /header --> - <div id="container" class="clear-block"> + <div id="container" class="clearfix"> <div id="navigation" class="menu <?php if (!empty($main_menu)) { print "withmain"; } if (!empty($secondary_menu)) { print " withsecondary"; } ?> "> <?php if (!empty($main_menu)): ?> - <div id="main-menu" class="clear-block"> + <div id="main-menu" class="clearfix"> <?php print theme('links', $main_menu, array('class' => 'links main-menu')); ?> </div> <?php endif; ?> <?php if (!empty($secondary_menu)): ?> - <div id="secondary-menu" class="clear-block"> + <div id="secondary-menu" class="clearfix"> <?php print theme('links', $secondary_menu, array('class' => 'links secondary-menu')); ?> </div> <?php endif; ?> @@ -151,7 +151,7 @@ <?php if (!empty($tabs)): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?> <?php if (!empty($messages)): print $messages; endif; ?> <?php if (!empty($help)): print $help; endif; ?> - <div id="content-content" class="clear-block"> + <div id="content-content" class="clearfix"> <?php print $content; ?> </div> <!-- /content-content --> <?php print $feed_icons; ?> diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index f2aa0403a..734f469f6 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1983,11 +1983,11 @@ function theme_admin_page($blocks) { } } - $output = '<div class="admin clear-block">'; + $output = '<div class="admin clearfix">'; $output .= theme('system_compact_link'); foreach ($container as $id => $data) { - $output .= '<div class="' . $id . ' clear-block">'; + $output .= '<div class="' . $id . ' clearfix">'; $output .= $data; $output .= '</div>'; } @@ -2031,9 +2031,9 @@ function theme_system_admin_by_module($menu_items) { } } - $output = '<div class="admin clear-block">'; + $output = '<div class="admin clearfix">'; foreach ($container as $id => $data) { - $output .= '<div class="' . $id . ' clear-block">'; + $output .= '<div class="' . $id . ' clearfix">'; $output .= $data; $output .= '</div>'; } diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc index b0e8d50a5..ca4d4fdeb 100644 --- a/modules/user/user.admin.inc +++ b/modules/user/user.admin.inc @@ -836,7 +836,7 @@ function theme_user_filter_form($form) { * @ingroup themeable */ function theme_user_filters($form) { - $output = '<ul class="clear-block">'; + $output = '<ul class="clearfix">'; if (!empty($form['current'])) { foreach (element_children($form['current']) as $key) { $output .= '<li>' . drupal_render($form['current'][$key]) . '</li>'; |