summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-11 17:40:03 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-11 17:40:03 +0100
commit27e521720a77bcf70ad04a428aee650a8d240401 (patch)
treed4a4c66386da053a51095edbce50de307134090f /app/assets
parent8752cd3322f9d64b7eab0123048ece072e6b3a76 (diff)
downloadgitlab-ce-27e521720a77bcf70ad04a428aee650a8d240401.tar.gz
Add horizontal scrolling to code blocks.
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/generic/common.scss4
-rw-r--r--app/assets/stylesheets/generic/highlight.scss1
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/generic/common.scss b/app/assets/stylesheets/generic/common.scss
index 1a7e96f1d0c..3db821fdf76 100644
--- a/app/assets/stylesheets/generic/common.scss
+++ b/app/assets/stylesheets/generic/common.scss
@@ -333,6 +333,10 @@ table {
margin-bottom: 9px;
}
+.wiki .code {
+ overflow-x: auto;
+}
+
.footer-links a {
margin-right: 15px;
}
diff --git a/app/assets/stylesheets/generic/highlight.scss b/app/assets/stylesheets/generic/highlight.scss
index e1ca86af816..0f8225d6823 100644
--- a/app/assets/stylesheets/generic/highlight.scss
+++ b/app/assets/stylesheets/generic/highlight.scss
@@ -59,6 +59,7 @@
box-shadow: none;
background: $box_bg;
padding: 1em;
+ overflow-x: auto;
code {
font-family: $monospace_font;