Merge pull request #42 from kane-c/master

maxmx · maxmx · commit 6a72f1a04d1b · 2014-04-17T07:12:15.000-04:00
Bootstrap 3.1.1 and a bunch of fixes
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-Bootstrap Stylus 3.1.0
+Bootstrap Stylus 3.1.1
 ======================
 
-Port of the amazing [Bootstrap 3.1.0](https://github.com/twbs/bootstrap) to [Stylus 0.42.0](http://learnboost.github.com/stylus/).
+Port of the amazing [Bootstrap 3.1.1](https://github.com/twbs/bootstrap) to [Stylus 0.42.0](http://learnboost.github.com/stylus/).
 
 This version removes the mixins and prefers [nib](https://github.com/visionmedia/nib).
 
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-stylus",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "main": "stylus/bootstrap.styl",
   "description": "A port of Bootstrap to Stylus",
   "ignore": [
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
diff --git a/js/affix.js b/js/affix.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: affix.js v3.1.0
+ * Bootstrap: affix.js v3.1.1
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/alert.js b/js/alert.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: alert.js v3.1.0
+ * Bootstrap: alert.js v3.1.1
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/button.js b/js/button.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: button.js v3.1.0
+ * Bootstrap: button.js v3.1.1
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/carousel.js b/js/carousel.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: carousel.js v3.1.0
+ * Bootstrap: carousel.js v3.1.1
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/collapse.js b/js/collapse.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: collapse.js v3.1.0
+ * Bootstrap: collapse.js v3.1.1
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/dropdown.js b/js/dropdown.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: dropdown.js v3.1.0
+ * Bootstrap: dropdown.js v3.1.1
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/modal.js b/js/modal.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: modal.js v3.1.0
+ * Bootstrap: modal.js v3.1.1
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/popover.js b/js/popover.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: popover.js v3.1.0
+ * Bootstrap: popover.js v3.1.1
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/scrollspy.js b/js/scrollspy.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.1.0
+ * Bootstrap: scrollspy.js v3.1.1
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/tab.js b/js/tab.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tab.js v3.1.0
+ * Bootstrap: tab.js v3.1.1
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/js/tooltip.js b/js/tooltip.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: tooltip.js v3.1.0
+ * Bootstrap: tooltip.js v3.1.1
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
diff --git a/js/transition.js b/js/transition.js
@@ -1,5 +1,5 @@
 /* ========================================================================
- * Bootstrap: transition.js v3.1.0
+ * Bootstrap: transition.js v3.1.1
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
  * Copyright 2011-2014 Twitter, Inc.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-stylus",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "devDependencies": {
     "grunt": "~0.4.2",
     "stylus": "~0.42.0",
diff --git a/stylus/buttons.styl b/stylus/buttons.styl
@@ -19,7 +19,9 @@
   button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
   user-select none;
 
-  &:focus {
+  &:focus,
+  &:active:focus,
+  &.active:focus {
     tab-focus();
   }
 
diff --git a/stylus/carousel.styl b/stylus/carousel.styl
@@ -16,7 +16,7 @@
   > .item {
     display: none;
     position: relative;
-    transition(.6s ease-in-out left);
+    transition: .6s ease-in-out left;
 
     // Account for jankitude on images
     > img,
@@ -170,7 +170,7 @@
     //
     // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
     // set alpha transparency for the best results possible.
-    background-color: #000 \9; // IE8
+    background-color: s('#000 \9'); // IE8
     background-color: rgba(0,0,0,0); // IE9
   }
   .active {
@@ -206,8 +206,8 @@
 
   // Scale up the controls a smidge
   .carousel-control {
-    .glyphicons-chevron-left,
-    .glyphicons-chevron-right,
+    .glyphicon-chevron-left,
+    .glyphicon-chevron-right,
     .icon-prev,
     .icon-next {
       width: 30px;
diff --git a/stylus/component-animations.styl b/stylus/component-animations.styl
@@ -9,7 +9,7 @@
 
 .fade {
   opacity(0)
-  transition(opacity .15s linear);
+  transition: opacity .15s linear;
   &.in {
     opacity(1)
   }
@@ -25,5 +25,5 @@
   position: relative;
   height: 0;
   overflow: hidden;
-  transition(height .35s ease);
+  transition: height .35s ease;
 }
diff --git a/stylus/forms.styl b/stylus/forms.styl
@@ -51,7 +51,7 @@ input[type="search"] {
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
-  margin-top: 1px \9; /* IE8-9 */
+  margin-top: s('1px \9'); /* IE8-9 */
   line-height: normal;
 }
 
@@ -119,8 +119,8 @@ output {
   font-size: $font-size-base;
   line-height: $line-height-base;
   color: $input-color;
-  vertical-align: middle;
   background-color: $input-bg;
+  background-image: none;
   border: 1px solid $input-border;
   border-radius: $input-border-radius;
   box-shadow inset 0 1px 1px rgba(0,0,0,.075);
@@ -137,10 +137,6 @@ output {
   // HTML5 says that controls under a fieldset > legend:first-child won't be
   // disabled if the fieldset is disabled. Due to implementation difficulty, we
   // don't honor that edge case; we style them as disabled anyway.
-  //
-  // Also note that we include `[disabled]` for IE8. All other browsers take the
-  // `:disabled` selector.
-  &:disabled,
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
diff --git a/stylus/input-groups.styl b/stylus/input-groups.styl
@@ -17,6 +17,11 @@
   }
 
   .form-control {
+    // Ensure that the input is always above the *appended* addon button for
+    // proper border colors.
+    position: relative;
+    z-index: 2;
+
     // IE9 fubars the placeholder attribute in text inputs and the arrows on
     // select elements in input groups. To fix it, we float the input. Details:
     // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
diff --git a/stylus/mixins.styl b/stylus/mixins.styl
@@ -8,7 +8,10 @@
 
 // Non supported LESS functions
 percentage(n1, n2)
-  unit((n1/n2)*100, "%")
+  if n1 == 0
+    0
+  else
+    unit((n1/n2)*100, "%")
 
 // Utilities
 // -------------------------
@@ -66,7 +69,7 @@ square(l) {
 
 // Placeholder text
 placeholder(color = $input-color-placeholder) {
-  &:-moz-placeholder            {
+  &::-moz-placeholder            {
     color: color; // Firefox
     opacity: 1
   }
@@ -801,15 +804,18 @@ make-grid-columns()
 
 
 make-grid-col-float(class)
-  for i in 1..$grid-columns
+  .col-{class}-1
+    float left
+  for i in 2..$grid-columns
     .col-{class}-{i}
-      float left
+      @extend .col-{class}-1
 
 
 calc-grid(index, class, type)
-  if type == width
-    .col-{class}-{index}
-      width percentage(index, $grid-columns)
+  if index > 0
+    if type == width
+      .col-{class}-{index}
+        width percentage(index, $grid-columns)
   if type == push
     .col-{class}-push-{index}
       left percentage(index, $grid-columns)
@@ -823,7 +829,7 @@ calc-grid(index, class, type)
 
 // Basic looping in Stylus (not sure if the ordering needs to be reversed, but I still did it this way)
 make-grid(columns, class, type)
-  for i in columns..1
+  for i in columns..0
     calc-grid(i, class, type)
 
 // Form validation states
diff --git a/stylus/navs.styl b/stylus/navs.styl
@@ -104,11 +104,6 @@
       }
     }
   }
-  // pulling this in mainly for less shorthand
-  &.nav-justified {
-    nav-justified();
-    nav-tabs-justified();
-  }
 }
 
 
@@ -198,10 +193,10 @@
   > .active > a,
   > .active > a:hover,
   > .active > a:focus {
-    border: 1px solid @nav-tabs-justified-link-border-color;
+    border: 1px solid $nav-tabs-justified-link-border-color;
   }
 
-  @media $media-screen-min-tablet {
+  @media $media-min-tablet {
     > li > a {
       border-bottom: 1px solid $nav-tabs-justified-link-border-color;
       border-radius: $border-radius-base $border-radius-base 0 0;
@@ -214,6 +209,12 @@
   }
 }
 
+// pulling this in mainly for less shorthand
+.nav-tabs.nav-justified {
+  @extend .nav-justified;
+  @extend .nav-tabs-justified;
+}
+
 
 // Tabbable tabs
 // -------------------------
diff --git a/stylus/progress-bars.styl b/stylus/progress-bars.styl
@@ -44,7 +44,7 @@
   text-align: center;
   background-color: $progress-bar-bg;
   box-shadow inset 0 -1px 0 rgba(0,0,0,.15);
-  transition(width .6s ease);
+  transition: width .6s ease;
 }
 
 // Striped bars
diff --git a/stylus/responsive-utilities.styl b/stylus/responsive-utilities.styl
@@ -17,8 +17,10 @@
 // Docs: http://getbootstrap.com/getting-started/#browsers
 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
 
-@-ms-viewport {
-  width: device-width;
+@css {
+  @-ms-viewport {
+    width: device-width;
+  }
 }
 
 
@@ -46,7 +48,7 @@
   }
 }
 .visible-lg {
-  @media $media-screen-min-lg-desktop {
+  @media $media-min-lg-desktop {
     responsive-visibility();
   }
 }
diff --git a/stylus/scaffolding.styl b/stylus/scaffolding.styl
@@ -97,7 +97,7 @@ img-thumbnail() {
   background-color: $thumbnail-bg;
   border: 1px solid $thumbnail-border;
   border-radius: $thumbnail-border-radius;
-  transition(all .2s ease-in-out);
+  transition: all .2s ease-in-out;
 
   // Keep them at most 100% wide
   img-responsive(inline-block);
diff --git a/stylus/thumbnails.styl b/stylus/thumbnails.styl
@@ -12,7 +12,7 @@
   background-color: $thumbnail-bg;
   border: 1px solid $thumbnail-border;
   border-radius: $thumbnail-border-radius;
-  transition(all .2s ease-in-out);
+  transition: all .2s ease-in-out;
 
   > img,
   a > img {
diff --git a/stylus/type.styl b/stylus/type.styl
@@ -164,16 +164,13 @@ ol {
 
 // Inline turns list items into inline-block
 .list-inline {
-  list-unstyled();
+  @extend .list-unstyled;
+  margin-left: -5px;
 
   > li {
     display: inline-block;
     padding-left: 5px;
     padding-right: 5px;
-
-    &:first-child {
-      padding-left: 0;
-    }
   }
 }
 
diff --git a/stylus/variables.styl b/stylus/variables.styl
@@ -42,7 +42,7 @@ $link-hover-color ?=      darken($link-color, 15%);
 $font-family-sans-serif ?=  "Helvetica Neue", Helvetica, Arial, sans-serif;
 $font-family-serif ?=       Georgia, "Times New Roman", Times, serif;
 //** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-$font-family-monospace ?=   Monaco, Menlo, Consolas, "Courier New", monospace;
+$font-family-monospace ?=   Menlo, Monaco, Consolas, "Courier New", monospace;
 $font-family-base ?=        $font-family-sans-serif;
 
 $font-size-base ?=          14px;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "bootstrap-stylus",`
`3`		`- "version": "3.1.0",`
	`3`	`+ "version": "3.1.1",`
`4`	`4`	`"main": "stylus/bootstrap.styl",`
`5`	`5`	`"description": "A port of Bootstrap to Stylus",`
`6`	`6`	`"ignore": [`