From 0a99478d9f12cd4fc1218e0b4e23a1ef4905c7e1 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 28 Sep 2017 11:50:35 +0200
Subject: [PATCH 1/2] catch diffdom errors and plow through

---
 www/slide/slide.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/slide/slide.js b/www/slide/slide.js
index 3477a6a32..4bfcacc4f 100644
--- a/www/slide/slide.js
+++ b/www/slide/slide.js
@@ -83,7 +83,7 @@ define([
         var c = Slide.content;
         var m = '<span class="cp-app-slide-container"><span class="'+slideClass+'">'+DiffMd.render(c).replace(separatorReg, '</span></span><span class="cp-app-slide-container"><span class="'+slideClass+'">')+'</span></span>';
 
-        DiffMd.apply(m, $content);
+        try { DiffMd.apply(m, $content); } catch (e) { return console.error(e); }
 
         var length = getNumberOfSlides();
         $modal.find('style.cp-app-slide-style').remove();

From 21f1a48380ee480088e59c1a1d49a391b9bee031 Mon Sep 17 00:00:00 2001
From: CatalinScr <catalin.scr@gmail.com>
Date: Mon, 9 Oct 2017 17:17:33 +0300
Subject: [PATCH 2/2] changed the login in button

---
 customize.dist/pages.js                        |  3 +--
 customize.dist/src/less2/pages/page-login.less | 16 ++++------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 55945ccd2..a50201f2d 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -558,8 +558,7 @@ define([
                             placeholder: Msg.login_password,
                         }),
                         h('div.extra', [
-                            h('button.login.first.btn', Msg.login_login),
-                            h('button#register.btn.register.cp-login-register', Msg.login_register)
+                            h('button.login.first.btn', Msg.login_login)
                         ])
                     ])
                 ]),
diff --git a/customize.dist/src/less2/pages/page-login.less b/customize.dist/src/less2/pages/page-login.less
index 3e5e4e77f..2b8064486 100644
--- a/customize.dist/src/less2/pages/page-login.less
+++ b/customize.dist/src/less2/pages/page-login.less
@@ -54,19 +54,11 @@
     }
     .extra {
     	margin-top: 1em;
-    	.cp-login-register {
-    		color: @cryptpad_color_blue;
-	        background: #fff;
-	        border: 2px solid @cryptpad_color_blue;
-	        border-radius: 0;
-	        &:hover {
-	            transform: scale(1.05);
-	        }
-    	}
     	.login {
-    		background: transparent;
-    		color: @cryptpad_color_blue;
-    		padding: 0;
+    		background: @cryptpad_color_blue;
+    		color: #fff;
+    		padding: 10px;
+            border-radius: 0;
     		&:hover {
 	            transform: scale(1.05);
 	        }