mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-27 14:46:01 +03:00
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
This commit is contained in:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user