Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

themes/wordpress-mu-theme-fedora/sidebar.php

@@ -22,7 +22,7 @@
 <h2><?php _e('Meta:'); ?></h2>
 	<ul>
                 <li><a href="https://blogs.fedoraproject.org/wp/wp-signup.php">Create a Blog</a></li>
-		<?php if (is_user_logged_in()) { echo "<li><a href="/wp/wp-admin">Control Panel</a></li>"; } ?>
+		<?php if (is_user_logged_in()) { ?> <li><a href="/wp/wp-admin/">Control Panel</a></li><?php } ?>
 
 		<li><?php wp_loginout(); ?></li>
 		<li><a href="<?php bloginfo('rss2_url'); ?>" title="<?php _e('Syndicate this site using RSS'); ?>"><?php _e('<abbr title="Really Simple Syndication">RSS</abbr>'); ?></a></li>

themes/wordpress-mu-theme-fedora/style.css

@@ -118,3 +118,37 @@ div.post h2 {
   text-transform: uppercase;
 }
 
+/* Captions */
+.aligncenter,
+div.aligncenter {
+        display: block;
+        margin-left: auto;
+        margin-right: auto;
+}
+
+.wp-caption {
+        border: 1px solid #ddd;
+        text-align: center;
+        background-color: #f3f3f3;
+        padding-top: 4px;
+        margin: 10px;
+        -moz-border-radius: 3px;
+        -khtml-border-radius: 3px;
+        -webkit-border-radius: 3px;
+        border-radius: 3px;
+}
+
+.wp-caption img {
+        margin: 0;
+        padding: 0;
+        border: 0 none;
+}
+
+.wp-caption p.wp-caption-text {
+        font-size: 11px;
+        line-height: 17px;
+        padding: 0 4px 5px;
+        margin: 0;
+}
+/* End captions */
+