Skip to content

Commit

Permalink
Rename div#footer to div#wpfooter in the admin. Namespace one of our …
Browse files Browse the repository at this point in the history
…major elements and avoid clashing with widgets with the id of 'footer'. props andrewryno, koopersmith. see #14466.

git-svn-id: http://core.svn.wordpress.org/trunk@21878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
nacin committed Sep 16, 2012
1 parent b443373 commit 290d479
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion wp-admin/admin-footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="clear"></div></div><!-- wpbody -->
<div class="clear"></div></div><!-- wpcontent -->

<div id="footer">
<div id="wpfooter">
<?php do_action( 'in_admin_footer' ); ?>
<p id="footer-left" class="alignleft"><?php
echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __( 'Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.' ) . '</span>' );
Expand Down
8 changes: 4 additions & 4 deletions wp-admin/css/colors-classic.css
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ input.readonly, textarea.readonly {
color: #d54e21 !important;
}

#footer {
#wpfooter {
color: #777;
border-color: #b0c8d7;
}
Expand Down Expand Up @@ -933,12 +933,12 @@ table.widefat span.spam a,
color: #174f69;
}

#footer a:link,
#footer a:visited {
#wpfooter a:link,
#wpfooter a:visited {
text-decoration: none;
}

#footer a:hover {
#wpfooter a:hover {
color: #000;
text-decoration: underline;
}
Expand Down
24 changes: 12 additions & 12 deletions wp-admin/css/colors-fresh.css
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ input[type=submit] {
background-image: -o-linear-gradient(top, #fff, #eee);
background-image: linear-gradient(to bottom, #fff, #eee);
border-color: #ccc;
-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
color: #464646;
text-shadow: 1px 1px 0 #fff;
Expand Down Expand Up @@ -414,7 +414,7 @@ input[type=submit]:focus {
background-image: -o-linear-gradient(top, #fff, #eee);
background-image: linear-gradient(to bottom, #fff, #eee);
border-color: #bbb;
-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1);
box-shadow: 0px 1px 1px rgba(0,0,0,.1);
color: #000;
}
Expand All @@ -437,8 +437,8 @@ input[type=submit]:active {
background-image: linear-gradient(to bottom, #eee, #f9f9f9);
border-color: #999 #ddd #ddd #999;
color: #555;
-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
}

.button.focus,
Expand All @@ -464,7 +464,7 @@ a.button-primary {
background-image: linear-gradient(to bottom, #2a95c5, #21759b);
border-color: #21759b;
border-bottom-color: #1e6a8d;
-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
box-shadow: inset 0 1px 0 rgba(120,200,230,0.5);
color: #fff;
text-decoration: none;
Expand All @@ -486,7 +486,7 @@ a.button-primary:focus {
background-image: -o-linear-gradient(top, #2e9fd2, #21759b);
background-image: linear-gradient(to bottom, #2e9fd2, #21759b);
border-color: #1b607f;
-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0 1px 1px rgba(0,0,0,.3);
-webkit-box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0 1px 1px rgba(0,0,0,.3);
box-shadow: inset 0 1px 0 rgba(120,200,230,0.6), 0 1px 1px rgba(0,0,0,.3);
color: #fff;
text-shadow: -1px -1px 0 rgba(0,0,0,0.3);
Expand All @@ -504,8 +504,8 @@ a.button-primary:active {
background-image: linear-gradient(to bottom, #21759b, #278ab7);
border-color: #124560 #2382ae #2382ae #124560;
color: rgba(255,255,255,0.95);
-webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
-webkit-box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
box-shadow: inset 1px 1px 0 rgba(0,0,0,0.1);
}

input.button-primary.focus,
Expand Down Expand Up @@ -771,7 +771,7 @@ input.readonly, textarea.readonly {
color: #d54e21 !important;
}

#footer {
#wpfooter {
color: #777;
border-color: #dfdfdf;
}
Expand Down Expand Up @@ -991,12 +991,12 @@ table.widefat span.spam a,
color: #464646;
}

#footer a:link,
#footer a:visited {
#wpfooter a:link,
#wpfooter a:visited {
text-decoration: none;
}

#footer a:hover {
#wpfooter a:hover {
text-decoration: underline;
}

Expand Down
2 changes: 1 addition & 1 deletion wp-admin/css/ie.css
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ table.ie-fixed {
margin: 0;
}

* html #footer {
* html #wpfooter {
margin: 0;
}

Expand Down
8 changes: 4 additions & 4 deletions wp-admin/css/wp-admin-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ form.upgrade .hint {
margin-right: 52px;
}

.folded.wp-admin #footer {
.folded.wp-admin #wpfooter {
margin-left: 15px;
margin-right: 52px;
}
Expand Down Expand Up @@ -481,7 +481,7 @@ form.upgrade .hint {
margin-right: 52px;
}

.auto-fold.wp-admin #footer {
.auto-fold.wp-admin #wpfooter {
margin-left: 15px;
margin-right: 52px;
}
Expand Down Expand Up @@ -1335,12 +1335,12 @@ h2 .nav-tab {
21.0 - Admin Footer
------------------------------------------------------------------------------*/

#footer {
#wpfooter {
margin-left: 20px;
}

#wpcontent,
#footer {
#wpfooter {
margin-right: 165px;
}

Expand Down
14 changes: 7 additions & 7 deletions wp-admin/css/wp-admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ TABLE OF CONTENTS:
}

#wpcontent,
#footer {
#wpfooter {
margin-left: 165px;
}

.folded #wpcontent,
.folded #footer {
.folded #wpfooter {
margin-left: 52px;
}

Expand Down Expand Up @@ -1685,7 +1685,7 @@ form.upgrade .hint {
/* Auto-folding of the admin menu */
@media only screen and (max-width: 900px) {
.auto-fold #wpcontent,
.auto-fold #footer {
.auto-fold #wpfooter {
margin-left: 52px;
}

Expand Down Expand Up @@ -4878,7 +4878,7 @@ h2 .nav-tab {
21.0 - Admin Footer
------------------------------------------------------------------------------*/

#footer {
#wpfooter {
position: absolute;
bottom: 0;
left: 0;
Expand All @@ -4889,16 +4889,16 @@ h2 .nav-tab {
border-top-style: solid;
}

#footer p {
#wpfooter p {
margin: 0;
line-height: 20px;
}

#footer a {
#wpfooter a {
text-decoration: none;
}

#footer a:hover {
#wpfooter a:hover {
text-decoration: underline;
}

Expand Down

0 comments on commit 290d479

Please sign in to comment.