Changeset 35835

Timestamp:

12/08/2015 08:33:05 PM (9 years ago)

Author:

ocean90

Message:

About Page: Use w.org CDN, use ReverbNation instead of Cloudup, adjust the layout.

Merge of [35832], [35833], and [35834] to the 4.4 branch.

See #34663.

Location:

branches/4.4/src/wp-admin

Files:

• about.php (modified) (4 diffs)
• css/about.css (modified) (4 diffs)

branches/4.4/src/wp-admin/about.php

@@ -46 +46 @@
             <h2><?php _e( 'Twenty Sixteen' ); ?></h2>
             <div class="media-container">
-                <img src="https://cldup.com/K6k4JfS2nW.png" alt="" srcset="https://cldup.com/F7tEqWxzrx-3000x3000.png 268w, https://cldup.com/zxAXtkbN40-3000x3000.png 536w, https://cldup.com/f2FyXrEthb-3000x3000.png 558w, https://cldup.com/xFofz-J2o0-3000x3000.png 840w, https://cldup.com/2fTSHlMGIt-3000x3000.png 1086w, https://cldup.com/RRCVETtgEs-3000x3000.png 1116w, https://cldup.com/SshVHkB_oX-3000x3000.png 1680w, https://cldup.com/ptbHQzcmog-3000x3000.png 2172w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .8), (max-width: 1290px) calc((100vw - 240px) * .8), 840px" />
+                <img src="https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-2x.png 536w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-1x.png 840w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-1x.png 1086w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-2x.png 1680w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png 2172w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .8), (max-width: 1290px) calc((100vw - 240px) * .8), 840px" />
             </div>
             <div class="two-col">
@@ -55 +55 @@
                     <div class="horizontal-image">
                         <div class="content">
-                            <img class="feature-image horizontal-screen" src="https://cldup.com/J-zxmMqkXs.png" alt=""  srcset="https://cldup.com/GJ_OChqU-3-3000x3000.png 268w, https://cldup.com/opV2KAg7px-3000x3000.png 535w, https://cldup.com/H7TUss5F-L-3000x3000.png 558w, https://cldup.com/4Mgr3kchBL-3000x3000.png 783w, https://cldup.com/kW9lcVhn3v-3000x3000.png 1116w, https://cldup.com/M2gkxI9RnI-3000x3000.png 1566w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .5216), (max-width: 1290px) calc((100vw - 240px) * .5216), 548px" />
+                            <img class="feature-image horizontal-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png" alt=""  srcset="https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-2x.png 535w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-1x.png 783w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png 1566w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .5216), (max-width: 1290px) calc((100vw - 240px) * .5216), 548px" />
                         </div>
                     </div>
                 </div>
                 <div class="col feature-image">
-                    <img class="vertical-screen" src="https://cldup.com/M8i_6X5LUL.png" alt="" />
+                    <img class="vertical-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-red-smartphone-1x.png 107w, https://s.w.org/images/core/4.4/twenty-sixteen-red-smartphone-2x.png 214w, https://s.w.org/images/core/4.4/twenty-sixteen-red-desktop-1x.png 252w, https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-1x.png 410w, https://s.w.org/images/core/4.4/twenty-sixteen-red-desktop-2x.png 504w, https://s.w.org/images/core/4.4/twenty-sixteen-red-fullsize-2x.png 820w" sizes="(max-width: 500px) calc((100vw - 40px) * .32), (max-width: 782px) calc((100vw - 70px) * .32), (max-width: 960px) calc((100vw - 116px) * .24), (max-width: 1290px) calc((100vw - 240px) * .24), 252px" />
                 </div>
             </div>
@@ -70 +70 @@
             <div class="col">
                 <div class="media-container">
