Merge branch 'staging' into framework

2017-10-12 17:07:10 +03:00
parent c773b5d076 8e1f15e88d
commit 753e2d797e
21 changed files with 391 additions and 260 deletions
--- 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);
 	        }