From 85010912d2a5ce84e43c96c463a34753ca3a915a Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Tue, 18 Dec 2018 22:13:52 +0000
Subject: [PATCH] Updating Twenty Nineteen, the new default theme for 2019.

This update changes the following:

- Reverts the customization to the toolbar for wide and full blocks to make them more usable. More info here: https://github.com/WordPress/twentynineteen/pull/668
- Add `nowrap` to the columns block at breakpoints above `600px`. More info here: https://github.com/WordPress/twentynineteen/pull/674

Props joen, kjellr, allancole.

Fixes #45369.

Merges [44189] into trunk.

See #45424.

git-svn-id: https://develop.svn.wordpress.org/trunk@44300 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentynineteen/sass/blocks/_blocks.scss        | 4 ++++
 src/wp-content/themes/twentynineteen/style-editor.css     | 6 ------
 src/wp-content/themes/twentynineteen/style-editor.scss    | 8 --------
 src/wp-content/themes/twentynineteen/style-rtl.css        | 6 ++++++
 src/wp-content/themes/twentynineteen/style.css            | 6 ++++++
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss b/src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
index 8f3cc05f58..58bc3867d0 100644
--- a/src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
+++ b/src/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
@@ -700,6 +700,10 @@
 			padding-right: $size__spacing-unit;
 		}
 
+		@include media(mobile) {
+			flex-wrap: nowrap;
+		}
+
 		@include media(tablet) {
 			.wp-block-column > * {
 
diff --git a/src/wp-content/themes/twentynineteen/style-editor.css b/src/wp-content/themes/twentynineteen/style-editor.css
index 5906c25666..5bc0ae4549 100644
--- a/src/wp-content/themes/twentynineteen/style-editor.css
+++ b/src/wp-content/themes/twentynineteen/style-editor.css
@@ -58,12 +58,6 @@ body .wp-block[data-align="full"] {
   }
 }
 
-/** === Editor Block Toolbar Position === */
-.editor-block-list__block[data-align="wide"] .editor-block-contextual-toolbar .editor-block-toolbar.editor-block-toolbar,
-.editor-block-list__block[data-align="full"] .editor-block-contextual-toolbar .editor-block-toolbar.editor-block-toolbar {
-  max-width: none;
-}
-
 /** === Content Width === */
 .wp-block {
   width: calc(100vw - (2 * 1rem));
diff --git a/src/wp-content/themes/twentynineteen/style-editor.scss b/src/wp-content/themes/twentynineteen/style-editor.scss
index 51eaaafeba..713c519fae 100644
--- a/src/wp-content/themes/twentynineteen/style-editor.scss
+++ b/src/wp-content/themes/twentynineteen/style-editor.scss
@@ -54,14 +54,6 @@ body {
 	}
 }
 
-/** === Editor Block Toolbar Position === */
-
-// Since 2019 left-aligns wide and fullwide blocks, left align the toolbar too.
-.editor-block-list__block[data-align="wide"] .editor-block-contextual-toolbar .editor-block-toolbar.editor-block-toolbar,
-.editor-block-list__block[data-align="full"] .editor-block-contextual-toolbar .editor-block-toolbar.editor-block-toolbar {
-		max-width: none;
-}
-
 /** === Content Width === */
 
 .wp-block {
diff --git a/src/wp-content/themes/twentynineteen/style-rtl.css b/src/wp-content/themes/twentynineteen/style-rtl.css
index bda04ec07f..5d329773f6 100644
--- a/src/wp-content/themes/twentynineteen/style-rtl.css
+++ b/src/wp-content/themes/twentynineteen/style-rtl.css
@@ -4188,6 +4188,12 @@ body.page .main-navigation {
   padding-left: 1rem;
 }
 
+@media only screen and (min-width: 600px) {
+  .entry .entry-content .wp-block-columns {
+    flex-wrap: nowrap;
+  }
+}
+
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;
diff --git a/src/wp-content/themes/twentynineteen/style.css b/src/wp-content/themes/twentynineteen/style.css
index 0a52b64bf1..6eb328ce94 100644
--- a/src/wp-content/themes/twentynineteen/style.css
+++ b/src/wp-content/themes/twentynineteen/style.css
@@ -4200,6 +4200,12 @@ body.page .main-navigation {
   padding-right: 1rem;
 }
 
+@media only screen and (min-width: 600px) {
+  .entry .entry-content .wp-block-columns {
+    flex-wrap: nowrap;
+  }
+}
+
 @media only screen and (min-width: 768px) {
   .entry .entry-content .wp-block-columns .wp-block-column > *:first-child {
     margin-top: 0;