Skip to content

Migrate to use :deep selector instead of deprecated ::v-deep #3125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 5 commits into from
Oct 10, 2022
Merged

Migrate to use :deep selector instead of deprecated ::v-deep #3125

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cdb16c
Migrate to use `:deep` selector instead of deprecated `::v-deep`
susnux Oct 5, 2022
8e92fa0
Merge branch 'master' into fix/deep-warning
mejo- Oct 10, 2022
288deb1
Merge branch 'master' into fix/deep-warning
mejo- Oct 10, 2022
c129259
Compile assets
nextcloud-command Oct 10, 2022
6db6b98
Merge branch 'master' into fix/deep-warning
mejo- Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/Editor/ContentContainer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
}

.ie {
.editor__content::v-deep(.ProseMirror) {
.editor__content:deep(.ProseMirror) {
padding-top: 50px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Editor/GuestNameDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default {
align-items: center;
padding: 6px;

&::v-deep(img) {
&:deep(img) {
margin: 0 !important;
}

Expand Down
6 changes: 3 additions & 3 deletions src/components/Editor/Wrapper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@ export default {
overflow: hidden;
position: absolute;

&.show-color-annotations::v-deep(.author-annotation) {
&.show-color-annotations:deep(.author-annotation) {
padding-top: 2px;
padding-bottom: 2px;
}

&:not(.show-color-annotations)::v-deep(.author-annotation),
&:not(.show-color-annotations)::v-deep(.image) {
&:not(.show-color-annotations):deep(.author-annotation),
&:not(.show-color-annotations):deep(.image) {
background-color: transparent !important;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/HelpModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export default {
</script>

<style lang="scss" scoped>
::v-deep(.modal-wrapper) {
:deep(.modal-wrapper) {
.modal-container {
padding: 30px 40px 20px;
user-select: text;
Expand Down
4 changes: 2 additions & 2 deletions src/nodes/Callout.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ export default {

.callout__content {
margin-left: 1em;
&::v-deep(p) {
&:deep(p) {
&:last-child {
margin-bottom: 0;
}
}
}

.callout__icon {
&, ::v-deep(svg) {
&, :deep(svg) {
color: var(--callout-border);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/views/DirectEditing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,11 @@ export default {
position: fixed;
overflow: hidden;

&::v-deep(.text-editor) {
&:deep(.text-editor) {
height: 100%;
top: 0;
}
&::v-deep(.text-editor__wrapper div.ProseMirror) {
&:deep(.text-editor__wrapper div.ProseMirror) {
margin-top: 0;
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/views/RichWorkspace.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,42 +252,42 @@ export default {
color: var(--color-text-maxcontrast);
}

#rich-workspace::v-deep(div[contenteditable=false]){
#rich-workspace:deep(div[contenteditable=false]){
width: 100%;
padding: 0px;
background-color: var(--color-main-background);
opacity: 1;
border: none;
}

#rich-workspace::v-deep(.text-editor) {
#rich-workspace:deep(.text-editor) {
height: 100%;
position: unset !important;
top: auto !important;
}

#rich-workspace::v-deep(.text-editor__wrapper) {
#rich-workspace:deep(.text-editor__wrapper) {
position: unset !important;
overflow: visible;
}

#rich-workspace::v-deep(.text-editor__main) {
#rich-workspace:deep(.text-editor__main) {
overflow: visible !important;
}

#rich-workspace::v-deep(.content-wrapper) {
#rich-workspace:deep(.content-wrapper) {
overflow: scroll !important;
max-height: calc(40vh - 50px);
padding-left: 10px;
padding-bottom: 60px; /* ensure menububble fits below */
}

#rich-workspace::v-deep(.text-editor__wrapper .ProseMirror) {
#rich-workspace:deep(.text-editor__wrapper .ProseMirror) {
padding: 0px;
margin: 0;
}

#rich-workspace::v-deep(.editor__content) {
#rich-workspace:deep(.editor__content) {
margin: 0;
}

Expand Down Expand Up @@ -324,7 +324,7 @@ export default {
}

html.ie {
#rich-workspace::v-deep {
#rich-workspace:deep() {
.text-editor {
position: initial;
}
Expand Down