Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
e25656d0
Commit
e25656d0
authored
11 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve wiki typography
parent
dd20da1b
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
20 deletions
+27
-20
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
+5
-18
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
+19
-0
app/views/issues/show.html.haml
app/views/issues/show.html.haml
+3
-2
No files found.
app/assets/stylesheets/gitlab_bootstrap/files.scss
View file @
e25656d0
...
...
@@ -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
{
}
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gitlab_bootstrap/typography.scss
View file @
e25656d0
...
...
@@ -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
;
}
}
This diff is collapsed.
Click to expand it.
app/views/issues/show.html.haml
View file @
e25656d0
...
...
@@ -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"
This diff is collapsed.
Click to expand it.
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