Commit 03b0b827 authored by Clement Ho's avatar Clement Ho

Merge branch '57655-fix-markdown-tables-border' into 'master'

Fix markdown table header and table content borders

Closes #57655

See merge request gitlab-org/gitlab-ce!25666
parents 24c496f1 5e67f54f
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
} }
table:not(.js-syntax-highlight) { table {
@include markdown-table; @include markdown-table;
} }
} }
......
...@@ -29,15 +29,14 @@ ...@@ -29,15 +29,14 @@
display: block; display: block;
overflow-x: auto; overflow-x: auto;
border: 0; border: 0;
border-color: $gl-gray-100;
tr { tr {
th { th {
border-bottom: solid 2px $gl-gray-100; border-bottom: solid 2px $gl-gray-200;
} }
td { td {
border-color: $gl-gray-100; border-color: $gl-gray-200;
} }
} }
} }
......
...@@ -136,15 +136,21 @@ ...@@ -136,15 +136,21 @@
margin: 0 0 16px; margin: 0 0 16px;
} }
table:not(.js-syntax-highlight) { table {
@extend .table; @extend .table;
@extend .table-bordered; @extend .table-bordered;
margin: 16px 0; margin: 16px 0;
color: $gl-text-color; color: $gl-text-color;
border: 0; border: 0;
tr {
th { th {
background: $label-gray-bg; border-bottom: solid 2px $gl-gray-200;
}
td {
border-color: $gl-gray-200;
}
} }
} }
......
...@@ -224,14 +224,9 @@ $note-form-margin-left: 72px; ...@@ -224,14 +224,9 @@ $note-form-margin-left: 72px;
overflow-y: hidden; overflow-y: hidden;
.note-text { .note-text {
@include md-typography;
// Reset ul style types since we're nested inside a ul already // Reset ul style types since we're nested inside a ul already
@include bulleted-list; @include bulleted-list;
word-wrap: break-word; word-wrap: break-word;
table {
@include markdown-table;
}
} }
} }
......
---
title: Fix markdown table header and table content borders
merge_request: 25666
author:
type: fixed
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