ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:ueberdosis/tiptap-next into main

Browse Source
This commit is contained in:
Hans Pagel
2020-10-29 13:13:36 +01:00
parent f4fdb4306c be86773fc2
commit f5763b8cc0
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/src/layouts/App/style.scss
View File

@@ -157,6 +157,10 @@ $menuBreakPoint: 800px;
margin-top: 0.5rem; margin-top: 0.5rem;
} }
&__mobile-nav &__link-list &__link-list {
display: block;
}
.active + &__link-list { .active + &__link-list {
display: block; display: block;
} }
@@ -200,6 +204,10 @@ $menuBreakPoint: 800px;
} }
} }
&__mobile-nav &__link--with-children::after {
display: none;
}
&__main { &__main {
padding: 1rem 0; padding: 1rem 0;

7
docs/src/templates/DocPage/style.scss
View File

@@ -149,12 +149,13 @@
display: inline-block; display: inline-block;
margin-right: 0.75rem; margin-right: 0.75rem;
content: "\2022"; content: "\2022";
opacity: 0.2; color: $colorYellow;
} }
} }
} }
> ol { > ol {
list-style: none;
counter-reset: item; counter-reset: item;
li { li {
@@ -171,9 +172,9 @@
justify-content: center; justify-content: center;
height: 1.5rem; height: 1.5rem;
width: 1.5rem; width: 1.5rem;
background-color: rgba($colorWhite, 0.1); background-color: rgba($colorYellow, 0.1);
border-radius: 9999px; border-radius: 9999px;
color: rgba($colorWhite, 0.4); color: $colorYellow;
font-size: 0.75rem; font-size: 0.75rem;
font-weight: 700; font-weight: 700;
content: counter(item); content: counter(item);

3
packages/core/src/pasteRules/markPasteRule.ts
View File

@@ -2,7 +2,6 @@ import { Plugin } from 'prosemirror-state'
import { Slice, Fragment, MarkType } from 'prosemirror-model' import { Slice, Fragment, MarkType } from 'prosemirror-model'
export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any) => any): Plugin { export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any) => any): Plugin {
const handler = (fragment: Fragment, parent?: any) => { const handler = (fragment: Fragment, parent?: any) => {
const nodes: any[] = [] const nodes: any[] = []
@@ -33,7 +32,6 @@ export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any)
// adding the markdown part to nodes // adding the markdown part to nodes
nodes.push(child nodes.push(child
.cut(textStart, textEnd) .cut(textStart, textEnd)
// @ts-ignore
.mark(type.create(attrs).addToSet(child.marks))) .mark(type.create(attrs).addToSet(child.marks)))
pos = matchEnd pos = matchEnd
@@ -59,5 +57,4 @@ export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any)
}, },
}, },
}) })
} }