diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 14:51:19 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 16:19:22 -0500 |
| commit | 0c025624db472785a7a2b972fde832f4e8850cef (patch) | |
| tree | 029147ed557c8887982b903f457ad750d7b06a19 /app | |
| parent | 6ca5a9890c2a6761c932a6da4e82505db4b756f5 (diff) | |
| download | gitlab-ce-0c025624db472785a7a2b972fde832f4e8850cef.tar.gz | |
Render plain README using Markup viewer so it is displayed below treedm-render-plain-readme
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 17 | ||||
| -rw-r--r-- | app/models/blob_viewer/markup.rb | 1 |
2 files changed, 10 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 1a4c3d6b370..0c3407f34f8 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -139,6 +139,15 @@ line-height: 1.6em; overflow-x: auto; border-radius: 2px; + + + &.plain-readme { + background: none; + border: none; + padding: 0; + margin: 0; + font-size: 14px; + } } p > code { @@ -279,14 +288,6 @@ h6 { /** CODE **/ pre { font-family: $monospace_font; - - &.plain-readme { - background: none; - border: none; - padding: 0; - margin: 0; - font-size: 14px; - } } code { diff --git a/app/models/blob_viewer/markup.rb b/app/models/blob_viewer/markup.rb index 8fdbab30dd1..33b59c4f512 100644 --- a/app/models/blob_viewer/markup.rb +++ b/app/models/blob_viewer/markup.rb @@ -5,6 +5,7 @@ module BlobViewer self.partial_name = 'markup' self.extensions = Gitlab::MarkupHelper::EXTENSIONS + self.file_types = %i(readme) self.binary = false end end |