aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-02-16 22:41:02 -0800
committerJacob Thornton <[email protected]>2012-02-16 22:41:02 -0800
commit03e6dc66c2fe14e756723395752feefb687b6526 (patch)
treeb8cfe13d72e1a780ef08dbd26e3bfe48e406c59e /less/code.less
parent9143d8e449a852c606194ea8c529e30ea1a52ddf (diff)
parent091622644a0c619e1afbb21041c141da30df76b7 (diff)
downloadbootstrap-03e6dc66c2fe14e756723395752feefb687b6526.tar.xz
bootstrap-03e6dc66c2fe14e756723395752feefb687b6526.zip
Merge branch '2.0.1-wip'
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less13
1 files changed, 13 insertions, 0 deletions
diff --git a/less/code.less b/less/code.less
index 0cc3db857..e2157d8ab 100644
--- a/less/code.less
+++ b/less/code.less
@@ -11,12 +11,16 @@ pre {
color: @grayDark;
.border-radius(3px);
}
+
+// Inline code
code {
padding: 3px 4px;
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
}
+
+// Blocks of code
pre {
display: block;
padding: (@baseLineHeight - 1) / 2;
@@ -30,6 +34,7 @@ pre {
white-space: pre;
white-space: pre-wrap;
word-break: break-all;
+ word-wrap: break-word;
// Make prettyprint styles more spaced out for readability
&.prettyprint {
@@ -39,6 +44,14 @@ pre {
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
+ color: inherit;
background-color: transparent;
+ border: 0;
}
}
+
+// Enable scrollable blocks of code
+.pre-scrollable {
+ max-height: 340px;
+ overflow-y: scroll;
+} \ No newline at end of file