dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'appconfig_ui' into 2024.6-test

This commit is contained in:
yflory 2024-06-24 11:58:39 +02:00
parent 58f05dd5d6 ea64d9b068
commit e501474d77
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
customize.dist/src/less2/include/admin.less
View File

@ -12,11 +12,12 @@
--LessLoader_require: LessLoader_currentFile();
}
& {
// XXX Instance accent color presets
// Instance accent color presets
@palette-colors:
@cryptpad_color_brand,
#ffee00,
#FF0073;
#de0064,
#8c52bc,
#3d7672;
div.cp-palette-container {

2
www/admin/inner.js
View File

@ -990,7 +990,7 @@ define([
setColor('', () => {});
});
var colors = UIElements.makePalette(8, (color, $color) => {
var colors = UIElements.makePalette(4, (color, $color) => {
// onselect
let rgb = $color.css('background-color');
let hex = Util.rgbToHex(rgb);

4
www/install/onboardscreen.js
View File

@ -221,8 +221,8 @@ define([
var getColorBlock = function () {
// XXX Number of accent color presets
var colors = UIElements.makePalette(5, (color, $color) => {
// Number of accent color presets
var colors = UIElements.makePalette(4, (color, $color) => {
let rgb = $color.css('background-color');
let hex = Util.rgbToHex(rgb);
if (hex) {