diff --git a/customize.dist/pages.js b/customize.dist/pages.js index f120beef1..b44940116 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -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)") ]); }; diff --git a/customize.dist/src/less2/include/limit-bar.less b/customize.dist/src/less2/include/limit-bar.less index 7faf2d916..12f26ef4b 100644 --- a/customize.dist/src/less2/include/limit-bar.less +++ b/customize.dist/src/less2/include/limit-bar.less @@ -8,17 +8,19 @@ width: 100%; margin-top: 20px; .cp-limit-bar { + padding: 5px; + display: inline-block; max-width: 100%; margin: 3px; box-sizing: border-box; - border: 1px solid #999; + border-top: 1px solid #999; background: white; position: relative; text-align: center; vertical-align: middle; width: ~"calc(100% - 6px)"; - height: 25px; + height: 35px; line-height: 25px; overflow: hidden; .cp-limit-usage { @@ -40,7 +42,7 @@ } .cp-limit-usage-text { position: relative; - color: black; + color: grey; text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white; z-index: 2; // .usageText font-size: @colortheme_app-font-size; diff --git a/package.json b/package.json index d3e44d0a7..e8339d950 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "1.24.0", + "version": "1.25.0", "dependencies": { "chainpad-server": "^1.0.1", "express": "~4.10.1", diff --git a/www/common/boot2.js b/www/common/boot2.js index 6d81e249c..11dfa1649 100644 --- a/www/common/boot2.js +++ b/www/common/boot2.js @@ -26,14 +26,6 @@ define([ 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 () { console.error(new Error('wut')); require(['jquery'], function ($) { diff --git a/www/common/sframe-boot2.js b/www/common/sframe-boot2.js index 697f22a91..fe614ba33 100644 --- a/www/common/sframe-boot2.js +++ b/www/common/sframe-boot2.js @@ -18,14 +18,6 @@ define([ 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 fakeStorage = { getItem: function (k) { return fakeStorage[k]; },