Merge pull request twbs#56 from thetamind/fix-opacity-conflict

Change opacity mixin range from 0..1 to fix conflict with compass
TMaYaD · Feb 17, 2012 · f0598ab · f0598ab
2 parents 6c37fa9 + 82ea8a6
commit f0598ab
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss
@@ -118,19 +118,19 @@
   margin-left: 0;
 }
 .btn:hover .caret, .open.btn-group .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 
 
 // Account for other colors
 .btn-primary, .btn-danger, .btn-info, .btn-success {
   .caret {
     border-top-color: $white;
-    @include opacity(75);
+    @include opacity(0.75);
   }
 }
 
 // Small button dropdowns
 .btn-small .caret {
   margin-top: 4px;
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss
@@ -59,7 +59,7 @@
   cursor: default;
   background-image: none;
   background-color: darken($white, 10%);
-  @include opacity(65);
+  @include opacity(0.65);
   @include box-shadow(none);
 }
 
@@ -146,4 +146,4 @@ button.btn, input[type="submit"].btn {
     *padding-top: 3px;
     *padding-bottom: 3px;
   }
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_carousel.scss b/vendor/assets/stylesheets/bootstrap/_carousel.scss
@@ -76,7 +76,7 @@
   background: $grayDarker;
   border: 3px solid $white;
   @include border-radius(23px);
-  @include opacity(50);
+  @include opacity(0.5);
 
   // we can't have this transition here
   // because webkit cancels the carousel
@@ -95,7 +95,7 @@
   &:hover {
     color: $white;
     text-decoration: none;
-    @include opacity(90);
+    @include opacity(0.9);
   }
 }
 
@@ -113,4 +113,4 @@
 }
 .carousel-caption h4, .carousel-caption p {
   color: $white;
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_close.scss b/vendor/assets/stylesheets/bootstrap/_close.scss
@@ -8,11 +8,11 @@
   line-height: $baseLineHeight;
   color: $black;
   text-shadow: 0 1px 0 rgba(255,255,255,1);
-  @include opacity(20);
+  @include opacity(0.2);
   &:hover {
     color: $black;
     text-decoration: none;
-    @include opacity(40);
+    @include opacity(0.4);
     cursor: pointer;
   }
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss
@@ -25,15 +25,15 @@
   border-left:  4px solid transparent;
   border-right: 4px solid transparent;
   border-top:   4px solid $black;
-  @include opacity(30);
+  @include opacity(0.3);
   content: "\2193";
 }
 .dropdown .caret {
   margin-top: 8px;
   margin-left: 2px;
 }
 .dropdown:hover .caret, .open.dropdown .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 // The dropdown menu (ul)
 .dropdown-menu {
@@ -124,4 +124,4 @@
 .typeahead {
   margin-top: 2px; // give it some space to breathe
   @include border-radius(4px);
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss
@@ -327,9 +327,9 @@
 }
 
 // Opacity
-@mixin opacity($opacity: 100) {
-  opacity: $opacity / 100;
-   filter: alpha(opacity=$opacity);
+@mixin opacity($opacity: 1) {
+  opacity: $opacity;
+   filter: alpha(opacity=$opacity * 100);
 }
 
 
@@ -476,4 +476,4 @@
   border-top: $arrowWidth solid transparent;
   border-bottom: $arrowWidth solid transparent;
   border-right: $arrowWidth solid $black;
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss
@@ -21,7 +21,7 @@
 }
 
 .modal-backdrop, .modal-backdrop.fade.in {
-  @include opacity(80);
+  @include opacity(0.8);
 }
 
 .modal {
@@ -69,4 +69,4 @@
     margin-left: 5px;
     margin-bottom: 0; // account for input[type="submit"] which gets the bottom margin like all other inputs
   }
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss
@@ -254,7 +254,7 @@
   border-top-color: $white;
 }
 .navbar .nav .active .caret {
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Remove background color from open dropdown
@@ -279,4 +279,4 @@
     left: auto;
     right: 13px;
   }
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss
@@ -214,7 +214,7 @@
 }
 .nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
   border-top-color: $white;
-  @include opacity(100);
+  @include opacity(1);
 }
 
 // Dropdowns in stacked tabs
@@ -318,4 +318,4 @@
 .tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
   border-color: #ddd #ddd #ddd transparent;
   *border-left-color: $white;
-}
+}
diff --git a/vendor/assets/stylesheets/bootstrap/_tooltip.scss b/vendor/assets/stylesheets/bootstrap/_tooltip.scss
@@ -9,7 +9,7 @@
   padding: 5px;
   font-size: 11px;
   @include opacity(0);
-  &.in     { @include opacity(80); }
+  &.in     { @include opacity(0.8); }
   &.top    { margin-top:  -2px; }
   &.right  { margin-left:  2px; }
   &.bottom { margin-top:   2px; }
@@ -32,4 +32,4 @@
   position: absolute;
   width: 0;
   height: 0;
-}
+}