Merge pull request #2850 from Automattic/fix/barnsbury-logo-header

Barnsbury: updated position of logo when no tagline or title are enabled

barnsbury/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

barnsbury/package.json

@@ -1,6 +1,6 @@
 {
   "name": "barnsbury",
-  "version": "1.2.9",
+  "version": "1.2.10",
   "description": "Barnsbury",
   "bugs": {
     "url": "https://github.com/Automattic/themes/issues"

barnsbury/sass/_extra-child-theme.scss

@@ -72,6 +72,13 @@ a {
 			margin-top: 0;
 			margin-bottom: 0;
 		}
+
+		&.has-logo:not(.has-title-and-tagline) {
+			grid-template-areas:
+				"site-logo main-navigation"
+				"site-logo social-navigation";
+		}
+
 	}
 
 	.site-logo {

barnsbury/sass/style-child-theme.scss

@@ -5,7 +5,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia

barnsbury/style-rtl.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -4046,6 +4046,9 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
+	.site-header.has-logo:not(.has-title-and-tagline) {
+		grid-template-areas: "site-logo main-navigation" "site-logo social-navigation";
+	}
 	.site-logo {
 		grid-area: site-logo;
 		margin-bottom: 16px;

barnsbury/style.css

@@ -6,7 +6,7 @@ Author: Automattic
 Author URI: https://automattic.com/
 Description: Barnsbury is an earthy and friendly theme design with farming and agriculture businesses in mind.
 Requires at least: WordPress 4.9.6
-Version: 1.2.9
+Version: 1.2.10
 License: GNU General Public License v2 or later
 License URI: LICENSE
 Template: varia
@@ -4075,6 +4075,9 @@ body.admin-bar .widget_eu_cookie_law_widget.widget.top {
 		margin-top: 0;
 		margin-bottom: 0;
 	}
+	.site-header.has-logo:not(.has-title-and-tagline) {
+		grid-template-areas: "site-logo main-navigation" "site-logo social-navigation";
+	}
 	.site-logo {
 		grid-area: site-logo;
 		margin-bottom: 16px;