-                    <img src="https://cldup.com/av6MH44-Au.png" alt="" srcset="https://cldup.com/KFesVSr1qr-3000x3000.png 335w, https://cldup.com/bX6aec9s9y-3000x3000.png 500w, https://cldup.com/sN3AlF6bSs-3000x3000.png 670w, https://cldup.com/2sAEKiKjQh-3000x3000.png 698w, https://cldup.com/TqUWsx6V2V-3000x3000.png 1000w, https://cldup.com/5gLqAd5tJL-3000x3000.png 1200w, https://cldup.com/m20tMOQZvT-3000x3000.png 1396w, https://cldup.com/d82AnAj-MF-3000x3000.png 2400w" sizes="(max-width: 500px) calc((100vw - 40px)), (max-width: 782px) calc((100vw - 70px), (max-width: 960px) calc((100vw - 116px) * .476), (max-width: 1290px) calc((100vw - 240px) * .476), 500px" />
+                    <img src="https://s.w.org/images/core/4.4/responsive-devices-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/responsive-devices-smartphone-1x.png 335w, https://s.w.org/images/core/4.4/responsive-devices-desktop-1x.png 500w, https://s.w.org/images/core/4.4/responsive-devices-smartphone-2x.png 670w, https://s.w.org/images/core/4.4/responsive-devices-tablet-1x.png 698w, https://s.w.org/images/core/4.4/responsive-devices-desktop-2x.png 1000w, https://s.w.org/images/core/4.4/responsive-devices-fullsize-1x.png 1200w, https://s.w.org/images/core/4.4/responsive-devices-tablet-2x.png 1396w, https://s.w.org/images/core/4.4/responsive-devices-fullsize-2x.png 2400w" sizes="(max-width: 500px) calc(100vw - 40px), (max-width: 782px) calc(100vw - 70px), (max-width: 960px) calc((100vw - 116px) * .476), (max-width: 1290px) calc((100vw - 240px) * .476), 500px" />
                 </div>
             </div>
@@ -86 +86 @@
                     <blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/">New Embeds Feature in WordPress 4.4</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://make.wordpress.org/core/2015/10/28/new-embeds-feature-in-wordpress-4-4/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="Embedded WordPress Post" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
                 </div>
+            </div>
+            <div class="col">
                 <h3><?php _e( 'Embed your WordPress content' ); ?></h3>
                 <p><?php _e( 'Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.' ); ?></p>
             </div>
-            <div class="col">
-                <div class="embed-container">
-                    <?php
-                    $embed2 = get_site_transient( 'about-page-embed-2' );
-                    if ( false === $embed2 ) {
-                        $embed2 = wp_oembed_get( 'https://cloudup.com/cD3duXiAI5k' );
-                        if ( ! $embed2 ) {
-                            $embed2 = '{{unknown}}';
-                        }
-                        set_site_transient( 'about-page-embed-2', $embed2 );
-                    }
-                    echo '{{unknown}}' !== $embed2 ? $embed2 : '';
-                    ?>
-                </div>
+        </div>
+
+        <hr />
+
+        <div class="feature-section two-col">
+            <div class="col">
+                <div class="embed-container embed-reverbnation">
+                    <iframe width="640" height="150" scrolling="no" frameborder="no" src="https://www.reverbnation.com/widget_code/html_widget/artist_607?widget_id=55&amp;pwc[song_ids]=3731874&amp;pwc[size]=small"></iframe>
+                </div>
+            </div>
+            <div class="col">
                 <h3><?php _e( 'Even more embed providers' ); ?></h3>
                 <p><?php _e( 'In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.' ); ?></p>

branches/4.4/src/wp-admin/css/about.css

@@ -142 +142 @@
     width: 47.6%;
 }
+.about-wrap .feature-section.two-col .col {
+    display: inline-block;
+    float: none;
+    margin-right: 4.799999999%;
+    width: calc( 47.6% - 4px );
+    vertical-align: middle;
+}
 
 .about-wrap .three-col .col {
@@ -185 +192 @@
     margin-top: 0;
     text-align: left;
+}
+
+.about-wrap .feature-section.two-col h3 {
+    margin-top: 0;
 }
 
@@ -274 +285 @@
 }
 
-.about-wrap .embed-cloudup iframe {
-    height: 299px;
-}
-
 .about-wrap .embed-container iframe {
     max-width: 100%;
@@ -499 +506 @@
     }
 
+    .about-wrap .feature-section.two-col .col,
     .about-wrap .three-col .col,
     .about-wrap .headline-feature .feature-section .col {
         width: 100% !important;
         float: none !important;
+    }
+
+    .about-wrap .feature-section.two-col .col:last-of-type {
+        margin-top: 0;
+    }
+
+    .feature-section.under-the-hood.three-col .col,
+    .feature-section.under-the-hood.one-col .col {
+        padding-bottom: 0;
     }
 }