Fixes twbs#6935: Use standard decimal points for .opacity() mixin

20111564 · Mar 1, 2013 · b19eb88 · b19eb88
1 parent 0dea8b0
commit b19eb88
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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; }