Skip to content

Commit

Permalink
Merge pull request #4658 from nextcloud/backport/2832/stable27
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl committed Aug 9, 2023
2 parents 8de35fe + 6117bc3 commit 006a83d
Show file tree
Hide file tree
Showing 24 changed files with 578 additions and 67 deletions.
8 changes: 1 addition & 7 deletions css/style.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
@use 'sass:math';

:root {
--text-editor-max-width: 670px
}

.modal-container .text-editor {
position: absolute;
}
@import './variables';

.ProseMirror-hideselection {
caret-color: transparent;
Expand Down
4 changes: 4 additions & 0 deletions css/variables.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
:root {
--text-editor-max-width: 670px
}

4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

22 changes: 0 additions & 22 deletions js/editor.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -440,25 +440,3 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

/**
* @copyright Copyright (c) 2022 Vinicius Reis <[email protected]>
*
* @author Vinicius Reis <[email protected]>
*
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/files-modal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/files-modal.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/text-editors.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-editors.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

Loading

0 comments on commit 006a83d

Please sign in to comment.