diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-17 15:09:16 +0300 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-17 15:09:16 +0300 |
| commit | 607d8b7970b3bfc007030f978fcee00623cda743 (patch) | |
| tree | 370a199c7909f4e5975c0c6fab131e310713004c | |
| parent | 7166739086f161ac0f371903e0130cdb192b9f51 (diff) | |
| download | gitlab-ce-607d8b7970b3bfc007030f978fcee00623cda743.tar.gz | |
Wiki Style Fixing
| -rw-r--r-- | app/assets/stylesheets/main.scss | 6 | ||||
| -rw-r--r-- | app/assets/stylesheets/sections/wiki.scss | 3 | ||||
| -rw-r--r-- | app/views/wikis/show.html.haml | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index c821c3c18a8..83ca049590e 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 00000000000..40f31490d39 --- /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 579ea1b3ad6..fe85ba23a87 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 |