aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-19 14:59:42 -0800
committerMark Otto <[email protected]>2012-02-19 14:59:42 -0800
commit5f2d2893d20fec41f9291f57f7d4ab4c65e90c29 (patch)
tree79e8958ab67288c5aee3eab57c6b741198960d8a
parent8482cc4cb3632bbdf24aacb9793b90606e789c74 (diff)
parentad546c9631075cc411345b9063eee651e82432a5 (diff)
downloadbootstrap-5f2d2893d20fec41f9291f57f7d4ab4c65e90c29.tar.xz
bootstrap-5f2d2893d20fec41f9291f57f7d4ab4c65e90c29.zip
Merge branch 'opera-radial' of https://github.com/jacobrask/bootstrap into jacobrask-opera-radial
Conflicts: docs/assets/bootstrap.zip
-rw-r--r--docs/assets/bootstrap.zipbin53408 -> 53408 bytes
-rw-r--r--less/mixins.less2
2 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 75ca96a36..549d70fe2 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/less/mixins.less b/less/mixins.less
index 3cf1a3704..cea318c28 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -509,8 +509,8 @@
background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
background-image: -ms-radial-gradient(circle, @innerColor, @outerColor);
+ background-image: -o-radial-gradient(circle, @innerColor, @outerColor);
background-repeat: no-repeat;
- // Opera cannot do radial gradients yet
}
.striped(@color, @angle: -45deg) {
background-color: @color;