diff options
| author | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-02 09:36:51 -0700 |
| commit | 1477e081d46ebf6a5e6acb06debb7edb1a324918 (patch) | |
| tree | 4467cd66b0999856636cda0c486004c63e25f119 /less/progress-bars.less | |
| parent | 7732d8b9b06d359be7096880135f9ff546a898a2 (diff) | |
| parent | d0c75bbc8324a552b93817b1f565fa798f6574cf (diff) | |
| download | bootstrap-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/progress-bars.less')
| -rw-r--r-- | less/progress-bars.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/progress-bars.less b/less/progress-bars.less index f7305113e..584ef96bb 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -48,7 +48,7 @@ margin-bottom: @baseLineHeight; #gradient > .vertical(#f5f5f5, #f9f9f9); .box-shadow(inset 0 1px 2px rgba(0,0,0,.1)); - border-radius: 4px; + border-radius: @baseBorderRadius; } // Bar of progress |