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
57d28d04
Commit
57d28d04
authored
Mar 19, 2022
by
Daniel Tian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix markdown header toolbar showing in compact preview view
Changelog: fixed MR:
parent
c0ccea30
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/vue_shared/components/markdown/header.vue
...ets/javascripts/vue_shared/components/markdown/header.vue
+1
-1
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+2
-2
spec/frontend/vue_shared/components/markdown/header_spec.js
spec/frontend/vue_shared/components/markdown/header_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/markdown/header.vue
View file @
57d28d04
...
@@ -187,7 +187,7 @@ export default {
...
@@ -187,7 +187,7 @@ export default {
<template
#tabs-end
>
<template
#tabs-end
>
<div
<div
data-testid=
"md-header-toolbar"
data-testid=
"md-header-toolbar"
:class=
"
{ 'gl-display-none': previewMarkdown }"
:class=
"
{ 'gl-display-none
!
': previewMarkdown }"
class="md-header-toolbar gl-ml-auto gl-pb-3 gl-justify-content-center"
class="md-header-toolbar gl-ml-auto gl-pb-3 gl-justify-content-center"
>
>
<toolbar-button
<toolbar-button
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
57d28d04
...
@@ -72,7 +72,6 @@
...
@@ -72,7 +72,6 @@
@include
media-breakpoint-down
(
xs
)
{
@include
media-breakpoint-down
(
xs
)
{
.nav-item
{
.nav-item
{
flex
:
1
;
flex
:
1
;
border-bottom
:
1px
solid
$border-color
;
}
}
.gl-tab-nav-item
{
.gl-tab-nav-item
{
...
@@ -84,7 +83,8 @@
...
@@ -84,7 +83,8 @@
width
:
100%
;
width
:
100%
;
display
:
flex
;
display
:
flex
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
margin-top
:
$gl-padding-8
;
padding-top
:
$gl-padding-8
;
border-top
:
1px
solid
$border-color
;
}
}
}
}
}
}
...
...
spec/frontend/vue_shared/components/markdown/header_spec.js
View file @
57d28d04
...
@@ -95,7 +95,7 @@ describe('Markdown field header component', () => {
...
@@ -95,7 +95,7 @@ describe('Markdown field header component', () => {
it
(
'
hides toolbar in preview mode
'
,
()
=>
{
it
(
'
hides toolbar in preview mode
'
,
()
=>
{
createWrapper
({
previewMarkdown
:
true
});
createWrapper
({
previewMarkdown
:
true
});
expect
(
findToolbar
().
classes
().
includes
(
'
gl-display-none
'
)).
toBe
(
true
);
expect
(
findToolbar
().
classes
().
includes
(
'
gl-display-none
!
'
)).
toBe
(
true
);
});
});
it
(
'
emits toggle markdown event when clicking preview tab
'
,
async
()
=>
{
it
(
'
emits toggle markdown event when clicking preview tab
'
,
async
()
=>
{
...
...
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