aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-04 19:59:07 -0800
committerMark Otto <[email protected]>2012-11-04 19:59:07 -0800
commitee93541421e41f3a9589f9c945ef4a6614f48b4b (patch)
treeaf6a1171e971cf054b6d5649d3378409abff9fbd /less/code.less
parent1af0021014a1c50ac02facd23a36dfc8f74cd143 (diff)
parent62c78e46f8d027d0797c66bef5ce8cdb8d667ace (diff)
downloadbootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.tar.xz
bootstrap-ee93541421e41f3a9589f9c945ef4a6614f48b4b.zip
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css less/buttons.less less/forms.less
Diffstat (limited to 'less/code.less')
-rw-r--r--less/code.less1
1 files changed, 1 insertions, 0 deletions
diff --git a/less/code.less b/less/code.less
index 2e26e6746..778a41beb 100644
--- a/less/code.less
+++ b/less/code.less
@@ -19,6 +19,7 @@ code {
color: #d14;
background-color: #f7f7f9;
border: 1px solid #e1e1e8;
+ white-space: nowrap;
}
// Blocks of code