summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/typography.scss
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-04 14:29:45 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-12 17:17:23 -0500
commit3eba2e4f70f18f2a86d0134e264e963d67cbac45 (patch)
tree863c2839292eeb4f3c5971cad696fb9955ad06bf /app/assets/stylesheets/framework/typography.scss
parent11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff)
downloadgitlab-ce-3eba2e4f70f18f2a86d0134e264e963d67cbac45.tar.gz
Wrap single lines of code; horizontally scroll multi-line code blocks
Diffstat (limited to 'app/assets/stylesheets/framework/typography.scss')
-rw-r--r--app/assets/stylesheets/framework/typography.scss10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 8659604cb8b..06874a993fa 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -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;