aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-11 16:07:57 -0700
committerMark Otto <[email protected]>2013-08-11 16:07:57 -0700
commit83c236f5705822882e094d08e0bfa193d4e9f4ae (patch)
treed40492c1297799c6e37f22b20e5eb123240164df /less
parent1ff1dfb2bd031832c725c146deb8b7363cfeadf5 (diff)
parent92c2ad98e753c64a2bd6e3fb94870a2ad3ee0333 (diff)
downloadbootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.tar.xz
bootstrap-83c236f5705822882e094d08e0bfa193d4e9f4ae.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'less')
-rw-r--r--less/carousel.less1
-rw-r--r--less/scaffolding.less2
2 files changed, 1 insertions, 2 deletions
diff --git a/less/carousel.less b/less/carousel.less
index fbb479904..8d31d7e49 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -97,7 +97,6 @@
}
// Toggles
- .glyphicon,
.icon-prev,
.icon-next {
position: absolute;
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 3909704bf..5c7b5bb84 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -79,7 +79,7 @@ img {
// Perfect circle
.img-circle {
- border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
+ border-radius: 50%; // set radius in percents
}