Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
150bc6da
Commit
150bc6da
authored
May 21, 2021
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not apply markdown styles to top toolbar
parent
fa424e62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
app/assets/javascripts/content_editor/components/content_editor.vue
.../javascripts/content_editor/components/content_editor.vue
+2
-2
spec/frontend/content_editor/components/content_editor_spec.js
...frontend/content_editor/components/content_editor_spec.js
+6
-3
No files found.
app/assets/javascripts/content_editor/components/content_editor.vue
View file @
150bc6da
...
@@ -17,8 +17,8 @@ export default {
...
@@ -17,8 +17,8 @@ export default {
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"md
md
-area"
:class=
"
{ 'is-focused': contentEditor.tiptapEditor.isFocused }">
<div
class=
"md-area"
:class=
"
{ 'is-focused': contentEditor.tiptapEditor.isFocused }">
<top-toolbar
class=
"gl-mb-4"
:content-editor=
"contentEditor"
/>
<top-toolbar
class=
"gl-mb-4"
:content-editor=
"contentEditor"
/>
<tiptap-editor-content
:editor=
"contentEditor.tiptapEditor"
/>
<tiptap-editor-content
class=
"md"
:editor=
"contentEditor.tiptapEditor"
/>
</div>
</div>
</
template
>
</
template
>
spec/frontend/content_editor/components/content_editor_spec.js
View file @
150bc6da
...
@@ -27,7 +27,10 @@ describe('ContentEditor', () => {
...
@@ -27,7 +27,10 @@ describe('ContentEditor', () => {
it
(
'
renders editor content component and attaches editor instance
'
,
()
=>
{
it
(
'
renders editor content component and attaches editor instance
'
,
()
=>
{
createWrapper
(
editor
);
createWrapper
(
editor
);
expect
(
wrapper
.
findComponent
(
EditorContent
).
props
().
editor
).
toBe
(
editor
.
tiptapEditor
);
const
editorContent
=
wrapper
.
findComponent
(
EditorContent
);
expect
(
editorContent
.
props
().
editor
).
toBe
(
editor
.
tiptapEditor
);
expect
(
editorContent
.
classes
()).
toContain
(
'
md
'
);
});
});
it
(
'
renders top toolbar component and attaches editor instance
'
,
()
=>
{
it
(
'
renders top toolbar component and attaches editor instance
'
,
()
=>
{
...
@@ -38,8 +41,8 @@ describe('ContentEditor', () => {
...
@@ -38,8 +41,8 @@ describe('ContentEditor', () => {
it
.
each
`
it
.
each
`
isFocused | classes
isFocused | classes
${
true
}
|
${[
'
md
'
,
'
md
-area
'
,
'
is-focused
'
]}
${
true
}
|
${[
'
md-area
'
,
'
is-focused
'
]}
${
false
}
|
${[
'
md
'
,
'
md
-area
'
]}
${
false
}
|
${[
'
md-area
'
]}
`
(
`
(
'
has $classes class selectors when tiptapEditor.isFocused = $isFocused
'
,
'
has $classes class selectors when tiptapEditor.isFocused = $isFocused
'
,
({
isFocused
,
classes
})
=>
{
({
isFocused
,
classes
})
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment