web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
ansuz
2017-02-02 18:49:17 +01:00
parent 26a4b0c18f f57c8c0e4b
commit 0ad95142f5
12 changed files with 138 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
customize.dist/src/fragments/index.html
View File

@@ -3,14 +3,14 @@
<div id="main">
<div class="mainOverlay"></div>
<div id="main-container">
<div id="data">
<div id="data" class="hidden">
<p class="left" data-localization="main_p1"><!-- Zero Knowledge collaborative realtime editor. Protected from the NSA. --></p>
<div id="buttons" class="buttons"><button class="btn btn-secondary nologin" data-localization="login_nologin"></button></div>
</div>
<div id="userForm" class="form-group">
<div id="userForm" class="form-group hidden">
<!--<center>
<h1 data-localization="form_title"></h1>
</center>-->
@@ -22,6 +22,11 @@
<div style="display: none;"><span class="remember form-check"><label for="rememberme" class="form-check-label" data-localization-append="login_remember"><input type="checkbox" id="rememberme" class="form-check-input" checked="checked"></label></span><br></div>
<button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-primary register half" data-localization="login_register"></button><br>
</div>
<div id="loggedIn" class="hidden">
<p id="loggedInHello"></p>
<p><button class="btn btn-primary nologin" data-localization="login_accessDrive"></button></p>
<p><button id="loggedInLogOut" class="btn btn-secondary" data-localization="logoutButton"></button></p>
</div>
</div>
</div>
<div class="page category first" id="knowmore">

33
customize.dist/src/less/cryptpad.less
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;