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

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

Browse Source
This commit is contained in:
Pierre Bondoerffer
2017-03-02 17:44:29 +01:00
parent e39fe1c0b7 52793385ea
commit 800db07077
49 changed files with 185 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
customize.dist/src/fragments/appscript.html
View File

@@ -1,3 +1,2 @@
<link rel="stylesheet" type="text/css" href="main.css" />
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
<script data-bootload="main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>

1
customize.dist/src/fragments/empty.html
View File

@@ -1,2 +1 @@
<script data-main="main" src="/bower_components/requirejs/require.js"></script>
<div id="container"></div>

3
customize.dist/src/fragments/script.html
View File

@@ -1,2 +1 @@
<script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
<script data-bootload="/customize/main.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>

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

@@ -861,8 +861,6 @@ form.realtime, div.realtime {
max-width: 90%;
max-height: 90%;
margin: auto;
border: 5px solid red;
}
}
}

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

@@ -309,7 +309,10 @@
float: left;
margin-bottom: -1px;
.cryptpad-user-list {
float: right;
//float: right;
pre {
white-space: pre;
}
}
button {
margin: 2px 4px 2px 0px;

9
customize.dist/src/template.html
View File

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html class="cp">
<!-- If this file is not called customize.dist/src/template.html, it is generated -->
<head>
<title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
<meta content="text/html; charset=utf-8" http-equiv="content-type"/>
@@ -10,13 +11,6 @@
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
<link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
{{script}}
<script src="/bower_components/requirejs/require.js"></script>
<script>
require.config({
waitSeconds: 60,
urlArgs: "bust=1.1.0",
});
</script>
</head>
<body class="html">
{{topbar}}
@@ -30,4 +24,3 @@
{{footer}}
</body>
</html>