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
Kazuhiko Shiozaki
gitlab-ce
Commits
cfe66340
Commit
cfe66340
authored
Sep 23, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ad_coder' into 'master'
Improve Markdown css See merge request !1389
parents
ff63a166
91036026
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
63 additions
and
17 deletions
+63
-17
app/assets/stylesheets/base/mixins.scss
app/assets/stylesheets/base/mixins.scss
+57
-15
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+6
-2
No files found.
app/assets/stylesheets/base/mixins.scss
View file @
cfe66340
...
...
@@ -93,46 +93,87 @@
}
h1
{
margin-top
:
45px
;
font-size
:
2
.5em
;
font-size
:
1
.3em
;
font-weight
:
600
;
margin
:
24px
0
12px
0
;
padding
:
0
0
10px
0
;
border-bottom
:
1px
solid
#e7e9ed
;
color
:
#313236
;
}
h2
{
margin-top
:
40px
;
font-size
:
2em
;
font-size
:
1
.2em
;
font-weight
:
600
;
margin
:
24px
0
12px
0
;
color
:
#313236
;
}
h3
{
margin
-top
:
35px
;
font-size
:
1
.5em
;
margin
:
24px
0
12px
0
;
font-size
:
1
.
2
5em
;
}
h4
{
margin-top
:
30px
;
font-size
:
1
.2em
;
margin
:
24px
0
12px
0
;
font-size
:
1
.1em
;
}
h5
{
margin
:
24px
0
12px
0
;
font-size
:
1em
;
}
h6
{
margin
:
24px
0
12px
0
;
font-size
:
0
.90em
;
}
blockquote
{
color
:
#888
;
padding
:
8px
21px
;
margin
:
12px
0
12px
;
border-left
:
3px
solid
#e7e9ed
;
}
blockquote
p
{
color
:
#7f8fa4
!
important
;
font-size
:
15px
;
line-height
:
1
.5
;
}
p
{
color
:
#5c5d5e
;
margin
:
6px
0
0
0
;
}
table
{
@extend
.table
;
@extend
.table-bordered
;
margin
:
12px
0
12px
0
;
color
:
#5c5d5e
;
th
{
background
:
#EEE
;
}
background
:
#f8fafc
;
}
}
pre
{
margin
:
12px
0
12px
0
!
important
;
background-color
:
#f8fafc
!
important
;
font-size
:
13px
!
important
;
color
:
#5b6169
!
important
;
line-height
:
1
.6em
!
important
;
}
p
>
code
{
font-size
:
inherit
;
font-weight
:
inherit
;
}
ul
{
color
:
#5c5d5e
;
}
li
{
line-height
:
1
.
5
;
line-height
:
1
.
6em
;
}
a
[
href
*=
"/uploads/"
],
a
[
href
*=
"storage.googleapis.com/google-code-attachments/"
]
{
...
...
@@ -152,6 +193,7 @@
}
}
@mixin
str-truncated
(
$max_width
:
82%
)
{
display
:
inline-block
;
overflow
:
hidden
;
...
...
@@ -183,7 +225,7 @@
&
.active
{
background
:
#f9f9f9
;
a
{
font-weight
:
bold
;
font-weight
:
600
;
}
}
...
...
app/assets/stylesheets/generic/typography.scss
View file @
cfe66340
...
...
@@ -55,6 +55,7 @@ a > code {
@include
md-typography
;
word-wrap
:
break-word
;
padding
:
7px
;
/* Link to current header. */
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
...
...
@@ -83,9 +84,12 @@ a > code {
}
}
ul
{
ul
,
ol
{
padding
:
0
;
margin
:
0
0
9px
25px
!
important
;
margin
:
6px
0
6px
18px
!
important
;
}
ol
{
color
:
#5c5d5e
;
}
}
...
...
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