diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-19 08:52:50 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-19 08:52:50 +0000 |
| commit | 4f91124248f7a56fc82ce6b3aa8bba79eec2eb9d (patch) | |
| tree | 16f7ecda9032e0bf0d8a230f9c3ee8bde70be83b /app | |
| parent | b0642299943bbb0485b0577e99fb1d2c6072b845 (diff) | |
| parent | 0c025624db472785a7a2b972fde832f4e8850cef (diff) | |
| download | gitlab-ce-4f91124248f7a56fc82ce6b3aa8bba79eec2eb9d.tar.gz | |
Merge branch 'dm-render-plain-readme' into 'master'
Render plain README using Markup viewer so it is displayed below tree
See merge request !11510
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 |