Commit 554a2808 authored by drumm's avatar drumm

#78656 by m3avrck. Drupal Core's first CSS hack.

parent 6ea92048
......@@ -51,8 +51,10 @@ Drupal x.x.x, xxxx-xx-xx (development version)
- forms API:
* made it possible to programmatically submit forms.
* improved api for multistep forms.
- split up and removed drupal.css.
- added nested lists generation.
- theme system:
* split up and removed drupal.css.
* added nested lists generation.
* added a self-clearing block class.
Drupal 4.7.0, 2006-05-01
------------------------
......
......@@ -80,14 +80,14 @@ function help_links_as_list() {
// Output pretty four-column list
$break = ceil(count($modules) / 4);
$output = '<div class="help-items"><ul>';
$output = '<div class="help-items clear-block"><ul>';
foreach ($modules as $i => $module) {
$output .= '<li>'. l(t($module), 'admin/help/'. $module) .'</li>';
if (($i + 1) % $break == 0) {
$output .= '</ul></div><div class="help-items'. ($i + 1 == $break * 3 ? ' help-items-last' : '') .'"><ul>';
}
}
$output .= '</ul></div><br class="clear" />';
$output .= '</ul></div>';
return $output;
}
......
......@@ -1334,7 +1334,7 @@ function theme_node_filter_form($form) {
* Theme node administraton filter selector.
*/
function theme_node_filters($form) {
$output .= '<ul>';
$output .= '<ul class="clear-block">';
if (sizeof($form['current'])) {
foreach (element_children($form['current']) as $key) {
$output .= '<li>' . drupal_render($form['current'][$key]) . '</li>';
......@@ -1356,7 +1356,7 @@ function theme_node_filters($form) {
$output .= '</dl>';
$output .= '<div class="container-inline" id="node-admin-buttons">'. drupal_render($form['buttons']) .'</div>';
$output .= '</li></ul><br class="clear" />';
$output .= '</li></ul>';
return $output;
}
......@@ -2440,8 +2440,8 @@ function node_form_alter($form_id, &$form) {
$form['advanced']['submit'] = array(
'#type' => 'submit',
'#value' => t('Advanced search'),
'#prefix' => '<div class="action">',
'#suffix' => '</div><br class="clear" />',
'#prefix' => '<div class="action clear-block">',
'#suffix' => '</div>',
);
$form['#validate']['node_search_validate'] = array();
......
......@@ -26,7 +26,28 @@ th {
padding-right: 1em;
border-bottom: 3px solid #ccc;
}
br.clear {
clear: both;
/*
** Markup free clearing
** Details: http://www.positioniseverything.net/easyclearing.html
*/
.clear-block:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.clear-block {
display: inline-block;
}
/* Hides from IE-mac \*/
* html .clear-block {
height: 1%;
}
.clear-block {
display: block;
}
/* End hide from IE-mac */
......@@ -2504,7 +2504,7 @@ function theme_user_filter_form($form) {
* Theme user administraton filter selector.
*/
function theme_user_filters($form) {
$output .= '<ul>';
$output .= '<ul class="clear-block">';
if (sizeof($form['current'])) {
foreach (element_children($form['current']) as $key) {
$output .= '<li>'. drupal_render($form['current'][$key]) .'</li>';
......@@ -2526,7 +2526,7 @@ function theme_user_filters($form) {
$output .= '</dl>';
$output .= '<div class="container-inline" id="user-admin-buttons">'. drupal_render($form['buttons']) .'</div>';
$output .= '</li></ul><br class="clear" />';
$output .= '</li></ul>';
return $output;
}
......
<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ($comment->status == COMMENT_NOT_PUBLISHED) ? ' comment-unpublished' : ''; ?>">
<?php if ($comment->new) : ?>
<div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ($comment->status == COMMENT_NOT_PUBLISHED) ? ' comment-unpublished' : ''; ?> clear-block">
<?php if ($comment->new) : ?>
<a id="new"></a>
<span class="new"><?php print $new ?></span>
<?php endif; ?>
<?php endif; ?>
<div class="title"><?php print $title ?></div>
<div class="title"><?php print $title ?></div>
<?php print $picture ?>
<div class="author"><?php print $submitted ?></div>
<div class="content"><?php print $content ?></div>
<?php if ($picture) : ?>
<br class="clear" />
<?php endif; ?>
<div class="links"><?php print $links ?></div>
</div>
<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
<div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?> clear-block">
<?php if ($page == 0): ?>
<h2><a href="<?php print $node_url ?>" title="<?php print $title ?>"><?php print $title ?></a></h2>
<?php endif; ?>
......@@ -8,11 +8,8 @@
<div class="content">
<?php print $content ?>
</div>
<?php if ($links): ?>
<?php if ($picture): ?>
<br class='clear' />
<?php endif; ?>
<div class="links"><?php print $links ?></div>
<?php endif; ?>
<?php if ($links): ?>
<div class="links"><?php print $links ?></div>
<?php endif; ?>
</div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment