Commit d8556610 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch '241779-replace-pre-wrap-with-utility' into 'master'

Replace 'ws-pre-wrap' class

Closes #241779

See merge request gitlab-org/gitlab!40998
parents 49da6f5d e49f7319
...@@ -20,7 +20,7 @@ export default { ...@@ -20,7 +20,7 @@ export default {
return h( return h(
'span', 'span',
{ {
class: ['ws-pre-wrap', content.style], class: ['gl-white-space-pre-wrap', content.style],
}, },
content.text, content.text,
); );
......
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
<span <span
v-for="(content, i) in line.content" v-for="(content, i) in line.content"
:key="i" :key="i"
class="line-text w-100 ws-pre-wrap" class="line-text w-100 gl-white-space-pre-wrap"
:class="content.style" :class="content.style"
>{{ content.text }}</span >{{ content.text }}</span
> >
......
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
<slot name="modal-body"></slot> <slot name="modal-body"></slot>
<p class="gl-mb-1">{{ $options.strings.confirmText }}</p> <p class="gl-mb-1">{{ $options.strings.confirmText }}</p>
<p> <p>
<code class="ws-pre-wrap">{{ confirmPhrase }}</code> <code class="gl-white-space-pre-wrap">{{ confirmPhrase }}</code>
</p> </p>
<gl-form-input <gl-form-input
id="confirm_name_input" id="confirm_name_input"
......
...@@ -416,7 +416,6 @@ img.emoji { ...@@ -416,7 +416,6 @@ img.emoji {
.flex-no-shrink { flex-shrink: 0; } .flex-no-shrink { flex-shrink: 0; }
.ws-initial { white-space: initial; } .ws-initial { white-space: initial; }
.ws-normal { white-space: normal; } .ws-normal { white-space: normal; }
.ws-pre-wrap { white-space: pre-wrap; }
.overflow-auto { overflow: auto; } .overflow-auto { overflow: auto; }
.overflow-visible { overflow: visible; } .overflow-visible { overflow: visible; }
......
...@@ -52,7 +52,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = ` ...@@ -52,7 +52,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
<p> <p>
<code <code
class="ws-pre-wrap" class="gl-white-space-pre-wrap"
> >
foo foo
</code> </code>
......
...@@ -67,7 +67,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = ` ...@@ -67,7 +67,7 @@ exports[`Project remove modal initialized matches the snapshot 1`] = `
<p> <p>
<code <code
class="ws-pre-wrap" class="gl-white-space-pre-wrap"
> >
foo foo
</code> </code>
......
...@@ -56,7 +56,7 @@ exports[`Project remove modal intialized matches the snapshot 1`] = ` ...@@ -56,7 +56,7 @@ exports[`Project remove modal intialized matches the snapshot 1`] = `
<p> <p>
<code <code
class="ws-pre-wrap" class="gl-white-space-pre-wrap"
> >
foo foo
</code> </code>
......
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