From beb2108b3e03003b143d65345f9375c21dfd6fa2 Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 13:06:34 +0530 Subject: [PATCH 1/2] AS#125016930691282, Add min height to loading state so separator (border) is correct height -- Added min height --- assets/css/settings/email.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/css/settings/email.scss b/assets/css/settings/email.scss index e8d38e568..cabb86142 100644 --- a/assets/css/settings/email.scss +++ b/assets/css/settings/email.scss @@ -8,6 +8,7 @@ display: flex; justify-content: center; align-items: center; + min-height: 100px; } .newsletters { From c743981fba5895f940d5fc2b281883f52b41f84f Mon Sep 17 00:00:00 2001 From: vikasrohit Date: Mon, 9 May 2016 13:07:12 +0530 Subject: [PATCH 2/2] AS#121262308049584, Reorder newsletter options and add "General Newsletter" -- Renamed 'Developer Newsletter' to 'Development Newsletter' --- app/settings/email/email.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/settings/email/email.controller.js b/app/settings/email/email.controller.js index 443265c54..8e1c2f742 100644 --- a/app/settings/email/email.controller.js +++ b/app/settings/email/email.controller.js @@ -34,7 +34,7 @@ import angular from 'angular' }, { id: CONSTANTS.MAILCHIMP_NL_DEV, - name: 'Developer Newsletter', + name: 'Development Newsletter', desc: 'Software architecture, component assembly, application development, and bug hunting', enabled: false, dirty: false