From 84fe973c7f0668a107b04bee4d7877114be869c1 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 12:03:44 -0400
Subject: [PATCH 1/6] Vertically align description in spring promo modal.
 Change links to 12px to fix breakage in Russian

---
 .../PlusPromoModalContent.jsx                 |  2 +-
 .../PlusPromoModalContent.scss                | 22 +++++--------------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
index e62442567..e67915be4 100644
--- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
+++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
@@ -46,7 +46,7 @@ const PlusPromoModalContent = (props) => {
 						<span>{t('upgrade_to_plus').toUpperCase()}</span>
 					</button>
 				</div>
-				<div>
+				<div className="PlusPromoModal__text-link-container">
 					{!loggedIn &&
 						<span className="PlusPromoModal__link sign-in" onClick={handleSignInClick}>{t('subscribe_pitch_sign_in_plus')}</span>
 					}
diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
index 7d43f0ab1..6bb0c6120 100644
--- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
+++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
@@ -45,8 +45,10 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 		margin-top: 8px;
 	}
 	.description {
-		font-size: 18px;
-		margin-top: 16px;
+		height: 131px;
+		display: flex;
+		align-items: center;
+		font-size: 15px;
 		font-weight: 500;
 		color: $tundora;
 		width: 350px;
@@ -158,26 +160,14 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 
 .PlusPromoModal__text-link-container {
   display: flex;
-  justify-content: space-around; // Edge does not support space-evenly
+  justify-content: space-evenly; // Edge does not support space-evenly
 }
 
 .PlusPromoModal__link {
-  margin-left: 10px;
-  margin-right: 10px;
-  font-size: 15px;
+  font-size: 12px;
   font-family: $standard-font-family;
   color: #4a4a4a;
   text-decoration: underline;
   text-align: center;
 	cursor: pointer;
-
-	&.sign-in {
-		float: left;
-		left: 10px;
-	}
-
-	&.turn-promos-off {
-		float: right;
-		right: 10px;
-	}
 }

From 1b876e8bc745f7148f6bf4fc97b59fc6166d1397 Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 12:04:29 -0400
Subject: [PATCH 2/6] Remove unused css class

---
 .../PlusPromoModalContent/PlusPromoModalContent.scss         | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
index 6bb0c6120..0a271027f 100644
--- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
+++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
@@ -31,11 +31,6 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
   background-image: url('/app/images/panel/spring-plus-logo.svg');
 }
 
