diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-21 08:22:56 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-21 10:24:46 +0200 |
| commit | ab62efdb1ac6f55242d7b94aae254b6d80030f55 (patch) | |
| tree | f30a4d6bf9b3f6bfd0cf9dd7754a6fd23a747401 | |
| parent | 250686265e9c14b01a308bce74a056996d23e24a (diff) | |
| download | gitlab-ce-ab62efdb1ac6f55242d7b94aae254b6d80030f55.tar.gz | |
Merge branch 'markdown-tabs-margin' into 'master'
Fix margin around Markdown Write/Preview tabs.
Reverts !1354 and uses another fix for #2585.
See merge request !1654
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index e6d1cca9f7a..e6558a23858 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -238,10 +238,6 @@ a > code { @include md-typography; } -.md-area { - @include md-typography; -} - .md { @include md-typography; } @@ -252,6 +248,7 @@ a > code { */ textarea.js-gfm-input { font-family: $monospace_font; + color: $gl-text-color; } .md-preview { |