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

revert all wiki changes

Browse source
This commit is contained in:
Valeriy Sizov 2012-10-17 16:14:20 +03:00
parent 7a0a552b43
commit 8e989d4863
4 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file

@ -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;

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

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

13
app/assets/stylesheets/sections/wiki.scss
View file

@ -1,13 +0,0 @@
.wiki {
font-size: 13px;
code {
padding:0 4px;
}
padding:20px;
h1, h2 {
line-height: 46px;
}
h3, h4 {
line-height: 40px;
}
}

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

@ -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