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:37:09 +01:00
parent 9d0252e989 bed49d0b26
commit 85b49d5ec8
9 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,14 +6,7 @@
<div id="data">
<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 knowmore">Know more</button>-->
<!--<button class="btn btn-secondary tryit">Discover our tools</button>-->
<!--<br>-->
<button class="btn btn-secondary nologin" data-localization="login_nologin"></button>
<!--<button class="btn btn-success nologin">Make a pad right now</button>-->
<!--<p class="buttons"></p>-->
</div>
<div id="buttons" class="buttons"><button class="btn btn-secondary nologin" data-localization="login_nologin"></button></div>
</div>

5
customize.dist/src/less/cryptpad.less
View File

@@ -402,7 +402,7 @@ body.html {
margin: 2px 0px;
cursor: pointer;
&.half {
width: ~"calc(50% - 4px)";
width: ~"calc(50% - 2px)";
&:not(.first) {
float: right;
}
@@ -451,6 +451,9 @@ p.buttons, div.buttons {
cursor: pointer;
margin-top: 10px;
}
.dropdown-bar {
margin-left: 4px;
}
}
#fileManagerIframe {