mirror of https://github.com/xwiki-labs/cryptpad
Merge branch 'appconfig_ui' into 2024.6-test
This commit is contained in:
commit
e501474d77
|
@ -12,11 +12,12 @@
|
||||||
--LessLoader_require: LessLoader_currentFile();
|
--LessLoader_require: LessLoader_currentFile();
|
||||||
}
|
}
|
||||||
& {
|
& {
|
||||||
// XXX Instance accent color presets
|
// Instance accent color presets
|
||||||
@palette-colors:
|
@palette-colors:
|
||||||
@cryptpad_color_brand,
|
@cryptpad_color_brand,
|
||||||
#ffee00,
|
#de0064,
|
||||||
#FF0073;
|
#8c52bc,
|
||||||
|
#3d7672;
|
||||||
|
|
||||||
div.cp-palette-container {
|
div.cp-palette-container {
|
||||||
|
|
||||||
|
|
|
@ -990,7 +990,7 @@ define([
|
||||||
setColor('', () => {});
|
setColor('', () => {});
|
||||||
});
|
});
|
||||||
|
|
||||||
var colors = UIElements.makePalette(8, (color, $color) => {
|
var colors = UIElements.makePalette(4, (color, $color) => {
|
||||||
// onselect
|
// onselect
|
||||||
let rgb = $color.css('background-color');
|
let rgb = $color.css('background-color');
|
||||||
let hex = Util.rgbToHex(rgb);
|
let hex = Util.rgbToHex(rgb);
|
||||||
|
|
|
@ -221,8 +221,8 @@ define([
|
||||||
|
|
||||||
var getColorBlock = function () {
|
var getColorBlock = function () {
|
||||||
|
|
||||||
// XXX Number of accent color presets
|
// Number of accent color presets
|
||||||
var colors = UIElements.makePalette(5, (color, $color) => {
|
var colors = UIElements.makePalette(4, (color, $color) => {
|
||||||
let rgb = $color.css('background-color');
|
let rgb = $color.css('background-color');
|
||||||
let hex = Util.rgbToHex(rgb);
|
let hex = Util.rgbToHex(rgb);
|
||||||
if (hex) {
|
if (hex) {
|
||||||
|
|
Loading…
Reference in New Issue