Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin

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.login.first.btn', Msg.login_login)
-                            h('button#register.btn.register.cp-login-register', Msg.login_register)
                         ])
                     ])
                 ]),

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;
+    		background: @cryptpad_color_blue;
-    		color: @cryptpad_color_blue;
+    		color: #fff;
-    		padding: 0;
+    		padding: 10px;
+            border-radius: 0;
     		&:hover {
 	            transform: scale(1.05);
 	        } 

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();