diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index c821c3c18a8f1465d465e9590c47a1344104c74a..83ca049590ec36fd4214f512b4773fba87adddab 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -189,3 +189,9 @@ $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 new file mode 100644 index 0000000000000000000000000000000000000000..40f31490d39cd99c7ab8ecd185371b16fb543819 --- /dev/null +++ b/app/assets/stylesheets/sections/wiki.scss @@ -0,0 +1,3 @@ +.wiki{ + padding: 5px; +} diff --git a/app/views/wikis/show.html.haml b/app/views/wikis/show.html.haml index 579ea1b3ad68719a54e336e3365ca3b334567796..fe85ba23a870cd8c6e4f1dd929933d02653fb400 100644 --- a/app/views/wikis/show.html.haml +++ b/app/views/wikis/show.html.haml @@ -10,10 +10,9 @@ %i.icon-edit Edit %br -.file_holder - .file_content.wiki - = preserve do - = markdown @wiki.content +.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