aboutsummaryrefslogtreecommitdiff
path: root/less/code.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-02 09:36:51 -0700
committerMark Otto <[email protected]>2012-11-02 09:36:51 -0700
commit1477e081d46ebf6a5e6acb06debb7edb1a324918 (patch)
tree4467cd66b0999856636cda0c486004c63e25f119 /less/code.less
parent7732d8b9b06d359be7096880135f9ff546a898a2 (diff)
parentd0c75bbc8324a552b93817b1f565fa798f6574cf (diff)
downloadbootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.tar.xz
bootstrap-1477e081d46ebf6a5e6acb06debb7edb1a324918.zip
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/getting-started.html docs/templates/pages/getting-started.mustache less/accordion.less less/alerts.less less/breadcrumbs.less less/buttons.less less/code.less less/dropdowns.less less/forms.less less/navbar.less less/progress-bars.less less/responsive-navbar.less less/tables.less less/thumbnails.less less/tooltip.less less/wells.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 b26389b3e..2e26e6746 100644
--- a/less/code.less
+++ b/less/code.less
@@ -35,6 +35,7 @@ pre {
background-color: #f5f5f5;
border: 1px solid #ccc; // IE8 fallback
border: 1px solid rgba(0,0,0,.15);
+ border-radius: @baseBorderRadius;
// Make prettyprint styles more spaced out for readability
&.prettyprint {