diff options
| author | Douwe Maan <douwe@selenight.nl> | 2019-03-23 14:32:52 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2019-03-26 14:36:23 +0100 |
| commit | 8b700922b51f6e9be2dc0a764805fcc2ae119c41 (patch) | |
| tree | 979810d4882cab10e5b4abf71d27070c0addeda0 | |
| parent | 0c902da1537a0326faf36227967c68cb6b3037e6 (diff) | |
| download | gitlab-ce-8b700922b51f6e9be2dc0a764805fcc2ae119c41.tar.gz | |
Stop diff table styling and Markdown table styling from conflicting
| -rw-r--r-- | app/assets/stylesheets/framework/files.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 8 |
3 files changed, 2 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index 703f9b203eb..8d38310e8e6 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -25,10 +25,6 @@ } } - table { - @extend .table; - } - .file-title { position: relative; background-color: $gray-light; diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 0be8f26c2e1..db3c0e03323 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -163,7 +163,7 @@ margin: 10px 0; } - table { + table:not(.code) { @extend .table; @extend .table-bordered; margin: 16px 0; diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index c88922ae5ea..d027a5313f9 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -89,13 +89,7 @@ } } - .note-text { - table { - font-family: $font-family-sans-serif; - } - } - - table { + table.code { width: 100%; font-family: $monospace-font; border: 0; |