Merge branch 'staging' into locks

2019-01-24 16:27:15 +01:00
parent 024eafaf32 e993925d81
commit ed4f8016a1
42 changed files with 663 additions and 213 deletions
--- a/customize.dist/src/less2/include/cursor.less
+++ b/customize.dist/src/less2/include/cursor.less
@@ -8,6 +8,8 @@
        border: 2px solid red;
        border-right-color: transparent !important;
        border-left-color: transparent !important;
+        margin-left: -3px;
+        margin-right: -3px;
    }
    .cp-codemirror-selection {
        background-color: rgba(255,0,0,0.3);
--- a/customize.dist/src/less2/pages/page-login.less
+++ b/customize.dist/src/less2/pages/page-login.less
@@ -61,6 +61,16 @@
                    transform: scale(1.05);
                }
            }
+            #register {
+                border-color: @cryptpad_color_blue;
+                background: #fff;
+                color: @cryptpad_color_blue;
+                padding: 10px;
+                border-radius: 0;
+                &:hover {
+                    transform: scale(1.05);
+                }
+            }
        }
    }
    .cp-container {