From 9cd64e1341949dd2c9c1a01447b7af413e4e9e76 Mon Sep 17 00:00:00 2001 From: desrosj Date: Mon, 17 Dec 2018 16:36:59 +0000 Subject: [PATCH] Help/About: WordPress 5.0 About Page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The About page describes all the great changes in WordPress 5.0. Highlights: - Warn users of Gutenberg plugin of its deactivation upon 5.0 upgrade. - Added illustrations to the Four Freedoms page. - Include a link to wporg user’s plugin favorites as a way to display only the classic plugin as a suggestion for install. - Detail the Classic Editor plugin and the support timeline. Props pixelverbieger, ocean90, karmatosed, pento, boemedia, lonelyvegan, sami.keijonen, TimothyBlynJacobs, xkon, afercia, laurelfulford, joostdevalk, ipstenu, matveb, joen, tinkerbelly, chanthaboune, kjellr, alexislloyd, melchoyce, mcsf, courtney0burton, Otto42, cathibosco, tobifjellner, helen, audrasjb, antpb, jjj, elrae, desrosj, azaozz, joemcgill, skithund, gziolo. Merges [43913], [43921-43922], [43937-43938], [43946-43947], [43952-43953], [43967-43969] into trunk. Fixes #45178. Built from https://develop.svn.wordpress.org/trunk@44264 git-svn-id: http://core.svn.wordpress.org/trunk@44094 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/about.php | 546 ++++++++++++------ wp-admin/credits.php | 2 +- wp-admin/css/about-rtl.css | 224 +++---- wp-admin/css/about-rtl.min.css | 2 +- wp-admin/css/about.css | 224 +++---- wp-admin/css/about.min.css | 2 +- wp-admin/freedoms.php | 60 +- .../class-wp-plugin-install-list-table.php | 6 +- wp-admin/includes/upgrade.php | 7 + wp-includes/version.php | 2 +- 10 files changed, 663 insertions(+), 412 deletions(-) diff --git a/wp-admin/about.php b/wp-admin/about.php index 8c415dc318..0e315b3a74 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -16,12 +16,43 @@ $title = _x( 'About', 'page title' ); list( $display_version ) = explode( '-', get_bloginfo( 'version' ) ); +wp_enqueue_style( 'wp-block-library' ); + include( ABSPATH . 'wp-admin/admin-header.php' ); ?>

-

+

+ + +
+ ', + '' + ); + ?> +
+ +

+ ℹ +

+ +

@@ -33,209 +64,378 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

- -

-

+

-
+
- - + + + +
-
-
-

-
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+

-
-
-

+
+
+
+ + + + +
+
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
-
-
-

-
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+

+

+ +

-
-
-

+
+
+
+ + + + +
+
- -
-
-
- -
-

-

-
-
-
- -
-

-

-
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+ + + + +
+
-
- - - - +
+
+

+

+ +
-
-

- -

-

- early tester or getting involved with the Gutenberg project? Contribute on GitHub.' ), - __( 'https://wordpress.org/plugins/gutenberg/' ), - 'https://github.com/WordPress/gutenberg' - ); - ?> -

+ +
+
+ +
+
+ + + +
+ +
+
+

+
+
+ +
+
+ + + + + + + +
+
+
+ +
+
+

+
+
+ +
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ +

+

+
+
+ + +
+
+ +
+
+ + +
+ +
+
+

+
+
+ +
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ + + + +

+

+
+
+ +
+
+ +
-
-

- -

- -
+ +
-

-

- Check out the full list.' ), - 'https://make.wordpress.org/core/2017/11/01/improvements-to-the-customize-js-api-in-4-9/' - ); - ?> -

-
-
-

-

-
-
-

-

-
-
-

-

+

-
-
+
+ + + + + + +
+ +
+
+

+

+

+ +
+ +
+ +
+
+ +
+
diff --git a/wp-admin/credits.php b/wp-admin/credits.php index 1b9646027f..be36bdb368 100644 --- a/wp-admin/credits.php +++ b/wp-admin/credits.php @@ -20,7 +20,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );

-

+

