manual merge of staging

2017-07-13 10:30:42 +02:00
parent 25905d13fa 607d4fa57e
commit f6abdc2b86
61 changed files with 805 additions and 739 deletions
--- a/customize.dist/src/less/cryptpad.less
+++ b/customize.dist/src/less/cryptpad.less
@@ -112,17 +112,19 @@ h6 {
    padding-top: .65001rem;
 }

-a:not(.btn) {
-    cursor: pointer;
-    color: @cp-link;
+p {
+    a:not(.btn) {
+        cursor: pointer;
+        color: @cp-link;

-    text-decoration: none;
+        text-decoration: none;

-    &:hover {
-        color: @cp-link-hover;
-    }
-    &:visited {
-        color: @cp-link-visited;
+        &:hover {
+            color: @cp-link-hover;
+        }
+        &:visited {
+            color: @cp-link-visited;
+        }
    }
 }
 a.btn {