Commit 39da3930 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch '344429-fix-markdown-header-toolbar-showing-in-compact-view' into 'master'

Fix markdown header toolbar showing in compact preview view

See merge request gitlab-org/gitlab!83244
parents 4c61a186 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
......
...@@ -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;
} }
} }
} }
......
...@@ -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 () => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment