Merge branch 'make_markdown_tables_thinner' into 'master'

Make markdown tables thinner

Closes #14123

See merge request !10909

5 files changed, 25 insertions, 0 deletions

diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index a668a6c4c39..80691a234f8 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -120,6 +120,10 @@
     // Ensure that image does not exceed viewport
     max-height: calc(100vh - 100px);
   }
+
+  table {
+    @include markdown-table;
+  }
 }
 
 .toolbar-group {
diff --git a/app/assets/stylesheets/framework/mixins.scss b/app/assets/stylesheets/framework/mixins.scss
index b3340d41333..3a98332e46c 100644
--- a/app/assets/stylesheets/framework/mixins.scss
+++ b/app/assets/stylesheets/framework/mixins.scss
@@ -13,6 +13,13 @@
 }
 
 /*
+ * Mixin for markdown tables
+ */
+@mixin markdown-table {
+  width: auto;
+}
+
+/*
  * Base mixin for lists in GitLab
  */
 @mixin basic-list {
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index 69a95db6920..7cf74502a3a 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -97,6 +97,10 @@ ul.notes {
             padding-left: 1.3em;
           }
         }
+
+        table {
+          @include markdown-table;
+        }
       }
     }
 
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index 9bc47bbe173..04ff2d52b91 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -159,3 +159,9 @@ ul.wiki-pages-list.content-list {
     padding: 5px 0;
   }
 }
+
+.wiki {
+  table {
+    @include markdown-table;
+  }
+}
diff --git a/changelogs/unreleased/make_markdown_tables_thinner.yml b/changelogs/unreleased/make_markdown_tables_thinner.yml
new file mode 100644
index 00000000000..d03a26bdeb3
--- /dev/null
+++ b/changelogs/unreleased/make_markdown_tables_thinner.yml
@@ -0,0 +1,4 @@
+---
+title: Make markdown tables thinner
+merge_request: 10909
+author: blackst0ne