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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
13744cf4
Commit
13744cf4
authored
May 17, 2020
by
Jan Beckmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix scrolling and line numbers for embedded snippets
Closes #207934
parent
f9ac8102
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/stylesheets/snippets.scss
app/assets/stylesheets/snippets.scss
+3
-3
changelogs/unreleased/207934-snippet-embed-scrolling.yml
changelogs/unreleased/207934-snippet-embed-scrolling.yml
+5
-0
No files found.
app/assets/stylesheets/snippets.scss
View file @
13744cf4
...
@@ -40,10 +40,9 @@
...
@@ -40,10 +40,9 @@
margin
:
0
;
margin
:
0
;
padding
:
0
;
padding
:
0
;
table-layout
:
fixed
;
table-layout
:
fixed
;
.blob-content
{
overflow-x
:
auto
;
overflow-x
:
auto
;
.blob-content
{
pre
{
pre
{
height
:
100%
;
height
:
100%
;
padding
:
10px
;
padding
:
10px
;
...
@@ -61,6 +60,7 @@
...
@@ -61,6 +60,7 @@
font-family
:
$monospace-font
;
font-family
:
$monospace-font
;
font-size
:
$code-font-size
;
font-size
:
$code-font-size
;
line-height
:
$code-line-height
;
line-height
:
$code-line-height
;
display
:
inline-block
;
}
}
}
}
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
font-family
:
$monospace-font
;
font-family
:
$monospace-font
;
display
:
block
;
display
:
block
;
font-size
:
$code-font-size
;
font-size
:
$code-font-size
;
min
-height
:
$code-line-height
;
line
-height
:
$code-line-height
;
white-space
:
nowrap
;
white-space
:
nowrap
;
color
:
$black-transparent
;
color
:
$black-transparent
;
min-width
:
30px
;
min-width
:
30px
;
...
...
changelogs/unreleased/207934-snippet-embed-scrolling.yml
0 → 100644
View file @
13744cf4
---
title
:
Fix display of embedded snippets
merge_request
:
32411
author
:
Jan Beckmann
type
:
fixed
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