Twenty Nineteen: Fixes and improvements.

This commit brings over several changes that occurred upstream in the theme’s GitHub repository into core. - Fix left/right-aligned pullquote spacing. WordPress/twentynineteen#695 - Improve `readme.txt` to follow the correct standards for themes. WordPress/twentynineteen#689 Props kjellr, allancole. See #45424. Built from https://develop.svn.wordpress.org/branches/5.0@44201 git-svn-id: http://core.svn.wordpress.org/branches/5.0@44031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
markjaquith · Dec 15, 2018 · 09b7e36 · 09b7e36
1 parent 0c05a12
commit 09b7e36
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 70 deletions.
diff --git a/wp-content/themes/twentynineteen/readme.txt b/wp-content/themes/twentynineteen/readme.txt
@@ -1,64 +1,22 @@
-# Twenty Nineteen
+=== Twenty Nineteen ===
+Contributors: the WordPress team
+Tags: one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
+Requires at least: 4.9.6
+Tested up to: 5.0
+Stable tag: 1.0
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-[![Build Status](https://travis-ci.org/WordPress/twentynineteen.svg?branch=master)](https://travis-ci.org/WordPress/twentynineteen)
+Our 2019 default theme is designed to show off the power of the block editor.
 
-**Contributors:** the WordPress team  
-**Requires at least:** WordPress 4.9.6  
-**Tested up to:** WordPress 4.9.8  
-**Version:** 1.0  
-**License:** GPLv2 or later  
-**License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
-**Tags:** one-column, flexible-header, accessibility-ready, custom-colors, custom-menu, custom-logo, editor-style, featured-images, footer-widgets, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready
+== Description ==
+Our 2019 default theme is designed to show off the power of the block editor. It features custom styles for all the default blocks, and is built so that what you see in the editor looks like what you'll see on your website. Twenty Nineteen is designed to be adaptable to a wide range of websites, whether you’re running a photo blog, launching a new business, or supporting a non-profit. Featuring ample whitespace and modern sans-serif headlines paired with classic serif body text, it's built to be beautiful on all screen sizes.
 
-## Description
+== Changelog ==
 
-Twenty Nineteen is a Gutenberg-ready theme for WordPress.
+= 1.0 =
+* Initial Release
 
-## Installation
-
-1. In your admin panel, go to Appearance -> Themes and click the 'Add New' button.
-2. Type in Twenty Nineteen in the search form and press the 'Enter' key on your keyboard.
-3. Click on the 'Activate' button to use your new theme right away.
-4. Go to https://codex.wordpress.org/Twenty_Nineteen for a guide on how to customize this theme.
-5. Navigate to Appearance > Customize in your admin panel and customize to taste.
-
-## Copyright
-
-Twenty Nineteen WordPress Theme, Copyright 2018 WordPress.org
-Twenty Nineteen is distributed under the terms of the GNU GPL.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-Twenty Nineteen bundles the following third-party resources:
-
-_s, Copyright 2015-2018 Automattic, Inc.
-**License:** GPLv2 or later
-Source: https://github.com/Automattic/_s/
-
-normalize.css, Copyright 2012-2016 Nicolas Gallagher and Jonathan Neal
-**License:** MIT
-Source: https://necolas.github.io/normalize.css/
-
-Bundled header image 1, Copyright XXXXX XXXXX
-**License:** CC0 1.0 Universal (CC0 1.0)
-Source: https://pexels.com/xxxxxxxxxx
-
-Bundled header image 2, Copyright XXXXX XXXXX
-**License:** CC0 1.0 Universal (CC0 1.0)
-Source: https://pexels.com/xxxxxxxxxx
-
-## Changelog
-
-### 1.0
-
-* Released: December 6, 2018
-
-Initial release
+== Resources ==
+* normalize.css, © 2012-2018 Nicolas Gallagher and Jonathan Neal, MIT
+* Underscores, © 2012-2018 Automattic, Inc., GNU GPL v2 or later
diff --git a/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss b/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
@@ -363,10 +363,14 @@
 			padding: 0;
 
 			blockquote {
-				margin-left: 0;
+				margin: $size__spacing-unit 0;
 				padding: 0;
 				text-align: left;
 				max-width: 100%;
+
+				p:first-child {
+					margin-top: 0;
+				}
 			}
 		}
 
@@ -400,10 +404,11 @@
 			}
 
 			blockquote {
-				max-width: calc(100% - (2 * #{$size__spacing-unit}));
+				max-width: 100%;
 				color: $color__background-body;
 				padding-left: 0;
 				margin-left: $size__spacing-unit;
+				margin-right: $size__spacing-unit;
 
 				&.has-text-color p,
 				&.has-text-color a,
@@ -421,6 +426,13 @@
 				}
 			}
 
+			&.alignright,
+			&.alignleft {
+				@include media(tablet) {
+					padding: $size__spacing-unit calc(2 * #{$size__spacing-unit});
+				}
+			}
+
 			&.alignfull {
 
 				@include media(tablet) {
@@ -541,7 +553,7 @@
 			width: 100%;
 
 			@include media(tablet) {
-				padding: $size__spacing-unit;
+				padding: $size__spacing-unit calc(2 * #{$size__spacing-unit});
 			}
 		}
 

diff --git a/wp-content/themes/twentynineteen/style-editor.css b/wp-content/themes/twentynineteen/style-editor.css
@@ -760,5 +760,5 @@ ul.wp-block-archives li ul,
 
 /* Make sure our non-latin font overrides don't overwrite the iconfont used in the classic editor toolbar */
 .wp-block[data-type="core/freeform"] .mce-btn i {
-	font-family: dashicons !important;
+  font-family: dashicons !important;
 }
diff --git a/wp-content/themes/twentynineteen/style-rtl.css b/wp-content/themes/twentynineteen/style-rtl.css
@@ -3805,12 +3805,16 @@ body.page .main-navigation {
 }
 
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
-  margin-right: 0;
+  margin: 1rem 0;
   padding: 0;
   text-align: right;
   max-width: 100%;
 }
 
+.entry .entry-content .wp-block-pullquote.alignleft blockquote p:first-child, .entry .entry-content .wp-block-pullquote.alignright blockquote p:first-child {
+  margin-top: 0;
+}
+
 .entry .entry-content .wp-block-pullquote.is-style-solid-color {
   background-color: #0073aa;
   padding-right: 0;
@@ -3846,10 +3850,11 @@ body.page .main-navigation {
 }
 
 .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote {
-  max-width: calc(100% - (2 * 1rem));
+  max-width: 100%;
   color: #fff;
   padding-right: 0;
   margin-right: 1rem;
+  margin-left: 1rem;
 }
 
 .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-text-color p,
@@ -3864,6 +3869,12 @@ body.page .main-navigation {
   }
 }
 
+@media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignright, .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignleft {
+    padding: 1rem calc(2 * 1rem);
+  }
+}
+
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignfull {
     padding-right: calc(10% + 58px + (2 * 1rem));
@@ -3992,7 +4003,7 @@ body.page .main-navigation {
   .entry .entry-content .wp-block-cover-image.alignleft, .entry .entry-content .wp-block-cover-image.alignright,
   .entry .entry-content .wp-block-cover.alignleft,
   .entry .entry-content .wp-block-cover.alignright {
-    padding: 1rem;
+    padding: 1rem calc(2 * 1rem);
   }
 }
 

diff --git a/wp-content/themes/twentynineteen/style.css b/wp-content/themes/twentynineteen/style.css
@@ -3817,12 +3817,16 @@ body.page .main-navigation {
 }
 
 .entry .entry-content .wp-block-pullquote.alignleft blockquote, .entry .entry-content .wp-block-pullquote.alignright blockquote {
-  margin-left: 0;
+  margin: 1rem 0;
   padding: 0;
   text-align: left;
   max-width: 100%;
 }
 
+.entry .entry-content .wp-block-pullquote.alignleft blockquote p:first-child, .entry .entry-content .wp-block-pullquote.alignright blockquote p:first-child {
+  margin-top: 0;
+}
+
 .entry .entry-content .wp-block-pullquote.is-style-solid-color {
   background-color: #0073aa;
   padding-left: 0;
@@ -3858,10 +3862,11 @@ body.page .main-navigation {
 }
 
 .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote {
-  max-width: calc(100% - (2 * 1rem));
+  max-width: 100%;
   color: #fff;
   padding-left: 0;
   margin-left: 1rem;
+  margin-right: 1rem;
 }
 
 .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-text-color p,
@@ -3876,6 +3881,12 @@ body.page .main-navigation {
   }
 }
 
+@media only screen and (min-width: 768px) {
+  .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignright, .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignleft {
+    padding: 1rem calc(2 * 1rem);
+  }
+}
+
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-pullquote.is-style-solid-color.alignfull {
     padding-left: calc(10% + 58px + (2 * 1rem));
@@ -4004,7 +4015,7 @@ body.page .main-navigation {
   .entry .entry-content .wp-block-cover-image.alignleft, .entry .entry-content .wp-block-cover-image.alignright,
   .entry .entry-content .wp-block-cover.alignleft,
   .entry .entry-content .wp-block-cover.alignright {
-    padding: 1rem;
+    padding: 1rem calc(2 * 1rem);
   }
 }
 

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0.2-alpha-44200';
+$wp_version = '5.0.2-alpha-44201';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.