diff options
Diffstat (limited to 'modules/system')
| -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 |
4 files changed, 14 insertions, 14 deletions
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>'; } |