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
3eba2e4f
Commit
3eba2e4f
authored
Aug 04, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Wrap single lines of code; horizontally scroll multi-line code blocks
parent
11eefba8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
1 deletion
+18
-1
CHANGELOG
CHANGELOG
+1
-0
app/assets/stylesheets/framework/typography.scss
app/assets/stylesheets/framework/typography.scss
+9
-1
app/assets/stylesheets/pages/detail_page.scss
app/assets/stylesheets/pages/detail_page.scss
+8
-0
No files found.
CHANGELOG
View file @
3eba2e4f
...
...
@@ -95,6 +95,7 @@ v 8.11.0 (unreleased)
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
- Fix bug where destroying a namespace would not always destroy projects
- Fix RequestProfiler::Middleware error when code is reloaded in development
- Allow horizontal scrolling of code blocks in issue body
- Catch what warden might throw when profiling requests to re-throw it
- Avoid commit lookup on diff_helper passing existing local variable to the helper method
- Add description to new_issue email and new_merge_request_email in text/plain content type. !5663 (dixpac)
...
...
app/assets/stylesheets/framework/typography.scss
View file @
3eba2e4f
...
...
@@ -14,12 +14,20 @@
margin-top
:
0
;
}
// Single code lines should wrap
code
{
font-family
:
$monospace_font
;
white-space
:
pre
;
white-space
:
pre
-wrap
;
word-wrap
:
normal
;
}
// Multi-line code blocks should scroll horizontally
pre
{
code
{
white-space
:
pre
;
}
}
kbd
{
display
:
inline-block
;
padding
:
3px
5px
;
...
...
app/assets/stylesheets/pages/detail_page.scss
View file @
3eba2e4f
...
...
@@ -36,9 +36,17 @@
}
.wiki
{
// Single lines of code should wrap
code
{
white-space
:
pre-wrap
;
word-break
:
keep-all
;
}
// Code blocks should scroll horizontally
pre
{
code
{
white-space
:
pre
;
}
}
}
}
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