Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

pull/1/head
ansuz 2020-02-10 10:01:06 -05:00
commit cff663e876
2 changed files with 7 additions and 1 deletions

View File

@ -38,7 +38,7 @@ define([
hideDuplicate: true
},
general: {
allowUserFeedback: true // XXX corner popup in settings?
allowUserFeedback: true
}
};

View File

@ -42,6 +42,12 @@
.cp-app-contacts-container {
height: 100%;
}
.cp-app-contacts-input {
textarea {
border: 0px;
color: white;
}
}
}
& > .cp-team-drive {
display: flex;