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:
yflory 2018-01-18 10:54:08 +01:00
commit 51b4d269be
5 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/pages.js
View File

@ -72,7 +72,7 @@ define([
]) ])
]) ])
]), ]),
h('div.cp-version-footer', "CryptPad v1.24.0 (Yeti)") h('div.cp-version-footer', "CryptPad v1.25.0 (Zombie)")
]); ]);
}; };

8
customize.dist/src/less2/include/limit-bar.less
View File

@ -8,17 +8,19 @@
width: 100%; width: 100%;
margin-top: 20px; margin-top: 20px;
.cp-limit-bar { .cp-limit-bar {
padding: 5px;
display: inline-block; display: inline-block;
max-width: 100%; max-width: 100%;
margin: 3px; margin: 3px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #999; border-top: 1px solid #999;
background: white; background: white;
position: relative; position: relative;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
width: ~"calc(100% - 6px)"; width: ~"calc(100% - 6px)";
height: 25px; height: 35px;
line-height: 25px; line-height: 25px;
overflow: hidden; overflow: hidden;
.cp-limit-usage { .cp-limit-usage {
@ -40,7 +42,7 @@
} }
.cp-limit-usage-text { .cp-limit-usage-text {
position: relative; position: relative;
color: black; color: grey;
text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white; text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
z-index: 2; // .usageText z-index: 2; // .usageText
font-size: @colortheme_app-font-size; font-size: @colortheme_app-font-size;

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cryptpad", "name": "cryptpad",
"description": "realtime collaborative visual editor with zero knowlege server", "description": "realtime collaborative visual editor with zero knowlege server",
"version": "1.24.0", "version": "1.25.0",
"dependencies": { "dependencies": {
"chainpad-server": "^1.0.1", "chainpad-server": "^1.0.1",
"express": "~4.10.1", "express": "~4.10.1",

8
www/common/boot2.js
View File

@ -26,14 +26,6 @@ define([
Number.MAX_SAFE_INTEGER = 9007199254740991; Number.MAX_SAFE_INTEGER = 9007199254740991;
} }
if (typeof(window.Symbol) !== 'function') {
var idCounter = 0;
var Symbol = window.Symbol = function Symbol(key) {
return '__' + key + '_' + Math.floor(Math.random() * 1e9) + '_' + (++idCounter) + '__';
};
Symbol.iterator = Symbol('Symbol.iterator');
}
var failStore = function () { var failStore = function () {
console.error(new Error('wut')); console.error(new Error('wut'));
require(['jquery'], function ($) { require(['jquery'], function ($) {

8
www/common/sframe-boot2.js
View File

@ -18,14 +18,6 @@ define([
Number.MAX_SAFE_INTEGER = 9007199254740991; Number.MAX_SAFE_INTEGER = 9007199254740991;
} }
if (typeof(window.Symbol) !== 'function') {
var idCounter = 0;
var Symbol = window.Symbol = function Symbol(key) {
return '__' + key + '_' + Math.floor(Math.random() * 1e9) + '_' + (++idCounter) + '__';
};
Symbol.iterator = Symbol('Symbol.iterator');
}
var mkFakeStore = function () { var mkFakeStore = function () {
var fakeStorage = { var fakeStorage = {
getItem: function (k) { return fakeStorage[k]; }, getItem: function (k) { return fakeStorage[k]; },