summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2019-03-21 22:14:31 +0000
committerClement Ho <clemmakesapps@gmail.com>2019-03-21 22:14:31 +0000
commit03b0b827ffd46905a7cf7ff7c01580275173271d (patch)
tree90da8f9c76e02a0870e15dc97fa9244e1d8020ed
parent24c496f155fed9ef0abdbba8ab5918bdb4b59874 (diff)
parent5e67f54fb48ff21acdf495da85354ce58938dbce (diff)
downloadgitlab-ce-awinata-operation-env-test.tar.gz
Merge branch '57655-fix-markdown-tables-border' into 'master'awinata-operation-env-test
Fix markdown table header and table content borders Closes #57655 See merge request gitlab-org/gitlab-ce!25666
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss2
-rw-r--r--app/assets/stylesheets/framework/mixins.scss5
-rw-r--r--app/assets/stylesheets/framework/typography.scss12
-rw-r--r--app/assets/stylesheets/pages/notes.scss5
-rw-r--r--changelogs/unreleased/57655-fix-markdown-tables-border.yml5
5 files changed, 17 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index d6c4e68f68f..6afe0d61232 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -150,7 +150,7 @@
}
- table:not(.js-syntax-highlight) {
+ table {
@include markdown-table;
}
}
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index 955ae80cd58..9e192cbe3fc 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -29,15 +29,14 @@
display: block;
overflow-x: auto;
border: 0;
- border-color: $gl-gray-100;
tr {
th {
- border-bottom: solid 2px $gl-gray-100;
+ border-bottom: solid 2px $gl-gray-200;
}
td {
- border-color: $gl-gray-100;
+ border-color: $gl-gray-200;
}
}
}
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 55ce0d7004e..5e5e8bcc3d6 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -136,15 +136,21 @@
margin: 0 0 16px;
}
- table:not(.js-syntax-highlight) {
+ table {
@extend .table;
@extend .table-bordered;
margin: 16px 0;
color: $gl-text-color;
border: 0;
- th {
- background: $label-gray-bg;
+ tr {
+ th {
+ border-bottom: solid 2px $gl-gray-200;
+ }
+
+ td {
+ border-color: $gl-gray-200;
+ }
}
}
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index faf85e151e3..88984cae513 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -224,14 +224,9 @@ $note-form-margin-left: 72px;
overflow-y: hidden;
.note-text {
- @include md-typography;
// Reset ul style types since we're nested inside a ul already
@include bulleted-list;
word-wrap: break-word;
-
- table {
- @include markdown-table;
- }
}
}
diff --git a/changelogs/unreleased/57655-fix-markdown-tables-border.yml b/changelogs/unreleased/57655-fix-markdown-tables-border.yml
new file mode 100644
index 00000000000..6a8ba8c4353
--- /dev/null
+++ b/changelogs/unreleased/57655-fix-markdown-tables-border.yml
@@ -0,0 +1,5 @@
+---
+title: Fix markdown table header and table content borders
+merge_request: 25666
+author:
+type: fixed