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
Jérome Perrin
gitlab-ce
Commits
dad30ec0
Commit
dad30ec0
authored
Oct 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'improve-typography' into 'master'
Improve typography See merge request !1622
parents
2ff13cb3
1543989d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
41 deletions
+35
-41
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+35
-41
No files found.
app/assets/stylesheets/framework/typography.scss
View file @
dad30ec0
@mixin
md-typography
{
@mixin
md-typography
{
color
:
$md-text-color
;
color
:
$md-text-color
;
word-wrap
:
break-word
;
a
{
a
{
color
:
$md-link-color
;
color
:
$md-link-color
;
...
@@ -73,6 +74,8 @@
...
@@ -73,6 +74,8 @@
}
}
blockquote
{
blockquote
{
color
:
#7f8fa4
;
font-size
:
inherit
;
padding
:
8px
21px
;
padding
:
8px
21px
;
margin
:
12px
0
12px
;
margin
:
12px
0
12px
;
border-left
:
3px
solid
#e7e9ed
;
border-left
:
3px
solid
#e7e9ed
;
...
@@ -80,7 +83,7 @@
...
@@ -80,7 +83,7 @@
blockquote
p
{
blockquote
p
{
color
:
#7f8fa4
!
important
;
color
:
#7f8fa4
!
important
;
font-size
:
15px
;
font-size
:
inherit
;
line-height
:
1
.5
;
line-height
:
1
.5
;
}
}
...
@@ -112,9 +115,9 @@
...
@@ -112,9 +115,9 @@
font-weight
:
inherit
;
font-weight
:
inherit
;
}
}
ul
,
ol
{
ul
{
padding
:
0
;
color
:
#5c5d5e
;
margin
:
6px
0
6px
18px
!
important
;
}
}
li
{
li
{
...
@@ -136,6 +139,33 @@
...
@@ -136,6 +139,33 @@
text-decoration
:
none
;
text-decoration
:
none
;
}
}
}
}
/* Link to current header. */
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
position
:
relative
;
a
.anchor
{
// Setting `display: none` would prevent the anchor being scrolled to, so
// instead we set the height to 0 and it gets updated on hover.
height
:
0
;
}
&
:hover
>
a
.anchor
{
$size
:
16px
;
position
:
absolute
;
right
:
100%
;
top
:
50%
;
margin-top
:
-
$size
/
2
;
margin-right
:
0px
;
padding-right
:
20px
;
display
:
inline-block
;
width
:
$size
;
height
:
$size
;
background-image
:
image-url
(
"icon-link.png"
);
background-size
:
contain
;
background-repeat
:
no-repeat
;
}
}
}
}
...
@@ -202,47 +232,11 @@ a > code {
...
@@ -202,47 +232,11 @@ a > code {
}
}
/**
/**
*
Wiki
typography
*
Apply Markdown
typography
*
*
*/
*/
.wiki
{
.wiki
{
@include
md-typography
;
@include
md-typography
;
word-wrap
:
break-word
;
/* Link to current header. */
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
position
:
relative
;
a
.anchor
{
// Setting `display: none` would prevent the anchor being scrolled to, so
// instead we set the height to 0 and it gets updated on hover.
height
:
0
;
}
&
:hover
>
a
.anchor
{
$size
:
16px
;
position
:
absolute
;
right
:
100%
;
top
:
50%
;
margin-top
:
-
$size
/
2
;
margin-right
:
0px
;
padding-right
:
20px
;
display
:
inline-block
;
width
:
$size
;
height
:
$size
;
background-image
:
image-url
(
"icon-link.png"
);
background-size
:
contain
;
background-repeat
:
no-repeat
;
}
}
ul
,
ol
{
padding
:
0
;
margin
:
6px
0
6px
18px
!
important
;
}
ol
{
color
:
#5c5d5e
;
}
}
}
.md-area
{
.md-area
{
...
...
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