Skip to content

Commit

Permalink
Merge pull request #4318 from nextcloud/build/move-css
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl committed Jun 20, 2023
2 parents 5c9f626 + b4244b0 commit 494493f
Show file tree
Hide file tree
Showing 20 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

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.

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

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/components/Editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -786,11 +786,11 @@ export default {
</style>
<style lang="scss">
@import './../../css/style';
@import './../../css/print';
@import './../css/style';
@import './../css/print';
.text-editor__wrapper {
@import './../../css/prosemirror';
@import './../css/prosemirror';
&:not(.is-rich-editor) .ProseMirror {
pre {
Expand Down
2 changes: 1 addition & 1 deletion src/components/HelpModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export default {
}
}
@import '../../css/prosemirror';
@import '../css/prosemirror';
div.ProseMirror {
display: inline;
Expand Down
4 changes: 2 additions & 2 deletions src/components/RichTextReader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ export default {
</script>

<style lang="scss">
@import './../../css/prosemirror';
@import './../../css/print';
@import './../css/prosemirror';
@import './../css/print';
@media print {
// Hide Content behind modal, this also hides the sidebar if open
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 494493f

Please sign in to comment.