diff --git a/wp-admin/css/about-rtl.css b/wp-admin/css/about-rtl.css index 9b3d6913fe..af9ee69801 100644 --- a/wp-admin/css/about-rtl.css +++ b/wp-admin/css/about-rtl.css @@ -40,17 +40,38 @@ .about-wrap hr { border: 0; height: 0; - margin: 0; + margin: 3em 0 0; border-top: 1px solid rgba(0, 0, 0, 0.1); } .about-wrap img { margin: 0; - max-width: 100%; + width: 100%; height: auto; vertical-align: middle; } +.about-wrap figure { + position: relative; + margin: 0; +} + +.about-wrap .feature-section figure img { + margin-bottom: 0; +} + +.about-wrap figcaption { + position: absolute; + bottom: 0; + width: 100%; + padding: 40px 10px 15px; + overflow: auto; + box-sizing: border-box; + background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent); + font-weight: 600; + text-shadow: 0px 0px 5px rgba(0,0,0,.75); +} + .about-wrap .jetpack-video-wrapper { margin-bottom: 0; } @@ -132,25 +153,19 @@ color: #23282d; } -.about-wrap .changelog h2 { - font-size: 1.4em; - font-weight: 600; - text-align: right; -} - -.about-wrap .changelog h3 { - margin: 1.33em 0; - font-size: 1em; - line-height: inherit; - color: #23282d; -} - .about-wrap code, .about-wrap ol li p { font-size: 14px; font-weight: 400; } +.about-wrap figcaption { + font-size: 13px; + text-align: center; + color: white; + text-overflow: ellipsis; +} + .about-wrap .about-description, .about-wrap .about-text { margin-top: 1.4em; @@ -161,7 +176,6 @@ .about-wrap .about-text { margin: 1em 0 1em 200px; - min-height: 60px; color: #555d66; } @@ -175,7 +189,7 @@ .about-wrap .feature-section.one-col { margin: 0 auto; - max-width: 700px; + max-width: 680px; } .about-wrap .inline-svg img { @@ -197,12 +211,35 @@ max-width: 47%; } +.about-wrap .three-col, +.about-wrap .four-col { + margin: auto; + max-width: 1020px; +} + .about-wrap .three-col .col { align-self: flex-start; min-width: 31%; max-width: 31%; } +.about-wrap .four-col .col { + align-self: flex-start; + min-width: 23%; + max-width: 23%; +} + +.about-wrap .feature-section.eight-col .col { + align-self: flex-start; + margin-top: 6px; + min-width: 12%; + max-width: 12%; +} + +.about-wrap .one-col img { + margin: 1em 0 2em; +} + .about-wrap .two-col img { margin-bottom: 1.5em; } @@ -215,6 +252,18 @@ background: transparent; /* Hide loading.gif */ } +.about-wrap video { + margin: 1.5em auto; +} + +.about-wrap .cta { + text-align: center; +} +.about-wrap .cta .button { + margin: 0 auto 5px; + font-weight: 600; +} + /* 1.3 - Point Releases */ .about-wrap .point-releases { @@ -255,9 +304,7 @@ } .about-wrap .two-col-text { - -webkit-column-count: 2; column-count: 2; - -webkit-column-gap: 40px; column-gap: 40px; } @@ -270,6 +317,10 @@ margin-bottom: 3em; } +.about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; +} + /* 2.2 - Structure */ .about-wrap .headline-feature.feature-video { @@ -296,7 +347,6 @@ .about-wrap .feature-section { overflow: hidden; - padding: 0 0 40px; } .about-wrap .feature-section.no-heading { @@ -307,10 +357,6 @@ overflow: hidden; } -.about-wrap .feature-section img { - margin-bottom: 1em; -} - .about-wrap .embed-container { text-align: center; } @@ -348,84 +394,6 @@ padding: 0 5px; } -/* 2.3 Floating Header Layout */ - -.about-wrap .floating-header-section { - display: -ms-grid; - display: grid; - grid-gap: 0 60px; - -ms-grid-columns: 5fr 11fr; - grid-template-columns: 5fr 11fr; - max-width: 1020px; - margin: 0 auto 120px; -} - -.about-wrap .floating-header-section .section-header { - -ms-grid-column: 1; - grid-column: 1; - position: relative; - min-width: 230px; - max-width: 300px; -} - -.about-wrap .floating-header-section h2 { - margin: 0; - text-align: right; - position: absolute; -} - -.about-wrap .floating-header-section .section-content { - -ms-grid-column: 2; - grid-column: 2; - display: flex; - justify-content: space-between; - align-items: flex-start; - flex-flow: row wrap; - flex-grow: 2; - flex-shrink: 0; -} - -.about-wrap .floating-header-section .section-item { - flex-grow: 1; - max-width: calc(50% - 30px); -} - -.about-wrap .floating-header-section .section-item:nth-child(1), -.about-wrap .floating-header-section .section-item:nth-child(2) { - margin-bottom: 60px; -} - -.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2), -.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) { - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title { - display: block; -} - -.about-wrap .floating-header-section.has-long-title .section-header { - max-width: 100%; -} - -.about-wrap .floating-header-section.has-long-title h2 { - position: static; - margin-bottom: 60px; -} - -.about-wrap .floating-header-section.has-long-title .section-content { - justify-content: flex-start; -} - -.about-wrap .floating-header-section.has-long-title .section-item { - max-width: 300px; - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title .section-item + .section-item { - margin-right: 60px; -} - /*------------------------------------------------------------------------------ 3.0 - Credits & Freedoms Pages ------------------------------------------------------------------------------*/ @@ -513,6 +481,21 @@ margin: 0.6em 0; } +.freedoms-php .about-wrap .col .freedoms-image { + background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png'); + background-size: 100%; + padding-top: 100%; +} +.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image { + background-position: 100% 34%; +} +.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image { + background-position: 100% 66%; +} +.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image { + background-position: 100% 100%; +} + /*------------------------------------------------------------------------------ 4.0 - Media Queries ------------------------------------------------------------------------------*/ @@ -536,20 +519,36 @@ @media screen and (max-width: 782px) { .about-wrap .two-col-text { - -webkit-column-count: 1; column-count: 1; } .about-wrap .two-col .col, - .about-wrap .three-col .col { + .about-wrap .three-col .col, + .about-wrap .four-col .col { min-width: 48% !important; } - .about-wrap .three-col img { + .about-wrap .eight-col .col { + min-width: 24% !important; + } + + .about-wrap .three-col img, + .about-wrap .four-col img, + .about-wrap .eight-col img { display: block; margin: 0 auto; } + .about-wrap figcaption { + position: relative; + margin-top: 10px; + margin-bottom: 15px; + padding: 0; + background: none; + color: #40464D; + text-shadow: none; + } + .about-wrap .floating-header-section { display: block; } @@ -586,11 +585,21 @@ width: 100%; } + .about-wrap .feature-section .col { + margin-top: 1em; + } + .about-wrap .two-col .col, + .about-wrap .three-col .col, .about-wrap .three-col .col { min-width: 100% !important; } + .about-wrap .eight-col .col { + min-width: 48% !important; + } + + .about-wrap .under-the-hood.four-col .col, .about-wrap .under-the-hood.three-col .col, .about-wrap .under-the-hood.two-col .col, .about-wrap .under-the-hood.one-col .col { @@ -603,9 +612,8 @@ margin-top: 0; } - .about-wrap .under-the-hood:nth-of-type(2n) h3, - .about-wrap .under-the-hood:nth-of-type(3n) h3 { - margin-top: 0; + .about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; } .about-wrap .floating-header-section { diff --git a/wp-admin/css/about-rtl.min.css b/wp-admin/css/about-rtl.min.css index ba95c9ac59..4daf6e699b 100644 --- a/wp-admin/css/about-rtl.min.css +++ b/wp-admin/css/about-rtl.min.css @@ -1,2 +1,2 @@ /*! This file is auto-generated */ -.about-wrap{position:relative;margin:25px 20px 0 40px;max-width:1050px;font-size:15px}.about-wrap.full-width-layout{max-width:1200px}.about-wrap-content{max-width:1050px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;height:auto;vertical-align:middle}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:#0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;background-position:center 25px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;left:0}.about-wrap .nav-tab{padding-left:15px;padding-right:15px;font-size:18px}.about-wrap p{line-height:1.5;font-size:14px}.about-wrap .feature-section p{max-width:55em;margin-right:auto;margin-left:auto}.about-wrap h1{margin:.2em 0 0 200px;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:40px 0 .6em;font-size:2.7em;line-height:1.3;font-weight:300;text-align:center}.about-wrap h3{margin:1.25em 0 .6em;font-size:1.4em;line-height:1.5}.about-wrap h4{color:#23282d}.about-wrap .changelog h2{font-size:1.4em;font-weight:600;text-align:right}.about-wrap .changelog h3{margin:1.33em 0;font-size:1em;line-height:inherit;color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 0 1em 200px;min-height:60px;color:#555d66}.about-wrap [class$="-col"]{display:flex;justify-content:space-between;flex-wrap:wrap}.about-wrap .feature-section.one-col{margin:0 auto;max-width:700px}.about-wrap .inline-svg img{max-width:100%;width:100%;height:auto}.about-wrap .inline-svg.full-width{margin-bottom:120px}.about-wrap [class$="-col"] .col{flex:1}.about-wrap .two-col .col{min-width:47%;max-width:47%}.about-wrap .three-col .col{align-self:flex-start;min-width:31%;max-width:31%}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-video .mejs-controls{display:none!important}.about-wrap .feature-video .mejs-overlay-loading span{background:0 0}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em 0;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .lead-description{font-size:1.5em;text-align:center}.about-wrap .two-col-text{-webkit-column-count:2;column-count:2;-webkit-column-gap:40px;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .native-fonts p,.about-wrap .streamlined-updates p{margin-bottom:3em}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;right:0;width:100%;height:100%}.about-wrap .featured-image{text-align:center}.about-wrap .feature-section{overflow:hidden;padding:0 0 40px}.about-wrap .feature-section.no-heading{padding-top:35px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .feature-section img{margin-bottom:1em}.about-wrap .embed-container{text-align:center}.about-wrap .embed-container iframe{max-width:100%}.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .feature-section .col{margin-top:40px}.about-wrap .changelog{margin-bottom:40px}.about-wrap .changelog.feature-section .col{margin-top:40px}.about-wrap .return-to-dashboard{margin:30px -5px 0 0;font-size:14px;font-weight:600}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap .floating-header-section{display:-ms-grid;display:grid;grid-gap:0 60px;-ms-grid-columns:5fr 11fr;grid-template-columns:5fr 11fr;max-width:1020px;margin:0 auto 120px}.about-wrap .floating-header-section .section-header{-ms-grid-column:1;grid-column:1;position:relative;min-width:230px;max-width:300px}.about-wrap .floating-header-section h2{margin:0;text-align:right;position:absolute}.about-wrap .floating-header-section .section-content{-ms-grid-column:2;grid-column:2;display:flex;justify-content:space-between;align-items:flex-start;flex-flow:row wrap;flex-grow:2;flex-shrink:0}.about-wrap .floating-header-section .section-item{flex-grow:1;max-width:calc(50% - 30px)}.about-wrap .floating-header-section .section-item:nth-child(1),.about-wrap .floating-header-section .section-item:nth-child(2){margin-bottom:60px}.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2),.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1){margin-bottom:0}.about-wrap .floating-header-section.has-long-title{display:block}.about-wrap .floating-header-section.has-long-title .section-header{max-width:100%}.about-wrap .floating-header-section.has-long-title h2{position:static;margin-bottom:60px}.about-wrap .floating-header-section.has-long-title .section-content{justify-content:flex-start}.about-wrap .floating-header-section.has-long-title .section-item{max-width:300px;margin-bottom:0}.about-wrap .floating-header-section.has-long-title .section-item+.section-item{margin-right:60px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -5px 0 -15px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-left:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:right;margin:0 0 10px 10px;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:600}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:1250px){.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2){margin:0 0 60px}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin:0}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin-right:60px}}@media screen and (max-width:782px){.about-wrap .two-col-text{-webkit-column-count:1;column-count:1}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:48%!important}.about-wrap .three-col img{display:block;margin:0 auto}.about-wrap .floating-header-section{display:block}.about-wrap .floating-header-section .section-content,.about-wrap .floating-header-section .section-header{max-width:100%}.about-wrap .floating-header-section h2{position:static;margin-bottom:60px}}@media only screen and (max-width:500px){.about-wrap{margin-left:20px;margin-right:10px}.about-wrap .about-text,.about-wrap h1{margin-left:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:100%!important}.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n),.about-wrap .under-the-hood:nth-of-type(3n){margin-top:0}.about-wrap .under-the-hood:nth-of-type(2n) h3,.about-wrap .under-the-hood:nth-of-type(3n) h3{margin-top:0}.about-wrap .floating-header-section{margin-bottom:60px;grid-gap:30px 0}.about-wrap .inline-svg.full-width{margin-bottom:60px}.about-wrap .floating-header-section h2{word-break:break-all;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.about-wrap .floating-header-section .section-content .section-item{max-width:100%;margin:0 0 60px}} \ No newline at end of file +.about-wrap{position:relative;margin:25px 20px 0 40px;max-width:1050px;font-size:15px}.about-wrap.full-width-layout{max-width:1200px}.about-wrap-content{max-width:1050px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:3em 0 0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;width:100%;height:auto;vertical-align:middle}.about-wrap figure{position:relative;margin:0}.about-wrap .feature-section figure img{margin-bottom:0}.about-wrap figcaption{position:absolute;bottom:0;width:100%;padding:40px 10px 15px;overflow:auto;box-sizing:border-box;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);font-weight:600;text-shadow:0 0 5px rgba(0,0,0,.75)}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:#0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;background-position:center 25px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;left:0}.about-wrap .nav-tab{padding-left:15px;padding-right:15px;font-size:18px}.about-wrap p{line-height:1.5;font-size:14px}.about-wrap .feature-section p{max-width:55em;margin-right:auto;margin-left:auto}.about-wrap h1{margin:.2em 0 0 200px;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:40px 0 .6em;font-size:2.7em;line-height:1.3;font-weight:300;text-align:center}.about-wrap h3{margin:1.25em 0 .6em;font-size:1.4em;line-height:1.5}.about-wrap h4{color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap figcaption{font-size:13px;text-align:center;color:#fff;text-overflow:ellipsis}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 0 1em 200px;color:#555d66}.about-wrap [class$="-col"]{display:flex;justify-content:space-between;flex-wrap:wrap}.about-wrap .feature-section.one-col{margin:0 auto;max-width:680px}.about-wrap .inline-svg img{max-width:100%;width:100%;height:auto}.about-wrap .inline-svg.full-width{margin-bottom:120px}.about-wrap [class$="-col"] .col{flex:1}.about-wrap .two-col .col{min-width:47%;max-width:47%}.about-wrap .four-col,.about-wrap .three-col{margin:auto;max-width:1020px}.about-wrap .three-col .col{align-self:flex-start;min-width:31%;max-width:31%}.about-wrap .four-col .col{align-self:flex-start;min-width:23%;max-width:23%}.about-wrap .feature-section.eight-col .col{align-self:flex-start;margin-top:6px;min-width:12%;max-width:12%}.about-wrap .one-col img{margin:1em 0 2em}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-video .mejs-controls{display:none!important}.about-wrap .feature-video .mejs-overlay-loading span{background:0 0}.about-wrap video{margin:1.5em auto}.about-wrap .cta{text-align:center}.about-wrap .cta .button{margin:0 auto 5px;font-weight:600}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em 0;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .lead-description{font-size:1.5em;text-align:center}.about-wrap .two-col-text{column-count:2;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .native-fonts p,.about-wrap .streamlined-updates p{margin-bottom:3em}.about-wrap .under-the-hood img+h3{margin-top:1.25em}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;right:0;width:100%;height:100%}.about-wrap .featured-image{text-align:center}.about-wrap .feature-section{overflow:hidden}.about-wrap .feature-section.no-heading{padding-top:35px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .embed-container{text-align:center}.about-wrap .embed-container iframe{max-width:100%}.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .feature-section .col{margin-top:40px}.about-wrap .changelog{margin-bottom:40px}.about-wrap .changelog.feature-section .col{margin-top:40px}.about-wrap .return-to-dashboard{margin:30px -5px 0 0;font-size:14px;font-weight:600}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -5px 0 -15px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-left:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:right;margin:0 0 10px 10px;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:600}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}.freedoms-php .about-wrap .col .freedoms-image{background-image:url(https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png);background-size:100%;padding-top:100%}.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image{background-position:100% 34%}.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image{background-position:100% 66%}.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image{background-position:100% 100%}@media screen and (max-width:1250px){.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2){margin:0 0 60px}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin:0}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin-right:60px}}@media screen and (max-width:782px){.about-wrap .two-col-text{column-count:1}.about-wrap .four-col .col,.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:48%!important}.about-wrap .eight-col .col{min-width:24%!important}.about-wrap .eight-col img,.about-wrap .four-col img,.about-wrap .three-col img{display:block;margin:0 auto}.about-wrap figcaption{position:relative;margin-top:10px;margin-bottom:15px;padding:0;background:0 0;color:#40464d;text-shadow:none}.about-wrap .floating-header-section{display:block}.about-wrap .floating-header-section .section-content,.about-wrap .floating-header-section .section-header{max-width:100%}.about-wrap .floating-header-section h2{position:static;margin-bottom:60px}}@media only screen and (max-width:500px){.about-wrap{margin-left:20px;margin-right:10px}.about-wrap .about-text,.about-wrap h1{margin-left:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .feature-section .col{margin-top:1em}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:100%!important}.about-wrap .eight-col .col{min-width:48%!important}.about-wrap .under-the-hood.four-col .col,.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n),.about-wrap .under-the-hood:nth-of-type(3n){margin-top:0}.about-wrap .under-the-hood img+h3{margin-top:1.25em}.about-wrap .floating-header-section{margin-bottom:60px;grid-gap:30px 0}.about-wrap .inline-svg.full-width{margin-bottom:60px}.about-wrap .floating-header-section h2{word-break:break-all;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.about-wrap .floating-header-section .section-content .section-item{max-width:100%;margin:0 0 60px}} \ No newline at end of file diff --git a/wp-admin/css/about.css b/wp-admin/css/about.css index b1cfe3ab69..7b20cbce4f 100644 --- a/wp-admin/css/about.css +++ b/wp-admin/css/about.css @@ -40,17 +40,38 @@ .about-wrap hr { border: 0; height: 0; - margin: 0; + margin: 3em 0 0; border-top: 1px solid rgba(0, 0, 0, 0.1); } .about-wrap img { margin: 0; - max-width: 100%; + width: 100%; height: auto; vertical-align: middle; } +.about-wrap figure { + position: relative; + margin: 0; +} + +.about-wrap .feature-section figure img { + margin-bottom: 0; +} + +.about-wrap figcaption { + position: absolute; + bottom: 0; + width: 100%; + padding: 40px 10px 15px; + overflow: auto; + box-sizing: border-box; + background: linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent); + font-weight: 600; + text-shadow: 0px 0px 5px rgba(0,0,0,.75); +} + .about-wrap .jetpack-video-wrapper { margin-bottom: 0; } @@ -132,25 +153,19 @@ color: #23282d; } -.about-wrap .changelog h2 { - font-size: 1.4em; - font-weight: 600; - text-align: left; -} - -.about-wrap .changelog h3 { - margin: 1.33em 0; - font-size: 1em; - line-height: inherit; - color: #23282d; -} - .about-wrap code, .about-wrap ol li p { font-size: 14px; font-weight: 400; } +.about-wrap figcaption { + font-size: 13px; + text-align: center; + color: white; + text-overflow: ellipsis; +} + .about-wrap .about-description, .about-wrap .about-text { margin-top: 1.4em; @@ -161,7 +176,6 @@ .about-wrap .about-text { margin: 1em 200px 1em 0; - min-height: 60px; color: #555d66; } @@ -175,7 +189,7 @@ .about-wrap .feature-section.one-col { margin: 0 auto; - max-width: 700px; + max-width: 680px; } .about-wrap .inline-svg img { @@ -197,12 +211,35 @@ max-width: 47%; } +.about-wrap .three-col, +.about-wrap .four-col { + margin: auto; + max-width: 1020px; +} + .about-wrap .three-col .col { align-self: flex-start; min-width: 31%; max-width: 31%; } +.about-wrap .four-col .col { + align-self: flex-start; + min-width: 23%; + max-width: 23%; +} + +.about-wrap .feature-section.eight-col .col { + align-self: flex-start; + margin-top: 6px; + min-width: 12%; + max-width: 12%; +} + +.about-wrap .one-col img { + margin: 1em 0 2em; +} + .about-wrap .two-col img { margin-bottom: 1.5em; } @@ -215,6 +252,18 @@ background: transparent; /* Hide loading.gif */ } +.about-wrap video { + margin: 1.5em auto; +} + +.about-wrap .cta { + text-align: center; +} +.about-wrap .cta .button { + margin: 0 auto 5px; + font-weight: 600; +} + /* 1.3 - Point Releases */ .about-wrap .point-releases { @@ -255,9 +304,7 @@ } .about-wrap .two-col-text { - -webkit-column-count: 2; column-count: 2; - -webkit-column-gap: 40px; column-gap: 40px; } @@ -270,6 +317,10 @@ margin-bottom: 3em; } +.about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; +} + /* 2.2 - Structure */ .about-wrap .headline-feature.feature-video { @@ -296,7 +347,6 @@ .about-wrap .feature-section { overflow: hidden; - padding: 0 0 40px; } .about-wrap .feature-section.no-heading { @@ -307,10 +357,6 @@ overflow: hidden; } -.about-wrap .feature-section img { - margin-bottom: 1em; -} - .about-wrap .embed-container { text-align: center; } @@ -348,84 +394,6 @@ padding: 0 5px; } -/* 2.3 Floating Header Layout */ - -.about-wrap .floating-header-section { - display: -ms-grid; - display: grid; - grid-gap: 0 60px; - -ms-grid-columns: 5fr 11fr; - grid-template-columns: 5fr 11fr; - max-width: 1020px; - margin: 0 auto 120px; -} - -.about-wrap .floating-header-section .section-header { - -ms-grid-column: 1; - grid-column: 1; - position: relative; - min-width: 230px; - max-width: 300px; -} - -.about-wrap .floating-header-section h2 { - margin: 0; - text-align: left; - position: absolute; -} - -.about-wrap .floating-header-section .section-content { - -ms-grid-column: 2; - grid-column: 2; - display: flex; - justify-content: space-between; - align-items: flex-start; - flex-flow: row wrap; - flex-grow: 2; - flex-shrink: 0; -} - -.about-wrap .floating-header-section .section-item { - flex-grow: 1; - max-width: calc(50% - 30px); -} - -.about-wrap .floating-header-section .section-item:nth-child(1), -.about-wrap .floating-header-section .section-item:nth-child(2) { - margin-bottom: 60px; -} - -.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2), -.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1) { - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title { - display: block; -} - -.about-wrap .floating-header-section.has-long-title .section-header { - max-width: 100%; -} - -.about-wrap .floating-header-section.has-long-title h2 { - position: static; - margin-bottom: 60px; -} - -.about-wrap .floating-header-section.has-long-title .section-content { - justify-content: flex-start; -} - -.about-wrap .floating-header-section.has-long-title .section-item { - max-width: 300px; - margin-bottom: 0; -} - -.about-wrap .floating-header-section.has-long-title .section-item + .section-item { - margin-left: 60px; -} - /*------------------------------------------------------------------------------ 3.0 - Credits & Freedoms Pages ------------------------------------------------------------------------------*/ @@ -513,6 +481,21 @@ margin: 0.6em 0; } +.freedoms-php .about-wrap .col .freedoms-image { + background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png'); + background-size: 100%; + padding-top: 100%; +} +.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image { + background-position: 0 34%; +} +.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image { + background-position: 0 66%; +} +.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image { + background-position: 0 100%; +} + /*------------------------------------------------------------------------------ 4.0 - Media Queries ------------------------------------------------------------------------------*/ @@ -536,20 +519,36 @@ @media screen and (max-width: 782px) { .about-wrap .two-col-text { - -webkit-column-count: 1; column-count: 1; } .about-wrap .two-col .col, - .about-wrap .three-col .col { + .about-wrap .three-col .col, + .about-wrap .four-col .col { min-width: 48% !important; } - .about-wrap .three-col img { + .about-wrap .eight-col .col { + min-width: 24% !important; + } + + .about-wrap .three-col img, + .about-wrap .four-col img, + .about-wrap .eight-col img { display: block; margin: 0 auto; } + .about-wrap figcaption { + position: relative; + margin-top: 10px; + margin-bottom: 15px; + padding: 0; + background: none; + color: #40464D; + text-shadow: none; + } + .about-wrap .floating-header-section { display: block; } @@ -586,11 +585,21 @@ width: 100%; } + .about-wrap .feature-section .col { + margin-top: 1em; + } + .about-wrap .two-col .col, + .about-wrap .three-col .col, .about-wrap .three-col .col { min-width: 100% !important; } + .about-wrap .eight-col .col { + min-width: 48% !important; + } + + .about-wrap .under-the-hood.four-col .col, .about-wrap .under-the-hood.three-col .col, .about-wrap .under-the-hood.two-col .col, .about-wrap .under-the-hood.one-col .col { @@ -603,9 +612,8 @@ margin-top: 0; } - .about-wrap .under-the-hood:nth-of-type(2n) h3, - .about-wrap .under-the-hood:nth-of-type(3n) h3 { - margin-top: 0; + .about-wrap .under-the-hood img + h3 { + margin-top: 1.25em; } .about-wrap .floating-header-section { diff --git a/wp-admin/css/about.min.css b/wp-admin/css/about.min.css index c1552f2572..2e946e8dda 100644 --- a/wp-admin/css/about.min.css +++ b/wp-admin/css/about.min.css @@ -1,2 +1,2 @@ /*! This file is auto-generated */ -.about-wrap{position:relative;margin:25px 40px 0 20px;max-width:1050px;font-size:15px}.about-wrap.full-width-layout{max-width:1200px}.about-wrap-content{max-width:1050px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;max-width:100%;height:auto;vertical-align:middle}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:#0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;background-position:center 25px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;right:0}.about-wrap .nav-tab{padding-right:15px;padding-left:15px;font-size:18px}.about-wrap p{line-height:1.5;font-size:14px}.about-wrap .feature-section p{max-width:55em;margin-left:auto;margin-right:auto}.about-wrap h1{margin:.2em 200px 0 0;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:40px 0 .6em;font-size:2.7em;line-height:1.3;font-weight:300;text-align:center}.about-wrap h3{margin:1.25em 0 .6em;font-size:1.4em;line-height:1.5}.about-wrap h4{color:#23282d}.about-wrap .changelog h2{font-size:1.4em;font-weight:600;text-align:left}.about-wrap .changelog h3{margin:1.33em 0;font-size:1em;line-height:inherit;color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 200px 1em 0;min-height:60px;color:#555d66}.about-wrap [class$="-col"]{display:flex;justify-content:space-between;flex-wrap:wrap}.about-wrap .feature-section.one-col{margin:0 auto;max-width:700px}.about-wrap .inline-svg img{max-width:100%;width:100%;height:auto}.about-wrap .inline-svg.full-width{margin-bottom:120px}.about-wrap [class$="-col"] .col{flex:1}.about-wrap .two-col .col{min-width:47%;max-width:47%}.about-wrap .three-col .col{align-self:flex-start;min-width:31%;max-width:31%}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-video .mejs-controls{display:none!important}.about-wrap .feature-video .mejs-overlay-loading span{background:0 0}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em 0;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .lead-description{font-size:1.5em;text-align:center}.about-wrap .two-col-text{-webkit-column-count:2;column-count:2;-webkit-column-gap:40px;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .native-fonts p,.about-wrap .streamlined-updates p{margin-bottom:3em}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;left:0;width:100%;height:100%}.about-wrap .featured-image{text-align:center}.about-wrap .feature-section{overflow:hidden;padding:0 0 40px}.about-wrap .feature-section.no-heading{padding-top:35px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .feature-section img{margin-bottom:1em}.about-wrap .embed-container{text-align:center}.about-wrap .embed-container iframe{max-width:100%}.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .feature-section .col{margin-top:40px}.about-wrap .changelog{margin-bottom:40px}.about-wrap .changelog.feature-section .col{margin-top:40px}.about-wrap .return-to-dashboard{margin:30px 0 0 -5px;font-size:14px;font-weight:600}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap .floating-header-section{display:-ms-grid;display:grid;grid-gap:0 60px;-ms-grid-columns:5fr 11fr;grid-template-columns:5fr 11fr;max-width:1020px;margin:0 auto 120px}.about-wrap .floating-header-section .section-header{-ms-grid-column:1;grid-column:1;position:relative;min-width:230px;max-width:300px}.about-wrap .floating-header-section h2{margin:0;text-align:left;position:absolute}.about-wrap .floating-header-section .section-content{-ms-grid-column:2;grid-column:2;display:flex;justify-content:space-between;align-items:flex-start;flex-flow:row wrap;flex-grow:2;flex-shrink:0}.about-wrap .floating-header-section .section-item{flex-grow:1;max-width:calc(50% - 30px)}.about-wrap .floating-header-section .section-item:nth-child(1),.about-wrap .floating-header-section .section-item:nth-child(2){margin-bottom:60px}.about-wrap .floating-header-section .section-item:nth-child(1):nth-last-child(2),.about-wrap .floating-header-section .section-item:nth-child(2):nth-last-child(1){margin-bottom:0}.about-wrap .floating-header-section.has-long-title{display:block}.about-wrap .floating-header-section.has-long-title .section-header{max-width:100%}.about-wrap .floating-header-section.has-long-title h2{position:static;margin-bottom:60px}.about-wrap .floating-header-section.has-long-title .section-content{justify-content:flex-start}.about-wrap .floating-header-section.has-long-title .section-item{max-width:300px;margin-bottom:0}.about-wrap .floating-header-section.has-long-title .section-item+.section-item{margin-left:60px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -15px 0 -5px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-right:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:left;margin:0 10px 10px 0;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:600}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}@media screen and (max-width:1250px){.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2){margin:0 0 60px}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin:0}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin-left:60px}}@media screen and (max-width:782px){.about-wrap .two-col-text{-webkit-column-count:1;column-count:1}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:48%!important}.about-wrap .three-col img{display:block;margin:0 auto}.about-wrap .floating-header-section{display:block}.about-wrap .floating-header-section .section-content,.about-wrap .floating-header-section .section-header{max-width:100%}.about-wrap .floating-header-section h2{position:static;margin-bottom:60px}}@media only screen and (max-width:500px){.about-wrap{margin-right:20px;margin-left:10px}.about-wrap .about-text,.about-wrap h1{margin-right:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:100%!important}.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n),.about-wrap .under-the-hood:nth-of-type(3n){margin-top:0}.about-wrap .under-the-hood:nth-of-type(2n) h3,.about-wrap .under-the-hood:nth-of-type(3n) h3{margin-top:0}.about-wrap .floating-header-section{margin-bottom:60px;grid-gap:30px 0}.about-wrap .inline-svg.full-width{margin-bottom:60px}.about-wrap .floating-header-section h2{word-break:break-all;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.about-wrap .floating-header-section .section-content .section-item{max-width:100%;margin:0 0 60px}} \ No newline at end of file +.about-wrap{position:relative;margin:25px 40px 0 20px;max-width:1050px;font-size:15px}.about-wrap.full-width-layout{max-width:1200px}.about-wrap-content{max-width:1050px}.about-wrap .notice,.about-wrap div.error,.about-wrap div.updated{display:none!important}.about-wrap hr{border:0;height:0;margin:3em 0 0;border-top:1px solid rgba(0,0,0,.1)}.about-wrap img{margin:0;width:100%;height:auto;vertical-align:middle}.about-wrap figure{position:relative;margin:0}.about-wrap .feature-section figure img{margin-bottom:0}.about-wrap figcaption{position:absolute;bottom:0;width:100%;padding:40px 10px 15px;overflow:auto;box-sizing:border-box;background:linear-gradient(0deg,rgba(0,0,0,.7),rgba(0,0,0,.3) 60%,transparent);font-weight:600;text-shadow:0 0 5px rgba(0,0,0,.75)}.about-wrap .jetpack-video-wrapper{margin-bottom:0}.wp-badge{background:#0073aa url(../images/w-logo-white.png?ver=20160308) no-repeat;background-position:center 25px;background-size:80px 80px;color:#fff;font-size:14px;text-align:center;font-weight:600;margin:5px 0 0;padding-top:120px;height:40px;display:inline-block;width:140px;text-rendering:optimizeLegibility;box-shadow:0 1px 3px rgba(0,0,0,.2)}.svg .wp-badge{background-image:url(../images/wordpress-logo-white.svg?ver=20160308)}.about-wrap .wp-badge{position:absolute;top:0;right:0}.about-wrap .nav-tab{padding-right:15px;padding-left:15px;font-size:18px}.about-wrap p{line-height:1.5;font-size:14px}.about-wrap .feature-section p{max-width:55em;margin-left:auto;margin-right:auto}.about-wrap h1{margin:.2em 200px 0 0;padding:0;color:#32373c;line-height:1.2em;font-size:2.8em;font-weight:400}.about-wrap h2{margin:40px 0 .6em;font-size:2.7em;line-height:1.3;font-weight:300;text-align:center}.about-wrap h3{margin:1.25em 0 .6em;font-size:1.4em;line-height:1.5}.about-wrap h4{color:#23282d}.about-wrap code,.about-wrap ol li p{font-size:14px;font-weight:400}.about-wrap figcaption{font-size:13px;text-align:center;color:#fff;text-overflow:ellipsis}.about-wrap .about-description,.about-wrap .about-text{margin-top:1.4em;font-weight:400;line-height:1.6em;font-size:19px}.about-wrap .about-text{margin:1em 200px 1em 0;color:#555d66}.about-wrap [class$="-col"]{display:flex;justify-content:space-between;flex-wrap:wrap}.about-wrap .feature-section.one-col{margin:0 auto;max-width:680px}.about-wrap .inline-svg img{max-width:100%;width:100%;height:auto}.about-wrap .inline-svg.full-width{margin-bottom:120px}.about-wrap [class$="-col"] .col{flex:1}.about-wrap .two-col .col{min-width:47%;max-width:47%}.about-wrap .four-col,.about-wrap .three-col{margin:auto;max-width:1020px}.about-wrap .three-col .col{align-self:flex-start;min-width:31%;max-width:31%}.about-wrap .four-col .col{align-self:flex-start;min-width:23%;max-width:23%}.about-wrap .feature-section.eight-col .col{align-self:flex-start;margin-top:6px;min-width:12%;max-width:12%}.about-wrap .one-col img{margin:1em 0 2em}.about-wrap .two-col img{margin-bottom:1.5em}.about-wrap .feature-video .mejs-controls{display:none!important}.about-wrap .feature-video .mejs-overlay-loading span{background:0 0}.about-wrap video{margin:1.5em auto}.about-wrap .cta{text-align:center}.about-wrap .cta .button{margin:0 auto 5px;font-weight:600}.about-wrap .point-releases{margin-top:5px;border-bottom:1px solid #ddd}.about-wrap .changelog.point-releases h3{padding-top:35px}.about-wrap .changelog.point-releases h3:first-child{padding-top:7px}.about-wrap .feature-section.two-col h3{margin-top:0}.about-wrap .feature-section h4{margin:1.4em 0 .6em 0;font-size:1em}.about-wrap .feature-section p{margin-top:.6em}.about-wrap .lead-description{font-size:1.5em;text-align:center}.about-wrap .two-col-text{column-count:2;column-gap:40px}.about-wrap .two-col-text p:first-of-type{margin-top:0}.about-wrap .native-fonts p,.about-wrap .streamlined-updates p{margin-bottom:3em}.about-wrap .under-the-hood img+h3{margin-top:1.25em}.about-wrap .headline-feature.feature-video{position:relative;margin:40px 0;padding-bottom:56.25%;width:100%;max-width:100%;height:0;text-align:center}.about-wrap .feature-video embed{position:absolute;top:0;left:0;width:100%;height:100%}.about-wrap .featured-image{text-align:center}.about-wrap .feature-section{overflow:hidden}.about-wrap .feature-section.no-heading{padding-top:35px}.about-wrap .feature-section .media-container{overflow:hidden}.about-wrap .embed-container{text-align:center}.about-wrap .embed-container iframe{max-width:100%}.about-wrap .wp-embedded-content{max-width:100%}.about-wrap .feature-section .col{margin-top:40px}.about-wrap .changelog{margin-bottom:40px}.about-wrap .changelog.feature-section .col{margin-top:40px}.about-wrap .return-to-dashboard{margin:30px 0 0 -5px;font-size:14px;font-weight:600}.about-wrap .return-to-dashboard a{text-decoration:none;padding:0 5px}.about-wrap h3.wp-people-group{margin:2.6em 0 1.33em;padding:0;font-size:16px;line-height:inherit}.about-wrap .wp-people-group{padding:0 5px;margin:0 -15px 0 -5px}.about-wrap .compact{margin-bottom:0}.about-wrap .wp-person{display:inline-block;vertical-align:top;margin-right:10px;padding-bottom:15px;height:70px;width:280px}.about-wrap .compact .wp-person{height:auto;width:180px;padding-bottom:0;margin-bottom:0}.about-wrap .wp-person .gravatar{float:left;margin:0 10px 10px 0;padding:1px;width:60px;height:60px}.about-wrap .compact .wp-person .gravatar{width:30px;height:30px}.about-wrap .wp-person .web{margin:6px 0 2px;font-size:16px;font-weight:400;line-height:2em;text-decoration:none}.about-wrap .wp-person .title{display:block}.about-wrap #wp-people-group-validators+p.wp-credits-list{margin-top:0}.about-wrap p.wp-credits-list a{white-space:nowrap}.freedoms-php .about-wrap ol{margin:40px 60px}.freedoms-php .about-wrap ol li{list-style-type:decimal;font-weight:600}.freedoms-php .about-wrap ol p{font-weight:400;margin:.6em 0}.freedoms-php .about-wrap .col .freedoms-image{background-image:url(https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png);background-size:100%;padding-top:100%}.freedoms-php .about-wrap .col:nth-of-type(2) .freedoms-image{background-position:0 34%}.freedoms-php .about-wrap .col:nth-of-type(3) .freedoms-image{background-position:0 66%}.freedoms-php .about-wrap .col:nth-of-type(4) .freedoms-image{background-position:0 100%}@media screen and (max-width:1250px){.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2){margin:0 0 60px}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin:0}.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4){margin-left:60px}}@media screen and (max-width:782px){.about-wrap .two-col-text{column-count:1}.about-wrap .four-col .col,.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:48%!important}.about-wrap .eight-col .col{min-width:24%!important}.about-wrap .eight-col img,.about-wrap .four-col img,.about-wrap .three-col img{display:block;margin:0 auto}.about-wrap figcaption{position:relative;margin-top:10px;margin-bottom:15px;padding:0;background:0 0;color:#40464d;text-shadow:none}.about-wrap .floating-header-section{display:block}.about-wrap .floating-header-section .section-content,.about-wrap .floating-header-section .section-header{max-width:100%}.about-wrap .floating-header-section h2{position:static;margin-bottom:60px}}@media only screen and (max-width:500px){.about-wrap{margin-right:20px;margin-left:10px}.about-wrap .about-text,.about-wrap h1{margin-right:0}.about-wrap .about-text{margin-bottom:.25em}.about-wrap .wp-badge{position:relative;margin-bottom:1.5em;width:100%}.about-wrap .feature-section .col{margin-top:1em}.about-wrap .three-col .col,.about-wrap .two-col .col{min-width:100%!important}.about-wrap .eight-col .col{min-width:48%!important}.about-wrap .under-the-hood.four-col .col,.about-wrap .under-the-hood.one-col .col,.about-wrap .under-the-hood.three-col .col,.about-wrap .under-the-hood.two-col .col{margin-bottom:2em;padding-bottom:0}.about-wrap .under-the-hood:nth-of-type(2n),.about-wrap .under-the-hood:nth-of-type(3n){margin-top:0}.about-wrap .under-the-hood img+h3{margin-top:1.25em}.about-wrap .floating-header-section{margin-bottom:60px;grid-gap:30px 0}.about-wrap .inline-svg.full-width{margin-bottom:60px}.about-wrap .floating-header-section h2{word-break:break-all;-webkit-hyphens:auto;-ms-hyphens:auto;hyphens:auto}.about-wrap .floating-header-section .section-content .section-item{max-width:100%;margin:0 0 60px}} \ No newline at end of file diff --git a/wp-admin/freedoms.php b/wp-admin/freedoms.php index ecf44a3ebc..6fe3e690ac 100644 --- a/wp-admin/freedoms.php +++ b/wp-admin/freedoms.php @@ -30,7 +30,7 @@ if ( $is_privacy_notice ) {

