Fix footer whitespace/clearing issues, support two-line footer for low widths. see #17324.
git-svn-id: http://svn.automattic.com/wordpress/trunk@17865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
301be4eeef
commit
29ca82dba7
|
@ -14,7 +14,6 @@ if ( !defined('ABSPATH') )
|
||||||
<div class="clear"></div></div><!-- wpbody-content -->
|
<div class="clear"></div></div><!-- wpbody-content -->
|
||||||
<div class="clear"></div></div><!-- wpbody -->
|
<div class="clear"></div></div><!-- wpbody -->
|
||||||
<div class="clear"></div></div><!-- wpcontent -->
|
<div class="clear"></div></div><!-- wpcontent -->
|
||||||
</div><!-- wpwrap -->
|
|
||||||
|
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
<p id="footer-left" class="alignleft"><?php
|
<p id="footer-left" class="alignleft"><?php
|
||||||
|
@ -38,6 +37,7 @@ if ( function_exists('get_site_option') ) {
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
|
<div class="clear"></div></div><!-- wpwrap -->
|
||||||
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
|
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -75,7 +75,7 @@ table {
|
||||||
}
|
}
|
||||||
|
|
||||||
#wpbody-content {
|
#wpbody-content {
|
||||||
padding-bottom: 50px;
|
padding-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.folded #wpcontent,
|
.folded #wpcontent,
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -4292,7 +4292,11 @@ input.button-highlighted,
|
||||||
------------------------------------------------------------------------------*/
|
------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
#footer {
|
#footer {
|
||||||
margin-top: -46px;
|
position: absolute;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
padding: 10px 0;
|
||||||
margin-right: 15px;
|
margin-right: 15px;
|
||||||
border-top: 1px;
|
border-top: 1px;
|
||||||
border-style: solid;
|
border-style: solid;
|
||||||
|
@ -4305,8 +4309,7 @@ input.button-highlighted,
|
||||||
|
|
||||||
#footer p {
|
#footer p {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 15px 0;
|
line-height: 25px;
|
||||||
line-height: 15px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#footer a {
|
#footer a {
|
||||||
|
|
|
@ -487,7 +487,7 @@ function wp_default_styles( &$styles ) {
|
||||||
// Any rtl stylesheets that don't have a .dev version for ltr
|
// Any rtl stylesheets that don't have a .dev version for ltr
|
||||||
$no_suffix = array( 'farbtastic' );
|
$no_suffix = array( 'farbtastic' );
|
||||||
|
|
||||||
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110511f' );
|
$styles->add( 'wp-admin', "/wp-admin/css/wp-admin$suffix.css", array(), '20110511g' );
|
||||||
|
|
||||||
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
|
$styles->add( 'ie', "/wp-admin/css/ie$suffix.css", array(), '20101102' );
|
||||||
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
$styles->add_data( 'ie', 'conditional', 'lte IE 7' );
|
||||||
|
@ -503,7 +503,7 @@ function wp_default_styles( &$styles ) {
|
||||||
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
|
$styles->add( 'colors-classic', "/wp-admin/css/colors-classic$suffix.css", array(), $colors_version );
|
||||||
|
|
||||||
$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20101213' );
|
$styles->add( 'ms', "/wp-admin/css/ms$suffix.css", array(), '20101213' );
|
||||||
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110511c' );
|
$styles->add( 'global', "/wp-admin/css/global$suffix.css", array(), '20110511d' );
|
||||||
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110121' );
|
$styles->add( 'media', "/wp-admin/css/media$suffix.css", array(), '20110121' );
|
||||||
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20110504' );
|
$styles->add( 'widgets', "/wp-admin/css/widgets$suffix.css", array(), '20110504' );
|
||||||
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110511b' );
|
$styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110511b' );
|
||||||
|
|
Loading…
Reference in New Issue