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
Léo-Paul Géneau
gitlab-ce
Commits
5e7c0b65
Commit
5e7c0b65
authored
Jun 05, 2018
by
Paul Slaughter
Committed by
Clement Ho
Jun 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Markdown blockquote is not displaying properly"
parent
6165f0f7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
11 deletions
+13
-11
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+12
-11
app/assets/stylesheets/mailers/highlighted_diff_email.scss
app/assets/stylesheets/mailers/highlighted_diff_email.scss
+1
-0
No files found.
app/assets/stylesheets/framework/typography.scss
View file @
5e7c0b65
...
@@ -114,26 +114,27 @@
...
@@ -114,26 +114,27 @@
font-size
:
0
.95em
;
font-size
:
0
.95em
;
}
}
blockquote
,
.blockquote
{
.blockquote
{
color
:
$gl-grayish-blue
;
color
:
$gl-grayish-blue
;
font-size
:
inherit
;
font-size
:
inherit
;
padding
:
8px
24px
;
padding
:
8px
24px
;
margin
:
16px
0
;
margin
:
16px
0
;
border-left
:
3px
solid
$white-dark
;
border-left
:
3px
solid
$white-dark
;
}
.blockquote
:dir
(
rtl
)
{
&
:dir
(
rtl
)
{
border-left
:
0
;
border-left
:
0
;
border-right
:
3px
solid
$white-dark
;
border-right
:
3px
solid
$white-dark
;
}
}
.blockquote
p
{
p
{
color
:
$gl-grayish-blue
!
important
;
color
:
$gl-grayish-blue
!
important
;
font-size
:
inherit
;
font-size
:
inherit
;
line-height
:
1
.5
;
line-height
:
1
.5
;
&
:last-child
{
&
:last-child
{
margin
:
0
;
margin
:
0
;
}
}
}
}
}
...
...
app/assets/stylesheets/mailers/highlighted_diff_email.scss
View file @
5e7c0b65
...
@@ -138,6 +138,7 @@ pre {
...
@@ -138,6 +138,7 @@ pre {
margin
:
0
;
margin
:
0
;
}
}
blockquote
,
.blockquote
{
.blockquote
{
color
:
$gl-grayish-blue
;
color
:
$gl-grayish-blue
;
padding
:
0
0
0
15px
;
padding
:
0
0
0
15px
;
...
...
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