Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
bf4341033be3
Commit
e25656d0
authored
Jan 10, 2013
by
Dmitriy Zaporozhets
Browse files
Improve wiki typography
parent
21807d92942e
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
bf434103
...
@@ -37,24 +37,6 @@
...
@@ -37,24 +37,6 @@
background
:
#fff
;
background
:
#fff
;
font-size
:
11px
;
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
{
&
.image_file
{
background
:
#eee
;
background
:
#eee
;
text-align
:
center
;
text-align
:
center
;
...
@@ -64,6 +46,11 @@
...
@@ -64,6 +46,11 @@
}
}
}
}
&
.wiki
{
padding
:
20px
;
font-size
:
13px
;
}
&
.blob_file
{
&
.blob_file
{
}
}
...
...
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @
bf434103
...
@@ -81,3 +81,22 @@ a:focus {
...
@@ -81,3 +81,22 @@ a:focus {
.monospace
{
.monospace
{
font-family
:
'Menlo'
,
'Liberation Mono'
,
'Consolas'
,
'Courier New'
,
'andale mono'
,
'lucida console'
,
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
;
}
}
app/views/issues/show.html.haml
View file @
bf434103
...
@@ -51,8 +51,9 @@
...
@@ -51,8 +51,9 @@
-
if
@issue
.
description
.
present?
-
if
@issue
.
description
.
present?
.ui-box-bottom
.ui-box-bottom
=
preserve
do
.wiki
=
markdown
@issue
.
description
=
preserve
do
=
markdown
@issue
.
description
.issue_notes.voting_notes
#notes
=
render
"notes/notes_with_form"
,
tid:
@issue
.
id
,
tt:
"issue"
.issue_notes.voting_notes
#notes
=
render
"notes/notes_with_form"
,
tid:
@issue
.
id
,
tt:
"issue"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment