From f33df7cde4f1633c702cb9a179012c792acfc05a Mon Sep 17 00:00:00 2001
From: Jonathan Desrosiers <desrosj@git.wordpress.org>
Date: Thu, 2 May 2019 10:36:02 +0000
Subject: [PATCH] Help/About: Fix tab display issues.

This change restores About page tab heights and fixes bugs with the tab bottom border caused by [44905] and [45243].

Reviewed by SergeyBiryukov and desrosj.

Props ixkaito, ianbelanger, afercia, SergeyBiryukov.
See #46901.
Fixes #47075.

git-svn-id: https://develop.svn.wordpress.org/trunk@45276 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/about.css          |  1 +
 src/wp-admin/css/colors/_admin.scss |  2 +-
 src/wp-admin/css/common.css         | 11 +++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css
index 1b172106d6..fff8f62769 100644
--- a/src/wp-admin/css/about.css
+++ b/src/wp-admin/css/about.css
@@ -111,6 +111,7 @@
 	padding-right: 15px;
 	padding-left: 15px;
 	font-size: 18px;
+	line-height: 1.33333333;
 }
 
 /* 1.1 - Typography */
diff --git a/src/wp-admin/css/colors/_admin.scss b/src/wp-admin/css/colors/_admin.scss
index bd1f3bd9d8..4827ed6cc2 100644
--- a/src/wp-admin/css/colors/_admin.scss
+++ b/src/wp-admin/css/colors/_admin.scss
@@ -130,7 +130,7 @@ input[type=radio]:checked:before {
 
 /* Active tabs use a bottom border color that matches the page background color. */
 
-.about-wrap h2 .nav-tab-active,
+.about-wrap .nav-tab-active,
 .nav-tab-active,
 .nav-tab-active:hover {
 	background-color: $body-background;
diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 7765a72d2a..8fb97121b2 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2171,7 +2171,7 @@ html.wp-toolbar {
 	margin-left: 0.5em; /* half the font size so set the font size properly */
 	padding: 5px 10px;
 	font-size: 14px;
-	line-height: 1.8;
+	line-height: 1.71428571;
 	font-weight: 600;
 	background: #e5e5e5;
 	color: #555;
@@ -3999,10 +3999,17 @@ img {
 
 	h1 .nav-tab,
 	h2 .nav-tab,
-	h3 .nav-tab {
+	h3 .nav-tab,
+	nav .nav-tab {
 		margin: 10px 10px 0 0;
 		border-bottom: 1px solid #ccc;
 	}
+
+	.nav-tab-active:hover,
+	.nav-tab-active:focus,
+	.nav-tab-active:focus:active {
+		border-bottom: 1px solid #ccc;
+	}
 }
 
 @media screen and (max-width: 320px) {