deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Wiki Style Fixing

Browse source
This commit is contained in:
Valeriy Sizov 2012-10-17 15:09:16 +03:00
parent 7166739086
commit 607d8b7970
3 changed files with 12 additions and 4 deletions
app
assets/stylesheets
main.scss
sections
wiki.scss
views/wikis
show.html.haml

6
app/assets/stylesheets/main.scss
View file

@ -189,3 +189,9 @@ $hover: #D9EDF7;
* *
*/ */
@import "sections/editor.scss"; @import "sections/editor.scss";
/**
* Wiki styles
*
*/
@import "sections/wiki.scss";

3
app/assets/stylesheets/sections/wiki.scss Normal file
View file

@ -0,0 +1,3 @@
.wiki{
padding: 5px;
}

7
app/views/wikis/show.html.haml
View file

@ -10,10 +10,9 @@
%i.icon-edit %i.icon-edit
Edit Edit
%br %br
.file_holder .file_content.wiki
.file_content.wiki = preserve do
= preserve do = markdown @wiki.content
= markdown @wiki.content
%p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago %p.time Last edited by #{@wiki.user.name}, #{time_ago_in_words @wiki.created_at} ago
- if can? current_user, :admin_wiki, @project - if can? current_user, :admin_wiki, @project