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

This commit is contained in:
ansuz
2017-02-02 18:49:17 +01:00
12 changed files with 138 additions and 54 deletions

View File

@@ -251,11 +251,6 @@ body.html {
opacity: 0.35;
}
}
#mainBlock {
&.hidden {
display: none;
}
}
#noscriptContainer {
color: black;
position: absolute;
@@ -287,6 +282,9 @@ body.html {
background-size: cover;
background-attachment: fixed;
background-position: center;
.hidden {
display: none !important;
}
}
#main_other {
padding: 0 @main-border-width;
@@ -355,6 +353,31 @@ body.html {
}
}
#loggedIn {
color: @main-color;
display: inline-block;
position: absolute;
top: 50%;
right: 0;
margin-left: 50px;
width: 350px;
max-width: 35%;
transform: translateY(-50%);
text-align: center;
font-weight: bold;
button {
font-weight: bold;
cursor: pointer;
}
p {
margin: 20px;
padding: 0;
font-size: 20px;
line-height: 1.5em;
}
}
#userForm {
position: absolute;
right: 0;