Resolve Conflicts

foundation/public/css/erpnext-org-theme.css

@@ -32,11 +32,9 @@
 .dark-bg {
   background-color: #2E3338;
 }
-.left-aligned,
 .text-left {
   text-align: left;
 }
-.right-aligned,
 .text-right {
   text-align: right;
 }
@@ -333,6 +331,12 @@ a:visited {
   max-width: 100%;
   margin: 0 auto;
 }
+@media screen and (min-width: 991px) {
+  .container,
+  .page-content-wrapper {
+    max-width: 991px;
+  }
+}
 @media screen and (min-width: 1199px) {
   .container,
   .page-content-wrapper {

foundation/public/less/base.less

@@ -41,12 +41,10 @@
 	background-color: @text-dark;
 }
 
-.left-aligned,
 .text-left {
 	text-align: left;
 }
 
-.right-aligned,
 .text-right {
 	text-align: right;
 }

foundation/public/less/erpnext-org-theme.less

@@ -102,6 +102,10 @@ a {
 	max-width: 100%;
 	margin: 0 auto;
 
+	@media screen and (min-width: @screen-sm) {
+		max-width: @screen-sm;
+	}
+
 	@media screen and (min-width: @screen-md) {
 		max-width: @screen-md;
 	}

foundation/templates/includes/footer/footer.html

@@ -128,12 +128,31 @@
 					</li>
 				</ul>
 			</div>
-		</div>
 		<script type="text/javascript">
 			frappe.ready(function() {
 				var d = new Date();
 				var currentYear = d.getFullYear();
 				$("#year").text(currentYear);
+				$('.js-subscribe-form').on('submit', function(e) {
+					e.preventDefault();
+					const form = this;
+					const formdata = new FormData(this);
+					const email = formdata.get('email');
+					const input = $(form).find('input');
+					const button = $(form).find('button');
+					erpnext.subscribe_to_newsletter({
+						email,
+						callback(r) {
+							if (!r.exc) {
+								form.reset();
+								button.text('Added');
+								setTimeout(() => {
+									button.text('Subscribe');
+								}, 3000);
+							}
+						}
+					})
+				});
 			});
 		</script>
 	</div>