-

+

@@ -53,28 +53,52 @@ if ( $is_privacy_notice ) {
-

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>

+
+
+

+

license, the GPL.' ), 'https://wordpress.org/about/license/' ); ?>

+
+
-
    -

    2. -

    3. -

    4. -

    5. -
+
+
+
+

+

+
+
+
+

+

+
+
+
+

+

+
+
+
+

+

+
+
-

check out our trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?>

+
+
+

check out our trademark guidelines first.' ), 'https://wordpressfoundation.org/trademark-policy/' ); ?>

-

- + plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); + ?> +

- printf( __( 'Every plugin and theme in WordPress.org’s directory is 100%% GPL or a similarly free and compatible license, so you can feel safe finding plugins and themes there. If you get a plugin or theme from another source, make sure to ask them if it’s GPL first. If they don’t respect the WordPress license, we don’t recommend them.' ), $plugins_url, $themes_url, 'https://wordpress.org/about/license/' ); - ?> -

- -

Free Software Foundation.' ); ?>

+

Free Software Foundation.' ); ?>

+
+
diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index 58488aa16c..94a8fde67e 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -184,7 +184,11 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { $action = 'save_wporg_username_' . get_current_user_id(); if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( wp_unslash( $_GET['_wpnonce'] ), $action ) ) { $user = isset( $_GET['user'] ) ? wp_unslash( $_GET['user'] ) : get_user_option( 'wporg_favorites' ); - update_user_meta( get_current_user_id(), 'wporg_favorites', $user ); + + // If the save url parameter is passed with a falsey value, don't save the favorite user. + if ( ! isset( $_GET['save'] ) || $_GET['save'] ) { + update_user_meta( get_current_user_id(), 'wporg_favorites', $user ); + } } else { $user = get_user_option( 'wporg_favorites' ); } diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 2cf2f5f3cb..fe438a1f3b 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -2106,6 +2106,13 @@ function upgrade_500() { if ( defined( 'GUTENBERG_USE_PLUGIN' ) && GUTENBERG_USE_PLUGIN ) { return; } + + $was_active = is_plugin_active( 'gutenberg/gutenberg.php' ); + if ( $was_active ) { + // FIXME: Leave until 501 or 510 to clean up. + update_site_option( 'upgrade_500_was_gutenberg_active', '1' ); + } + deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true ); } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 6fce29ddb3..969a9d12e1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44263'; +$wp_version = '5.1-alpha-44264'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.