aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-02-28 19:46:49 -0800
committerMark Otto <[email protected]>2013-02-28 19:46:49 -0800
commitb19eb88b5abb7fd9dfc3aacc7ac3d296e1e98861 (patch)
tree39f8536e1fe332aea1b70392454fcf14d74902df
parent0dea8b0c7473c1db4aea7accfd0a68cbf09b9576 (diff)
downloadbootstrap-b19eb88b5abb7fd9dfc3aacc7ac3d296e1e98861.tar.xz
bootstrap-b19eb88b5abb7fd9dfc3aacc7ac3d296e1e98861.zip
Fixes #6935: Use standard decimal points for .opacity() mixin
-rw-r--r--docs/assets/css/bootstrap.css3
-rw-r--r--less/buttons.less2
-rw-r--r--less/carousel.less4
-rw-r--r--less/close.less4
-rw-r--r--less/mixins.less6
-rw-r--r--less/modals.less4
-rw-r--r--less/navs.less2
-rw-r--r--less/tooltip.less2
8 files changed, 15 insertions, 12 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 159cc5327..b0304d693 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3095,7 +3095,7 @@ button.close {
.nav li.dropdown.open a:hover .caret {
border-top-color: #fff;
border-bottom-color: #fff;
- .opacity(100);
+ .opacity(1);
}
// Dropdowns in stacked tabs
@@ -3839,6 +3839,7 @@ button.close {
.modal-backdrop.fade {
opacity: 0;
+ filter: alpha(opacity=0);
}
.modal-backdrop.fade.in {
diff --git a/less/buttons.less b/less/buttons.less
index 3d7127212..6996ea050 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -41,7 +41,7 @@
&[disabled],
fieldset[disabled] & {
cursor: default;
- .opacity(65);
+ .opacity(.65);
.box-shadow(none);
}
diff --git a/less/carousel.less b/less/carousel.less
index b95a582c6..7c75a519b 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -75,7 +75,7 @@
left: 0;
bottom: 0;
width: 15%;
- .opacity(50);
+ .opacity(.5);
font-size: 20px;
color: #fff;
text-align: center;
@@ -105,7 +105,7 @@
&:focus {
color: #fff;
text-decoration: none;
- .opacity(90);
+ .opacity(.9);
}
// Toggles
diff --git a/less/close.less b/less/close.less
index de6560ec1..2bfe9c40f 100644
--- a/less/close.less
+++ b/less/close.less
@@ -10,13 +10,13 @@
line-height: @line-height-base;
color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,1);
- .opacity(20);
+ .opacity(.2);
&:hover,
&:focus {
color: #000;
text-decoration: none;
cursor: pointer;
- .opacity(50);
+ .opacity(.5);
}
}
diff --git a/less/mixins.less b/less/mixins.less
index ad1597121..67e2ed689 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -291,8 +291,10 @@
// Opacity
.opacity(@opacity) {
- opacity: @opacity / 100;
- filter: ~"alpha(opacity=@{opacity})"; // IE8
+ opacity: @opacity;
+ // IE8 filter
+ @opacity-ie: @opacity * 100;
+ filter: ~"alpha(opacity=@{opacity-ie})";
}
diff --git a/less/modals.less b/less/modals.less
index 9c0d0c7b0..076c39be3 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -67,8 +67,8 @@
z-index: @zindex-modal-background - 10;
background-color: #000;
// Fade for backdrop
- &.fade { opacity: 0; }
- &.fade.in { .opacity(50);}
+ &.fade { .opacity(0); }
+ &.fade.in { .opacity(.5); }
}
// Modal header
diff --git a/less/navs.less b/less/navs.less
index 24837cb7c..07d5e5c5d 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -265,7 +265,7 @@
.nav li.dropdown.open a:hover .caret {
border-top-color: #fff;
border-bottom-color: #fff;
- .opacity(100);
+ .opacity(1);
}
// Dropdowns in stacked tabs
diff --git a/less/tooltip.less b/less/tooltip.less
index e262e3ba5..5eb6413de 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -13,7 +13,7 @@
line-height: 1.4;
.opacity(0);
- &.in { .opacity(100); }
+ &.in { .opacity(1); }
&.top { margin-top: -3px; padding: 5px 0; }
&.right { margin-left: 3px; padding: 0 5px; }
&.bottom { margin-top: 3px; padding: 5px 0; }