Skip to content

Commit

Permalink
New section on Twitter Embeds on the about page. props georgestephani…
Browse files Browse the repository at this point in the history
…s, chexee, azaozz, SergeyBiryukov, jane. fixes #20796.

git-svn-id: http://core.svn.wordpress.org/trunk@20977 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
nacin committed Jun 2, 2012
1 parent ed56952 commit f3526bb
Show file tree
Hide file tree
Showing 8 changed files with 62 additions and 13 deletions.
22 changes: 19 additions & 3 deletions wp-admin/about.php
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@
<div class="feature-section"> <div class="feature-section">
<h4><?php _e( 'Flexible Sizes' ); ?></h4> <h4><?php _e( 'Flexible Sizes' ); ?></h4>
<p><?php _e( 'You can decide for yourself how tall or wide your custom header image should be. From now on, themes will provide a recommended image size for custom headers rather than a fixed requirement. Note: this feature requires <a href="http://codex.wordpress.org/Custom_Headers">theme support</a>.' ); ?></p> <p><?php _e( 'You can decide for yourself how tall or wide your custom header image should be. From now on, themes will provide a recommended image size for custom headers rather than a fixed requirement. Note: this feature requires <a href="http://codex.wordpress.org/Custom_Headers">theme support</a>.' ); ?></p>
<img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-1.png' ) ); ?>" class="image-30" /> <div class="three-col-images">
<img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-2.png' ) ); ?>" class="image-30" /> <img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-1.png' ) ); ?>" class="image-30 first-feature" />
<img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-3.png' ) ); ?>" class="image-30" /> <img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-2.png' ) ); ?>" class="image-30" />
<img src="<?php echo esc_url( admin_url( 'images/screenshots/flex-header-3.png' ) ); ?>" class="image-30 last-feature" />
</div>
</div> </div>


<div class="feature-section images-stagger-right"> <div class="feature-section images-stagger-right">
Expand All @@ -64,6 +66,20 @@
</div> </div>
</div> </div>


<div class="changelog">
<h3><?php _e( 'Twitter Embeds' ); ?></h3>

<div class="feature-section images-stagger-right">
<img src="<?php echo esc_url( admin_url( 'images/screenshots/twitter-embed-1.png' ) ); ?>" class="image-30" />
<img src="<?php echo esc_url( admin_url( 'images/screenshots/twitter-embed-2.png' ) ); ?>" class="image-30" />
<h4><?php _e( 'Share Tweets with Style' ); ?></h4>
<p><?php _e( 'You can now embed individual tweets in posts. It includes action links that allow readers to reply to, retweet, and favorite the tweet without leaving your site. Just paste a tweet URL on its own line.' ); ?></p>
<p><?php printf( __( 'This works with URLs from some other sites, too. For more, see the Codex article on <a href="%s">Embeds</a>.' ), __( 'http://codex.wordpress.org/Embeds' ) ); ?></p>
</div>

</div>


<div class="changelog"> <div class="changelog">
<h3><?php _e( 'Better Captions' ); ?></h3> <h3><?php _e( 'Better Captions' ); ?></h3>


Expand Down
8 changes: 4 additions & 4 deletions wp-admin/css/colors-classic.dev.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2360,11 +2360,11 @@ div.widgets-sortables,


.about-wrap .feature-section img { .about-wrap .feature-section img {
background: #fff; background: #fff;
border-color: #dfdfdf; border: 1px #ccc solid;


-moz-box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
-webkit-box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
} }


.about-wrap .point-releases { .about-wrap .point-releases {
Expand Down
8 changes: 4 additions & 4 deletions wp-admin/css/colors-fresh.dev.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1947,11 +1947,11 @@ div.widgets-sortables,


.about-wrap .feature-section img { .about-wrap .feature-section img {
background: #fff; background: #fff;
border-color: #dfdfdf; border: 1px #ccc solid;


-moz-box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); -moz-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
-webkit-box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); -webkit-box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
box-shadow: 0 0 6px rgba( 0, 0, 0, 0.3 ); box-shadow: 0 1px 3px rgba( 0, 0, 0, 0.3 );
} }


.about-wrap h4.wp-people-group { .about-wrap h4.wp-people-group {
Expand Down
9 changes: 9 additions & 0 deletions wp-admin/css/ie.dev.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -439,6 +439,15 @@ table.ie-fixed {
margin: 0; margin: 0;
} }


.about-wrap .three-col-images img {
margin: 0 0.6% 10px;
}

.about-wrap .three-col-images .last-feature,
.about-wrap .three-col-images .first-feature {
float: none;
}

/* IE6 leftovers */ /* IE6 leftovers */
* html .row-actions { * html .row-actions {
visibility: visible; visibility: visible;
Expand Down
8 changes: 8 additions & 0 deletions wp-admin/css/wp-admin-rtl.dev.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -1403,6 +1403,14 @@ h2 .nav-tab {
margin-right: 3em; margin-right: 3em;
} }


.about-wrap .three-col-images .last-feature {
float: left;
}

.about-wrap .three-col-images .first-feature {
float: right;
}

.about-wrap .feature-section.three-col div { .about-wrap .feature-section.three-col div {
margin-right: 0; margin-right: 0;
margin-left: 4.999999999%; margin-left: 4.999999999%;
Expand Down
20 changes: 18 additions & 2 deletions wp-admin/css/wp-admin.dev.css
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5076,7 +5076,7 @@ input.button-highlighted,


.about-wrap .feature-section img { .about-wrap .feature-section img {
border: none; border: none;
margin: 0 0.7% 10px 0; margin: 0 1.94% 10px 0;
-webkit-border-radius: 3px; -webkit-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
Expand All @@ -5086,7 +5086,7 @@ input.button-highlighted,
} }


.about-wrap .feature-section img.image-30 { .about-wrap .feature-section img.image-30 {
max-width: 32%; max-width: 31.2381%;
} }


.ie8 .about-wrap .feature-section img { .ie8 .about-wrap .feature-section img {
Expand Down Expand Up @@ -5123,6 +5123,22 @@ input.button-highlighted,
margin-right: 0; margin-right: 0;
} }


.about-wrap .three-col-images {
text-align: center;
}

.about-wrap .three-col-images img {
margin: 0 0 10px;
}

.about-wrap .three-col-images .last-feature {
float: right;
}

.about-wrap .three-col-images .first-feature {
float: left;
}

.about-wrap .feature-section.images-stagger-right img { .about-wrap .feature-section.images-stagger-right img {
float: right; float: right;
margin: 0 5px 12px 12px; margin: 0 5px 12px 12px;
Expand Down
Binary file added wp-admin/images/screenshots/twitter-embed-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added wp-admin/images/screenshots/twitter-embed-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit f3526bb

Please sign in to comment.