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

Improve wiki typography

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-01-10 18:09:12 +02:00
parent dd20da1bff
commit e25656d09b
3 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,24 +37,6 @@
background: #fff;
font-size: 11px;
&.wiki {
font-size: 13px;
code {
padding: 0 4px;
}
padding: 20px;
h1 { font-size: 26px; line-height: 46px; }
h2 { font-size: 22px; line-height: 42px; }
h3 { font-size: 20px; line-height: 40px; }
h4 { font-size: 18px; line-height: 32px; }
h5 { font-size: 16px; line-height: 26px; }
.white .highlight pre {
background: #f5f5f5;
}
}
&.image_file {
background: #eee;
text-align: center;
@ -64,6 +46,11 @@
}
}
&.wiki {
padding: 20px;
font-size: 13px;
}
&.blob_file {
}

19
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file

@ -81,3 +81,22 @@ a:focus {
.monospace {
font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono','lucida console',monospace;
}
/**
* Wiki typography
*
*/
.wiki {
font-size: 13px;
code { padding: 0 4px; }
p { font-size: 13px; }
h1 { font-size: 32px; line-height: 40px; margin: 10px 0;}
h2 { font-size: 26px; line-height: 40px; margin: 10px 0;}
h3 { font-size: 22px; line-height: 40px; margin: 10px 0;}
h4 { font-size: 18px; line-height: 20px; margin: 10px 0;}
h5 { font-size: 14px; line-height: 20px; margin: 10px 0;}
h6 { font-size: 12px; line-height: 20px; margin: 10px 0;}
.white .highlight pre { background: #f5f5f5; }
ul { margin: 0 0 9px 25px !important; }
}

5
app/views/issues/show.html.haml
View file

@ -51,8 +51,9 @@
- if @issue.description.present?
.ui-box-bottom
= preserve do
= markdown @issue.description
.wiki
= preserve do
= markdown @issue.description
.issue_notes.voting_notes#notes= render "notes/notes_with_form", tid: @issue.id, tt: "issue"