diff options
| author | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-24 11:01:30 -0400 |
|---|---|---|
| committer | Sam X. Chen <sam.xi.chen@gmail.com> | 2019-07-24 11:01:30 -0400 |
| commit | a5c1395c46a2682f4e9c2cb1f2b36dd6aa930151 (patch) | |
| tree | 863d2a81e491ada65cb43ae9e0625d1ec7ccd7b0 /client/components/main | |
| parent | 2eae236c5a732959a5a51fbd0eebb0d50682ebe2 (diff) | |
| download | wekan-a5c1395c46a2682f4e9c2cb1f2b36dd6aa930151.tar.gz wekan-a5c1395c46a2682f4e9c2cb1f2b36dd6aa930151.tar.bz2 wekan-a5c1395c46a2682f4e9c2cb1f2b36dd6aa930151.zip | |
Add Feature: User can have richer formatted text into the comments (admin-panel fixed)
Diffstat (limited to 'client/components/main')
| -rwxr-xr-x | client/components/main/editor.js | 4 | ||||
| -rw-r--r-- | client/components/main/layouts.styl | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 9c1ad7a8..0a6db12c 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -1,6 +1,6 @@ Template.editor.onRendered(() => { const textareaSelector = 'textarea'; - const disableRicherEditor = Meteor.settings.public.NO_RICHER_EDITOR; + const enableRicherEditor = Meteor.settings.public.RICHER_EDITOR || true; const mentions = [ // User mentions { @@ -31,7 +31,7 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete(mentions); }; - if (!disableRicherEditor) { + if (enableRicherEditor) { const isSmall = Utils.isMiniScreen(); const toolbar = isSmall ? [ diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl index cc8be6af..dafff251 100644 --- a/client/components/main/layouts.styl +++ b/client/components/main/layouts.styl @@ -6,6 +6,9 @@ global-reset() -webkit-box-sizing: unset box-sizing: unset +.note-popover .popover-content .note-color-palette div .note-color-btn, .panel-heading.note-toolbar .note-color-palette div .note-color-btn + background: none + html, body, input, select, textarea, button font: 14px Roboto, "Helvetica Neue", Arial, Helvetica, sans-serif line-height: 18px |