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

pull/1/head
ansuz 4 years ago
commit 8c270cc301

@ -154,12 +154,11 @@
flex-flow: column;
margin: 20px 0px 100px 0px;
&> div:first-child {
border-right: 1px solid fade(@cryptpad_text_col, 25%);
display: flex;
height: 100%;
align-items: center;
padding-right: 10px;
margin-right: 10px;
margin-bottom: 10px;
i {
color: @cryptpad_text_col;
font-size: 30px;
@ -171,7 +170,6 @@
display: flex;
flex-flow: column;
justify-content: space-around;
margin-left: 50px;
button:not(:last-child) {
margin-right: 5px;
}
@ -285,6 +283,11 @@
}
.cp-form-block-content {
overflow-x: auto;
p {
a {
color: @cryptpad_color_link;
}
}
.cp-form-page-break-edit {
font-size: 20px;
text-align: center;

Loading…
Cancel
Save