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

remove the last bit of compiled css

Browse Source
This commit is contained in:
ansuz 2017-06-28 14:51:49 +02:00
parent 7a7307d560
commit 5e56ad912e
5 changed files with 11 additions and 1481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1460
customize.dist/toolbar.css
View File

File diff suppressed because it is too large Load Diff

1
package.json
View File

@ -18,7 +18,6 @@
"scripts": { "scripts": {
"lint": "jshint --config .jshintrc --exclude-path .jshintignore .", "lint": "jshint --config .jshintrc --exclude-path .jshintignore .",
"test": "node TestSelenium.js", "test": "node TestSelenium.js",
"style": "lessc ./customize.dist/src/less/toolbar.less > ./customize.dist/toolbar.css",
"template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;" "template": "cd customize.dist/src && for page in ../index.html ../privacy.html ../terms.html ../about.html ../contact.html ../../www/login/index.html ../../www/register/index.html ../../www/settings/index.html ../../www/user/index.html;do echo $page; cp template.html $page; done;"
} }
} }

18
www/common/toolbar2.js
View File

@ -48,19 +48,6 @@ define([
return 'cryptpad-uid-' + String(Math.random()).substring(2); return 'cryptpad-uid-' + String(Math.random()).substring(2);
}; };
var styleToolbar = function ($container, href, version, force) {
if (!force) { return; }
href = href || '/customize/toolbar.css' + (version?('?' + version): '');
$.ajax({
url: href,
dataType: 'text',
success: function (data) {
$container.append($('<style>').text(data));
},
});
};
var createRealtimeToolbar = function (config) { var createRealtimeToolbar = function (config) {
if (!config.$container) { return; } if (!config.$container) { return; }
var $container = config.$container; var $container = config.$container;
@ -108,11 +95,6 @@ define([
$container.prepend($toolbar); $container.prepend($toolbar);
if (ApiConfig && ApiConfig.requireConf && ApiConfig.requireConf.urlArgs) {
styleToolbar($container, undefined, ApiConfig.requireConf.urlArgs, config.legacyStyle);
} else {
styleToolbar($container, void 0, void 0, config.legacyStyle);
}
$container.on('drop dragover', function (e) { $container.on('drop dragover', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();

2
www/pad/inner.js
View File

@ -1,3 +1,3 @@
define([ define([
//'less!/customize/src/less/toolbar.less', 'less!/customize/src/less/toolbar.less',
], function () {}); ], function () {});

11
www/pad/main.js
View File

@ -472,10 +472,19 @@ define([
network: info.network, network: info.network,
$container: $bar, $container: $bar,
$contentContainer: $iframe.find('#cke_1_contents'), $contentContainer: $iframe.find('#cke_1_contents'),
legacyStyle: true,
}; };
toolbar = info.realtime.toolbar = Toolbar.create(configTb); toolbar = info.realtime.toolbar = Toolbar.create(configTb);
var src = 'less!/customize/src/less/toolbar.less';
require([
src
], function () {
var $html = $bar.closest('html');
$html
.find('head style[data-original-src="' + src.replace(/less!/, '') + '"]')
.appendTo($html.find('head'));
});
Title.setToolbar(toolbar); Title.setToolbar(toolbar);
var $rightside = toolbar.$rightside; var $rightside = toolbar.$rightside;