-.PlusPromoModal__main-content-container {
-  height: 210px;
-  display: flex;
-  justify-content: center;
-}
 .PlusPromoModal__header {
 	text-align: center;
 	font-weight: bold;

From 7813a0794dedfe5ae6fbd9caa2ba8e5ddb6cedaa Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 12:36:55 -0400
Subject: [PATCH 3/6] Spring promo modal text links use space-around

---
 .../PlusPromoModalContent/PlusPromoModalContent.scss            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
index 0a271027f..4c3df2518 100644
--- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
+++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.scss
@@ -155,7 +155,7 @@ $condensed-font-family: Roboto Condensed, "Open Sans", "Helvetica Neue", Helveti
 
 .PlusPromoModal__text-link-container {
   display: flex;
-  justify-content: space-evenly; // Edge does not support space-evenly
+  justify-content: space-around; // Edge does not support space-evenly
 }
 
 .PlusPromoModal__link {

From fa69d80d1486a3c2987690fbea82dd55632ce75c Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 12:55:54 -0400
Subject: [PATCH 4/6] Change caret orientation

---
 app/panel/components/Blocking/Category.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/panel/components/Blocking/Category.jsx b/app/panel/components/Blocking/Category.jsx
index fe9be3483..d62167d10 100644
--- a/app/panel/components/Blocking/Category.jsx
+++ b/app/panel/components/Blocking/Category.jsx
@@ -161,8 +161,8 @@ class Category extends React.Component {
 		const { isExpanded } = this.state;
 		const { isUnknown } = this.props;
 		const caretClasses = ClassNames(this.context, {
-			'caret-down': isExpanded,
-			'caret-up': !isExpanded,
+			'caret-down': !isExpanded,
+			'caret-up': isExpanded,
 			Category__antiTrackingCaret: isUnknown
 		});
 		return (

From 8ebad49731b63f8b9b304c2444f9d4f89e8e757f Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 13:47:05 -0400
Subject: [PATCH 5/6] Remove more unused css

---
 .../PlusPromoModalContent.jsx                      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
index e67915be4..8a7ca078c 100644
--- a/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
+++ b/app/shared-components/ModalContent/PlusPromoModalContent/PlusPromoModalContent.jsx
@@ -30,14 +30,12 @@ const PlusPromoModalContent = (props) => {
 	return (
 		<div className="flex-container flex-dir-column align-middle">
 			<div className="PlusPromoModal__plus-logo" />
-			<div className="PlusPromoModal__main-content-container">
-				<div className="PlusPromoModal__header">
-					<div className="title">
-						<div>{t('spring_is_here')}</div>
-					</div>
-					<div className="description">
-						<div dangerouslySetInnerHTML={{ __html: t('subscribe_pitch_spring') }} />
-					</div>
+			<div className="PlusPromoModal__header">
+				<div className="title">
+					<div>{t('spring_is_here')}</div>
+				</div>
+				<div className="description">
+					<div dangerouslySetInnerHTML={{ __html: t('subscribe_pitch_spring') }} />
 				</div>
 			</div>
 			<div className="PlusPromoModal__call-to-action-container">

From 792e3c311ea2a503f442ed2a4a02da34b922d44b Mon Sep 17 00:00:00 2001
From: Ben <benjamin.strumeyer@gmail.com>
Date: Tue, 5 May 2020 14:21:48 -0400
Subject: [PATCH 6/6] Fix caret

---
 app/images/panel/caret-down.svg            | 2 +-
 app/images/panel/caret-up.svg              | 2 +-
 app/panel/components/Blocking/Category.jsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/images/panel/caret-down.svg b/app/images/panel/caret-down.svg
index 3464f9f1e..c221b0230 100644
--- a/app/images/panel/caret-down.svg
+++ b/app/images/panel/caret-down.svg
@@ -1,3 +1,3 @@
 <svg width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
-  <path d="M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06" fill="#4A4A4A" fill-rule="evenodd"/>
+  <path d="M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z" fill="#4A4A4A" fill-rule="evenodd"/>
 </svg>
diff --git a/app/images/panel/caret-up.svg b/app/images/panel/caret-up.svg
index c221b0230..3464f9f1e 100644
--- a/app/images/panel/caret-up.svg
+++ b/app/images/panel/caret-up.svg
@@ -1,3 +1,3 @@
 <svg width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
-  <path d="M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z" fill="#4A4A4A" fill-rule="evenodd"/>
+  <path d="M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06" fill="#4A4A4A" fill-rule="evenodd"/>
 </svg>
diff --git a/app/panel/components/Blocking/Category.jsx b/app/panel/components/Blocking/Category.jsx
index d62167d10..4dafc5879 100644
--- a/app/panel/components/Blocking/Category.jsx
+++ b/app/panel/components/Blocking/Category.jsx
@@ -167,7 +167,7 @@ class Category extends React.Component {
 		});
 		return (
 			<svg className={caretClasses} onClick={this.toggleCategoryTrackers} width="11" height="7" viewBox="0 0 11 7" xmlns="http://www.w3.org/2000/svg">
-				<path d={isExpanded ? 'M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06' : 'M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z'} fillRule="evenodd" />
+				<path d={isExpanded ? 'M1.283 7L0 5.676 5.5 0 11 5.676 9.717 7 5.5 2.649z' : 'M1.21.02L-.02 1.25l5.27 5.27 5.27-5.27L9.29.02 5.25 4.06'} fillRule="evenodd" />
 			</svg>
 		);
 	}