diff options
-rw-r--r-- | app/assets/stylesheets/gitlab_bootstrap/files.scss | 14 | ||||
-rw-r--r-- | app/assets/stylesheets/main.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/wiki.scss | 13 | ||||
-rw-r--r-- | app/views/wikis/show.html.haml | 7 |
4 files changed, 18 insertions, 22 deletions
diff --git a/app/assets/stylesheets/gitlab_bootstrap/files.scss b/app/assets/stylesheets/gitlab_bootstrap/files.scss index caaefdb539b..cbc58d22203 100644 --- a/app/assets/stylesheets/gitlab_bootstrap/files.scss +++ b/app/assets/stylesheets/gitlab_bootstrap/files.scss @@ -37,6 +37,20 @@ background:#fff; font-size: 11px; + &.wiki { + font-size: 13px; + code { + padding:0 4px; + } + padding:20px; + h1, h2 { + line-height: 46px; + } + h3, h4 { + line-height: 40px; + } + } + &.image_file { background:#eee; text-align:center; diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 83ca049590e..c821c3c18a8 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -189,9 +189,3 @@ $hover: #D9EDF7; * */ @import "sections/editor.scss"; - -/** - * Wiki styles - * - */ -@import "sections/wiki.scss"; diff --git a/app/assets/stylesheets/sections/wiki.scss b/app/assets/stylesheets/sections/wiki.scss deleted file mode 100644 index f3fae969c22..00000000000 --- a/app/assets/stylesheets/sections/wiki.scss +++ /dev/null @@ -1,13 +0,0 @@ -.wiki { - font-size: 13px; - code { - padding:0 4px; - } - padding:20px; - h1, h2 { - line-height: 46px; - } - h3, h4 { - line-height: 40px; - } -} diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index fe85ba23a87..579ea1b3ad6 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -10,9 +10,10 @@ %i.icon-edit Edit %br -.file_content.wiki - = preserve do - = markdown @wiki.content +.file_holder + .file_content.wiki + = preserve do + = markdown @wiki.content %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago - if can? current_user, :admin_wiki, @project |