Merge pull request #800 from appirio-tech/feature/mailchimp

vikasrohit · vikasrohit · commit 709113fe5d0d · 2016-05-09T13:16:53.000+05:30
Feature/mailchimp
diff --git 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
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import angular from 'angular'`
`34`	`34`	`},`
`35`	`35`	`{`
`36`	`36`	`id: CONSTANTS.MAILCHIMP_NL_DEV,`
`37`		`- name: 'Developer Newsletter',`
	`37`	`+ name: 'Development Newsletter',`
`38`	`38`	`desc: 'Software architecture, component assembly, application development, and bug hunting',`
`39`	`39`	`enabled: false,`
`40`	`40`	`dirty: false`