From fb7347bc9d260193f00619fed4b9681670595dc4 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 18 Feb 2009 14:28:25 +0000
Subject: [PATCH] #371231 by JohnAlbin and EclipseGC: Rename clear-block CSS
class to clearfix, which is the lingo that designers use for it.
---
modules/book/book-navigation.tpl.php | 2 +-
modules/color/color.module | 4 ++--
modules/comment/comment.tpl.php | 4 ++--
modules/field/field.form.inc | 2 +-
modules/forum/forum-topic-navigation.tpl.php | 2 +-
modules/help/help.admin.inc | 2 +-
modules/node/node.admin.inc | 2 +-
modules/node/node.tpl.php | 2 +-
modules/poll/poll.module | 2 +-
modules/profile/profile-listing.tpl.php | 2 +-
modules/system/defaults.css | 8 ++++----
modules/system/maintenance-page.tpl.php | 4 ++--
modules/system/page.tpl.php | 8 ++++----
modules/system/system.admin.inc | 8 ++++----
modules/user/user.admin.inc | 2 +-
themes/bluemarine/comment.tpl.php | 2 +-
themes/bluemarine/page.tpl.php | 2 +-
themes/chameleon/chameleon.theme | 2 +-
themes/garland/block.tpl.php | 2 +-
themes/garland/comment.tpl.php | 4 ++--
themes/garland/maintenance-page.tpl.php | 6 +++---
themes/garland/node.tpl.php | 4 ++--
themes/garland/page.tpl.php | 8 ++++----
themes/garland/style.css | 2 +-
themes/pushbutton/comment.tpl.php | 2 +-
25 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/modules/book/book-navigation.tpl.php b/modules/book/book-navigation.tpl.php
index b8d624ab5339..8ec9bd7e5c4b 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 b9e30f67b7e4..395c883dc9f1 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 9802cc25d472..7d8be3b03643 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 df3d278a4653..beff3bbb4036 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 362c2410b2f5..cbaada544b85 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 5b038c729f42..f3f0041c3ddb 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 9fabbf689dc7..29005bb94ab2 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 a5bda033a1db..cfa42ce6f968 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 fe82f98b4112..e6e2774b6a6b 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 07c111b5d7f1..6b48189ad532 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 7e97e881bd00..a23131d50d4e 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 3a6139306068..baaacd9cd3c3 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 da1be7eca5ac..94d2e0a85ab4 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 f2aa0403a109..734f469f6320 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 b0e8d50a5f72..ca4d4fdeb2d1 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>';
diff --git a/themes/bluemarine/comment.tpl.php b/themes/bluemarine/comment.tpl.php
index 013b0afa0fa6..db778c819690 100644
--- a/themes/bluemarine/comment.tpl.php
+++ b/themes/bluemarine/comment.tpl.php
@@ -10,7 +10,7 @@
<div class="content">
<?php print $content; ?>
<?php if ($signature): ?>
- <div class="clear-block">
+ <div class="clearfix">
<div>—</div>
<?php print $signature ?>
</div>
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index 3336e183f9fc..5aef63aac13b 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -12,7 +12,7 @@
</head>
<body class="<?php print $body_classes; ?>">
- <div id="header" class="clear-block">
+ <div id="header" class="clearfix">
<?php if ($search_box) { ?><div class="search-box"><?php print $search_box ?></div><?php }; ?>
<?php if ($logo) { ?><a class="logo" href="<?php print $front_page ?>" title="<?php print t('Home') ?>"><img src="<?php print $logo ?>" alt="<?php print t('Home') ?>" /></a><?php } ?>
<?php if ($site_name) { ?><h1 class='site-name'><a href="<?php print $front_page ?>" title="<?php print t('Home') ?>"><?php print $site_name ?></a></h1><?php }; ?>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 897bdc39629d..31ca7df31416 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -170,7 +170,7 @@ function chameleon_comment($comment, $node, $links = array()) {
$output .= " <h3 class=\"title\">" . l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) . "</h3>\n";
$output .= " <div class=\"content\">" . $comment->comment;
if (!empty($comment->signature)) {
- $output .= " <div class=\"clear-block\">";
+ $output .= " <div class=\"clearfix\">";
$output .= "<div>—</div>\n";
$output .= $comment->signature . "\n";
$output .= " </div>\n";
diff --git a/themes/garland/block.tpl.php b/themes/garland/block.tpl.php
index 8bbd371186e4..a14afe4d62c8 100644
--- a/themes/garland/block.tpl.php
+++ b/themes/garland/block.tpl.php
@@ -1,7 +1,7 @@
<?php
// $Id$
?>
-<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="clear-block block block-<?php print $block->module ?>">
+<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="clearfix block block-<?php print $block->module ?>">
<?php if (!empty($block->subject)): ?>
<h2><?php print $block->subject ?></h2>
diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index ab68a8cf7da7..3f96b1e2d434 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -3,7 +3,7 @@
?>
<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' ' . $status; print ' ' . $zebra; ?>">
- <div class="clear-block">
+ <div class="clearfix">
<?php if ($submitted): ?>
<span class="submitted"><?php print $submitted; ?></span>
<?php endif; ?>
@@ -19,7 +19,7 @@
<div class="content">
<?php print $content ?>
<?php if ($signature): ?>
- <div class="clear-block">
+ <div class="clearfix">
<div>—</div>
<?php print $signature ?>
</div>
diff --git a/themes/garland/maintenance-page.tpl.php b/themes/garland/maintenance-page.tpl.php
index b05fc8adefd1..27333ad57186 100644
--- a/themes/garland/maintenance-page.tpl.php
+++ b/themes/garland/maintenance-page.tpl.php
@@ -27,10 +27,10 @@
<body class="<?php print $body_classes ?>">
<!-- Layout -->
- <div id="header-region" class="clear-block"><?php print $header; ?></div>
+ <div id="header-region" class="clearfix"><?php print $header; ?></div>
<div id="wrapper">
- <div id="container" class="clear-block">
+ <div id="container" class="clearfix">
<div id="header">
<div id="logo-floater">
@@ -72,7 +72,7 @@
<?php if ($title): ?><h2><?php print $title ?></h2><?php endif; ?>
<?php print $messages; ?>
<?php print $help; ?>
- <div class="clear-block">
+ <div class="clearfix">
<?php print $content ?>
</div>
<div id="footer"><?php print $footer_message . $footer ?></div>
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 99ceef887b99..993a0fe6f890 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -13,11 +13,11 @@
<span class="submitted"><?php print $submitted; ?></span>
<?php endif; ?>
- <div class="content clear-block">
+ <div class="content clearfix">
<?php print $content ?>
</div>
- <div class="clear-block">
+ <div class="clearfix">
<div class="meta">
<?php if ($terms): ?>
<div class="terms"><?php print $terms ?></div>
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 396c9db23fa7..c688f4cd8378 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -15,10 +15,10 @@
</head>
<body class="<?php print $body_classes ?>">
- <div id="header-region" class="clear-block"><?php print $header ?></div>
+ <div id="header-region" class="clearfix"><?php print $header ?></div>
<div id="wrapper">
- <div id="container" class="clear-block">
+ <div id="container" class="clearfix">
<div id="header">
<div id="logo-floater">
@@ -46,13 +46,13 @@
<div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
<?php print $breadcrumb; ?>
<?php if ($mission): ?><div id="mission"><?php print $mission ?></div><?php endif; ?>
- <?php if ($tabs): ?><div id="tabs-wrapper" class="clear-block"><?php endif; ?>
+ <?php if ($tabs): ?><div id="tabs-wrapper" class="clearfix"><?php endif; ?>
<?php if ($title): ?><h2<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h2><?php endif; ?>
<?php if ($tabs): ?><ul class="tabs primary"><?php print $tabs ?></ul></div><?php endif; ?>
<?php if ($tabs2): ?><ul class="tabs secondary"><?php print $tabs2 ?></ul><?php endif; ?>
<?php if ($show_messages && $messages): print $messages; endif; ?>
<?php print $help; ?>
- <div class="clear-block">
+ <div class="clearfix">
<?php print $content ?>
</div>
<?php print $feed_icons ?>
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 0f79126293a4..dfde41aa2928 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -145,7 +145,7 @@ ol.task-list li.active {
margin-right: 1em; /* LTR */
}
-fieldset ul.clear-block li {
+fieldset ul.clearfix li {
margin: 0;
padding: 0;
background-image: none;
diff --git a/themes/pushbutton/comment.tpl.php b/themes/pushbutton/comment.tpl.php
index 5e9ca7a4abd2..18ac9a952079 100644
--- a/themes/pushbutton/comment.tpl.php
+++ b/themes/pushbutton/comment.tpl.php
@@ -10,7 +10,7 @@
<div class="content">
<?php print $content ?>
<?php if ($signature): ?>
- <div class="clear-block">
+ <div class="clearfix">
<div>—</div>
<?php print $signature ?>
</div>
--
GitLab