From ea210c0ca131f0a6685e667ccdfc844c4691155b Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 8 Feb 2021 16:28:08 +0530 Subject: [PATCH 1/4] create a translation key for the 'style' category in settings --- www/settings/inner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/settings/inner.js b/www/settings/inner.js index d1575a25d..f35b0b880 100644 --- a/www/settings/inner.js +++ b/www/settings/inner.js @@ -419,6 +419,7 @@ define([ Messages.settings_colortheme_light = "Light"; Messages.settings_colortheme_dark = "Dark"; Messages.settings_colortheme_custom = "Custom"; + Messages.settings_cat_style = "Appearance"; makeBlock('colortheme', function (cb) { var theme = window.cryptpadStore.store['colortheme'] || 'default'; From 1b7173b29f31249a8a5b10f1990124889248886f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 8 Feb 2021 10:58:10 +0000 Subject: [PATCH 2/4] Use Dracula theme by default in dark Codemirror --- www/common/sframe-common-codemirror.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/sframe-common-codemirror.js b/www/common/sframe-common-codemirror.js index 98a260c23..02370bc47 100644 --- a/www/common/sframe-common-codemirror.js +++ b/www/common/sframe-common-codemirror.js @@ -381,7 +381,7 @@ define([ /* Remember the user's last choice of theme using localStorage */ var isDark = window.CryptPad_theme === "dark"; var themeKey = ['codemirror', isDark ? 'themedark' : 'theme']; - var defaultTheme = isDark ? 'ansuz' : 'default'; + var defaultTheme = isDark ? 'dracula' : 'default'; var todo = function (err, lastTheme) { lastTheme = lastTheme || defaultTheme; From 7aba2d7d0fd76b1594d74df25371664e26fb8445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 8 Feb 2021 10:58:31 +0000 Subject: [PATCH 3/4] Remove bg color in New Pad dialog icons --- customize.dist/src/less2/include/icons.less | 1 - 1 file changed, 1 deletion(-) diff --git a/customize.dist/src/less2/include/icons.less b/customize.dist/src/less2/include/icons.less index 9ee12b1fd..6c05803c7 100644 --- a/customize.dist/src/less2/include/icons.less +++ b/customize.dist/src/less2/include/icons.less @@ -11,7 +11,6 @@ padding-top: 5px; padding-bottom: 5px; border: 1px solid transparent; - background: fade(@cryptpad_text_col, 5%); .cp-icons-name { width: 100%; From 0bd50579c4ff36fd0e7b75aff4627989f6d3f6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 8 Feb 2021 11:06:36 +0000 Subject: [PATCH 4/4] Fix link color in markdown preview --- customize.dist/src/less2/include/colortheme-dark.less | 1 + customize.dist/src/less2/include/colortheme.less | 1 + www/code/app-code.less | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less index 75c51ef6c..4ca59b4b8 100644 --- a/customize.dist/src/less2/include/colortheme-dark.less +++ b/customize.dist/src/less2/include/colortheme-dark.less @@ -327,6 +327,7 @@ // Code @cp_preview-bg: @cryptpad_color_grey_900; @cp_preview-fg: @cryptpad_text_col; +@cp_preview-link: @cryptpad_color_brand_300; // Debug @cp_debug-hover: fade(@cryptpad_color_black, 10%); diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 92f0ab85c..6dab44aaa 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -327,6 +327,7 @@ // Code @cp_preview-bg: @cryptpad_color_white; @cp_preview-fg: @cryptpad_text_col; +@cp_preview-link: @cryptpad_color_brand; // Debug @cp_debug-hover: fade(@cryptpad_color_black, 10%); diff --git a/www/code/app-code.less b/www/code/app-code.less index 138741919..a6ccd864d 100644 --- a/www/code/app-code.less +++ b/www/code/app-code.less @@ -112,6 +112,10 @@ media-tag > * { margin-bottom: 1rem; } + a { + color: @cp_preview-link; + text-decoration: underline; + } } .cp-splitter {