Merge branch 'master' into master

client/styles.css

@@ -261,7 +261,7 @@ x-peer[transfer] x-icon {
 }
 
 x-peer[transfer] .status:before {
-    content: 'Transfering...';
+    content: 'Transferring...';
 }
 
 x-peer x-icon {
@@ -292,6 +292,7 @@ footer {
     right: 0;
     align-items: center;
     padding: 0 0 16px 0;
+    text-align: center;
 }
 
 footer .logo {
@@ -365,9 +366,22 @@ x-dialog a{
     -webkit-user-select: all;
     -moz-user-select: all;
     user-select: all;
+    white-space: pre;
 }
 
+#receiveTextDialog #text a {
+    cursor: pointer;
+}
 
+#receiveTextDialog #text a:hover {
+    text-decoration: underline;
+}
+
+#receiveTextDialog h3{
+    /* Select the received text when double-clicking the dialog */
+    user-select: none;
+    pointer-events: none;
+}
 
 /* Button */
 
@@ -449,16 +463,19 @@ button::-moz-focus-inner {
 
 /* Text Input */
 
-input {
+input,
+textarea {
     width: 100%;
     box-sizing: border-box;
     border: none;
     outline: none;
     padding: 16px 24px;
-    border-radius: 50px;
+    border-radius: 16px;
     margin: 8px 0;
     line-height: 16px;
     font-size: 14px;
+    font-family: inherit;
+    resize: none;
 }
 
 
@@ -549,6 +566,11 @@ input {
 }
 
 
+/* Generic placeholder */
+[placeholder]:empty:before {
+    content: attr(placeholder);
+}
+
 /* Toast */
 
 .toast-container {
@@ -590,6 +612,7 @@ x-instructions {
     opacity: 0.5;
     transition: opacity 300ms;
     z-index: -1;
+    text-align: center;
 }
 
 x-instructions:before {