Fixed incorrect version number specified for required Twitter Bootstrap

Build v3.1.2
Use window.jQuery in transition.js
2026-04-24 03:00:49 -04:00 · 2014-04-19 19:05:33 +02:00 · 2014-04-19 18:25:38 +02:00 · 2014-04-19 16:43:27 +02:00 · 2014-04-19 16:42:25 +02:00 · 2014-04-19 16:38:06 +02:00
48 changed files with 1272 additions and 285 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,8 +1,8 @@
 /*!
- * Bootstrap's Gruntfile
- * http://getbootstrap.com
- * Copyright 2013-2014 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * Jasny Bootstrap's Gruntfile
+ * http://jasny.github.io/bootstrap
+ * Copyright 2013-2014 Arnold Daniels.
+ * Licensed under Apache License 2.0 (https://github.com/jasny/bootstrap/blob/master/LICENSE)
 */

 module.exports = function (grunt) {
@@ -98,6 +98,7 @@ module.exports = function (grunt) {
      },
      bootstrap: {
        src: [
+          'js/transition.js',
          'js/offcanvas.js',
          'js/rowlink.js',
          'js/inputmask.js',
@@ -298,14 +299,14 @@ module.exports = function (grunt) {
      }
    },

-    sed: {
+    replace: {
      versionNumber: {
-        pattern: (function () {
-          var old = grunt.option('oldver');
-          return old ? RegExp.quote(old) : old;
-        })(),
-        replacement: grunt.option('newver'),
-        recursive: true
+        src: ['*.js', '*.md', '*.json', '*.yml', 'js/*.js'],
+        overwrite: true,
+        replacements: [{
+          from: grunt.option('oldver'),
+          to: grunt.option('newver')
+        }]
      }
    },

@@ -371,10 +372,13 @@ module.exports = function (grunt) {
  // Default task.
  grunt.registerTask('default', ['dist', 'build-customizer']);

+  // Documentation task.
+  grunt.registerTask('docs', ['jekyll', 'dist-docs']);
+  
  // Version numbering task.
  // grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
  // This can be overzealous, so its changes should always be manually reviewed!
-  grunt.registerTask('change-version-number', 'sed');
+  grunt.registerTask('change-version-number', 'replace');

  // task for building customizer
  grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
@@ -385,6 +389,6 @@ module.exports = function (grunt) {
  });

  // Task for updating the npm packages used by the Travis build.
-  grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '_update-shrinkwrap']);
-  grunt.registerTask('_update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); });
+  grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', 'exec:npmShrinkWrap', '∆update-shrinkwrap']);
+  grunt.registerTask('∆update-shrinkwrap', function () { updateShrinkwrap.call(this, grunt); });
 };
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [Jasny Bootstrap](http://jasny.github.io/bootstrap/) [![Build Status](https://secure.travis-ci.org/jasny/bootstrap.png)](http://travis-ci.org/jasny/bootstrap)[![devDependency Status](https://david-dm.org/jasny/bootstrap/dev-status.png)](https://david-dm.org/jasny/bootstrap#info=devDependencies)

-Jasny Bootstrap is a fork of the famous [Twitter Bootstrap](http://getbootstrap.com/) with added components.
+Jasny Bootstrap is an extension of the famous [Twitter Bootstrap](http://getbootstrap.com/), adding the following components:

 * [Button labels](http://jasny.github.io/bootstrap/css/#buttons-labels)
 * [Off canvas navmenu](http://jasny.github.io/bootstrap/components/#navmenu)
@@ -16,9 +16,9 @@ To get started, check out <http://jasny.github.io/bootstrap>!

 Three quick start options are available:

-* [Download the latest release](https://github.com/jasny/bootstrap/releases/tag/v3.0.0-p7).
+* [Download the latest release](https://github.com/jasny/bootstrap/releases/download/v3.1.0/jasny-bootstrap-3.1.0-dist.zip).
 * Clone the repo: `git clone git://github.com/jasny/bootstrap.git`.
-* Install with [Bower](http://bower.io): `bower install bootstrap=jasny/bootstrap`. To install Jasny Bootstrap next to Twitter Bootstrap use `bower install jasny-bootstrap=jasny/bootstrap`.
+* Install with [Bower](http://bower.io): `bower install bootstrap=jasny-bootstrap`.

 Read the [Getting Started page](http://jasny.github.io/bootstrap/getting-started/) for information on the framework contents, templates and examples, and more.

@@ -27,28 +27,7 @@ Read the [Getting Started page](http://jasny.github.io/bootstrap/getting-started
 Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations. You'll see something like this:

 ```
-bootstrap/
-├── css/
-│   ├── bootstrap.css
-│   ├── bootstrap.min.css
-│   ├── bootstrap-theme.css
-│   └── bootstrap-theme.min.css
-├── js/
-│   ├── bootstrap.js
-│   └── bootstrap.min.js
-└── fonts/
-    ├── glyphicons-halflings-regular.eot
-    ├── glyphicons-halflings-regular.svg
-    ├── glyphicons-halflings-regular.ttf
-    └── glyphicons-halflings-regular.woff
-```
-
-We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). Fonts from Glyphicons are included, as is the optional Bootstrap theme.
-
-Alternatively you can extend Twitter Bootstrap by downloading <code>jasny-bootstrap.*</code> files from the extension package, in conjunction with the original Twitter Bootstrap files or a custom build of Bootstrap. The structure of (the compiled) Jasny Bootstrap extension package is:
-
-```
-extend/
+jasny-bootstrap/
 ├── css/
 │   ├── jasny-bootstrap.css
 │   ├── jasny-bootstrap.min.css
@@ -57,6 +36,11 @@ extend/
    └── jasny-bootstrap.min.js
 ```

+We provide compiled CSS and JS (`jasny-bootstrap.*`), as well as compiled and minified CSS and JS (`jasny-bootstrap.min.*`).
+
+Jasny Bootstrap should be loaded after Twitter Bootstrap.
+
+
 ## Bugs and feature requests

 Have a bug or a feature request? [Please open a new issue](https://github.com/jasny/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
@@ -67,7 +51,7 @@ You may use [this JS Bin](http://jsbin.com/iKumuWo/1/edit) as a template for you

 ## Documentation

-Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <http://jasny.github.io/bootstrap>. The docs may also be run locally.
+Jasny Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <http://jasny.github.io/bootstrap>. The docs may also be run locally.

 ### Running documentation locally

@@ -80,7 +64,7 @@ Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com

 ### Documentation for previous releases

-Documentation for v2.3.2 has been made available for the time being at <http://jasny.github.io/bootstrap/2.3.2/> while folks transition to Bootstrap 3.
+Documentation for v2.3.1 has been made available for the time being at <http://jasny.github.io/bootstrap/2.3.1/> while folks transition to Bootstrap 3.

 [Previous releases](https://github.com/jasny/bootstrap/releases) and their documentation are also available for download.

@@ -123,15 +107,12 @@ Should you encounter problems with installing dependencies or running Grunt comm

 ## Contributing

-Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
+Please read through our [contributing guidelines](https://github.com/jasny/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.

 More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).

 Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.

-With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information.
-
-
 ## Community

 Keep track of development and community news.
@@ -141,28 +122,28 @@ Keep track of development and community news.



-
 ## Versioning

-Jasny Bootstrap follows the version of Twitter Bootstrap added with a custom patch number.
+For transparency into our release cycle and in striving to maintain backward compatibility, Jasny Bootstrap is maintained under the Semantic Versioning guidelines. Sometimes we screw up, but we'll adhere to these rules whenever possible.

-`<major>.<minor>.<patch>-p<jasny patch>`
+Releases will be numbered with the following format:
+
+`<major>.<minor>.<patch>`
+
+And constructed with the following guidelines:
+
+- Breaking backward compatibility **bumps the major** while resetting minor and patch
+- New additions without breaking backward compatibility **bumps the minor** while resetting the patch
+- Bug fixes and misc changes **bumps only the patch**
+
+For more information on SemVer, please visit <http://semver.org/>.
+
+__The major version will follow Twitter Bootstraps major version. This means backward compatibility will only be broken if Twitter Bootstrap does so.__

-Backwards compatibility is only broken if Twitter Bootstrap also does so, in which case the major is incremented.


 ## Authors

-**Mark Otto**
-
-+ <http://twitter.com/mdo>
-+ <http://github.com/mdo>
-
-**Jacob Thornton**
-
-+ <http://twitter.com/fat>
-+ <http://github.com/fat>
-
 **Arnold Daniels**

 + [http://twitter.com/ArnoldDaniels](http://twitter.com/ArnoldDaniels)
@@ -172,5 +153,4 @@ Backwards compatibility is only broken if Twitter Bootstrap also does so, in whi

 ## Copyright and license

-Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE).
 Copyright 2013 Jasny BV under [the Apache 2.0 license](LICENSE).
--- a/_config.yml
+++ b/_config.yml
@@ -19,13 +19,13 @@ exclude:
  - "vendor"

 # Custom vars
-current_version:  3.1.0
+current_version:  3.1.2
 repo:             https://github.com/jasny/bootstrap

 download:
-  source:         https://github.com/jasny/bootstrap/archive/v3.1.0.zip
-  dist:           https://github.com/jasny/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip
+  source:         https://github.com/jasny/bootstrap/archive/v3.1.2.zip
+  dist:           https://github.com/jasny/bootstrap/releases/download/v3.1.2/jasny-bootstrap-3.1.2-dist.zip

 cdn:
-  css:            //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.0/css/jasny-bootstrap.min.css
-  js:             //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.0/js/jasny-bootstrap.min.js
+  css:            //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.2/css/jasny-bootstrap.min.css
+  js:             //cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.2/js/jasny-bootstrap.min.js
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
  "name": "jasny-bootstrap",
-  "version": "3.1.0",
+  "version": "3.1.2",
  "main": [
    "./dist/css/jasny-bootstrap.css",
    "./dist/js/jasny-bootstrap.js"
@@ -16,6 +16,6 @@
  ],
  "dependencies": {
    "jquery": ">= 1.9.0",
-    "bootstrap": ">= 3.0.0"
+    "bootstrap": ">= 3.1.0"
  }
 }
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,6 @@
    }
  , "license": "Apache-2.0"
  , "require": {
-      "twitter/bootstrap" : ">=3.0.0"
+      "twitter/bootstrap" : ">=3.1.0"
    }
 }
--- a/dist/css/jasny-bootstrap.css
+++ b/dist/css/jasny-bootstrap.css
@@ -1,12 +1,15 @@
 /*!
- * Jasny Bootstrap v3.1.0 (http://jasny.github.io/bootstrap)
+ * Jasny Bootstrap v3.1.2 (http://jasny.github.io/bootstrap)
 * Copyright 2012-2014 Arnold Daniels
 * Licensed under Apache-2.0 (https://github.com/jasny/bootstrap/blob/master/LICENSE)
 */

+.container-smooth {
+  max-width: 1170px;
+}
@media (min-width: 1px) {
  .container-smooth {
-    max-width: 1170px;
+    width: auto;
  }
 }
 .btn-labeled {
@@ -151,12 +154,17 @@
  border-radius: 0;
 }
 .navmenu-fixed-left,
-.navbar-offcanvas {
+.navbar-offcanvas.navmenu-fixed-left {
+  right: auto;
+  bottom: 0;
  left: 0;
+  overflow-y: auto;
  border-width: 0 1px 0 0;
 }
-.navmenu-fixed-right {
+.navmenu-fixed-right,
+.navbar-offcanvas {
  right: 0;
+  left: auto;
  border-width: 0 0 0 1px;
 }
 .navmenu-nav {
@@ -515,13 +523,13 @@
  position: absolute;
  top: 0;
  right: 0;
+  width: 100%;
  height: 100%;
  margin: 0;
  font-size: 23px;
  cursor: pointer;
  filter: alpha(opacity=0);
  opacity: 0;
-  transform: translate(-300px, 0) scale(4);

  direction: ltr;
 }
@@ -565,13 +573,27 @@
 .form-control .fileinput-filename {
  vertical-align: bottom;
 }
+.fileinput.input-group {
+  display: table;
+}
+.fileinput.input-group > * {
+  position: relative;
+  z-index: 2;
+}
+.fileinput.input-group > .btn-file {
+  z-index: 1;
+}
+.fileinput-new.input-group .btn-file,
 .fileinput-new .input-group .btn-file {
  border-radius: 0 4px 4px 0;
 }
+.fileinput-new.input-group .btn-file.btn-xs,
 .fileinput-new .input-group .btn-file.btn-xs,
+.fileinput-new.input-group .btn-file.btn-sm,
 .fileinput-new .input-group .btn-file.btn-sm {
  border-radius: 0 3px 3px 0;
 }
+.fileinput-new.input-group .btn-file.btn-lg,
 .fileinput-new .input-group .btn-file.btn-lg {
  border-radius: 0 6px 6px 0;
 }
--- a/dist/css/jasny-bootstrap.css.map
+++ b/dist/css/jasny-bootstrap.css.map
--- a/dist/css/jasny-bootstrap.min.css
+++ b/dist/css/jasny-bootstrap.min.css
--- a/dist/js/jasny-bootstrap.js
+++ b/dist/js/jasny-bootstrap.js
@@ -1,5 +1,5 @@
 /*!
- * Jasny Bootstrap v3.1.0 (http://jasny.github.io/bootstrap)
+ * Jasny Bootstrap v3.1.2 (http://jasny.github.io/bootstrap)
 * Copyright 2012-2014 Arnold Daniels
 * Licensed under Apache-2.0 (https://github.com/jasny/bootstrap/blob/master/LICENSE)
 */
@@ -7,12 +7,61 @@
 if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScript requires jQuery') }

 /* ========================================================================
- * Bootstrap: offcanvas.js v3.0.3-p7
- * http://jasny.github.io/bootstrap/javascript.html#offcanvas
- * 
- * Based on Boostrap collapse.js by Twitter, Inc. 
+ * Bootstrap: transition.js v3.1.2
+ * http://getbootstrap.com/javascript/#transitions
 * ========================================================================
- * Copyright 2013 Jasny, BV.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
+function ($) {
+  'use strict';
+
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
+
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
+
+    var transEndEventNames = {
+      WebkitTransition : 'webkitTransitionEnd',
+      MozTransition    : 'transitionend',
+      OTransition      : 'oTransitionEnd otransitionend',
+      transition       : 'transitionend'
+    }
+
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
+      }
+    }
+
+    return false // explicit for ie8 (  ._.)
+  }
+
+  if ($.support.transition !== undefined) return  // Prevent conflict with Twitter Bootstrap
+
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false, $el = this
+    $(this).one($.support.transition.end, function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
+
+  $(function () {
+    $.support.transition = transitionEnd()
+  })
+
+}(window.jQuery);
+
+/* ========================================================================
+ * Bootstrap: offcanvas.js v3.1.2
+ * http://jasny.github.io/bootstrap/javascript/#offcanvas
+ * ========================================================================
+ * Copyright 2013-2014 Arnold Daniels
 *
 * Licensed under the Apache License, Version 2.0 (the "License")
 * you may not use this file except in compliance with the License.
@@ -36,6 +85,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    this.$element = $(element)
    this.options  = $.extend({}, OffCanvas.DEFAULTS, options)
    this.state    = null
+    this.placement = null
    
    if (this.options.recalc) {
      this.calcClone()
@@ -46,17 +96,23 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
      $(document).on('click', $.proxy(this.autohide, this))

    if (this.options.toggle) this.toggle()
+    
+    if (this.options.disablescrolling) {
+        this.options.disableScrolling = this.options.disablescrolling
+        delete this.options.disablescrolling
+    }
  }

  OffCanvas.DEFAULTS = {
    toggle: true,
-    placement: 'left',
+    placement: 'auto',
    autohide: true,
-    recalc: true
+    recalc: true,
+    disableScrolling: true
  }

  OffCanvas.prototype.offset = function () {
-    switch (this.options.placement) {
+    switch (this.placement) {
      case 'left':
      case 'right':  return this.$element.outerWidth()
      case 'top':
@@ -65,26 +121,31 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
  }
  
  OffCanvas.prototype.calcPlacement = function () {
-    var horizontal = $(window).width() / this.$element.width(),
-        vertical = $(window).height() / this.$element.height()
-        
+    if (this.options.placement !== 'auto') {
+        this.placement = this.options.placement
+        return
+    }
+    
    if (!this.$element.hasClass('in')) {
      this.$element.css('visiblity', 'hidden !important').addClass('in')
    } 
    
+    var horizontal = $(window).width() / this.$element.width()
+    var vertical = $(window).height() / this.$element.height()
+        
    var element = this.$element
    function ab(a, b) {
      if (element.css(b) === 'auto') return a
      if (element.css(a) === 'auto') return b
      
-      var size_a = parseInt(element.css(a), 10),
-          size_b = parseInt(element.css(b), 10)
+      var size_a = parseInt(element.css(a), 10)
+      var size_b = parseInt(element.css(b), 10)
  
      return size_a > size_b ? b : a
    }
    
-    this.options.placement = horizontal > vertical ? ab('left', 'right') : ab('top', 'bottom')
-    
+    this.placement = horizontal >= vertical ? ab('left', 'right') : ab('top', 'bottom')
+      
    if (this.$element.css('visibility') === 'hidden !important') {
      this.$element.removeClass('in').css('visiblity', '')
    }
@@ -114,12 +175,12 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    // Use jQuery animation if CSS transitions aren't supported
    if (!$.support.transition) {
      var anim = {}
-      anim[this.options.placement] = "+=" + offset
+      anim[this.placement] = "+=" + offset
      return elements.animate(anim, 350, callback)
    }

-    var placement = this.options.placement,
-        opposite = this.opposite(placement)
+    var placement = this.placement
+    var opposite = this.opposite(placement)
    
    elements.each(function() {
      if ($(this).css(placement) !== 'auto')
@@ -136,7 +197,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr

  OffCanvas.prototype.disableScrolling = function() {
    var bodyWidth = $('body').width()
-    var prop = 'padding-' + this.opposite(this.options.placement)
+    var prop = 'padding-' + this.opposite(this.placement)

    if ($('body').data('offcanvas-style') === undefined) $('body').data('offcanvas-style', $('body').attr('style'))
    
@@ -158,17 +219,22 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    this.$element.trigger(startEvent)
    if (startEvent.isDefaultPrevented()) return

-    if (this.options.placement === 'auto') this.calcPlacement()
-
-    this.state = 'sliding'
-
+    this.state = 'slide-in'
+    this.calcPlacement();
+    
    var elements = this.getCanvasElements()
-    var offset = this.offset(),
-        placement = this.options.placement,
-        opposite = this.opposite(placement)
+    var placement = this.placement
+    var opposite = this.opposite(placement)
+    var offset = this.offset()
+
+    if (elements.index(this.$element) !== -1) {
+      $(this.$element).data('offcanvas-style', $(this.$element).attr('style') || '')
+      this.$element.css(placement, -1 * offset)
+      this.$element.css(placement); // Workaround: Need to get the CSS property for it to be applied before the next line of code
+    }

    elements.addClass('canvas-sliding').each(function() {
-      $(this).data('offcanvas-style', $(this).attr('style') || '')
+      if ($(this).data('offcanvas-style') === undefined) $(this).data('offcanvas-style', $(this).attr('style') || '')
      if ($(this).css('position') === 'static') $(this).css('position', 'relative')
      if (($(this).css(placement) === 'auto' || $(this).css(placement) === '0px') &&
          ($(this).css(opposite) === 'auto' || $(this).css(opposite) === '0px')) {
@@ -176,11 +242,11 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
      }
    })
    
-    if (elements.index(this.$element) !== -1) this.$element.css(placement, -1 * offset)
-
-    this.disableScrolling()
+    if (this.options.disableScrolling) this.disableScrolling()
    
    var complete = function () {
+      if (this.state != 'slide-in') return
+      
      this.state = 'slid'

      elements.removeClass('canvas-sliding').addClass('canvas-slid')
@@ -200,18 +266,22 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    this.$element.trigger(startEvent)
    if (startEvent.isDefaultPrevented()) return

-    this.state = 'sliding'
+    this.state = 'slide-out'

    var elements = $('.canvas-slid')
+    var placement = this.placement
    var offset = -1 * this.offset()

    var complete = function () {
+      if (this.state != 'slide-out') return
+      
      this.state = null
-
+      this.placement = null
+      
      this.$element.removeClass('in')
      
      elements.removeClass('canvas-sliding')
-      elements.add('body').each(function() {
+      elements.add(this.$element).add('body').each(function() {
        $(this).attr('style', $(this).data('offcanvas-style')).removeData('offcanvas-style')
      })

@@ -226,7 +296,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
  }

  OffCanvas.prototype.toggle = function () {
-    if (this.state === 'sliding') return
+    if (this.state === 'slide-in' || this.state === 'slide-out') return
    this[this.state === 'slid' ? 'hide' : 'show']()
  }

@@ -238,17 +308,18 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
  }

  OffCanvas.prototype.recalc = function () {
-    if (this.state() !== 'slid' || this.$calcClone.css('display') === 'none') return
+    if (this.$calcClone.css('display') === 'none' || (this.state !== 'slid' && this.state !== 'slide-in')) return
    
-    var offset = -1 * this.offset()
+    this.state = null
+    this.placement = null
+    var elements = this.getCanvasElements()
    
-    var placement = this.options.placement
-    this.getCanvasElements().each(function() {
-      $(this).css(placement, (parseInt($(this).css(placement), 10) || 0) + offset)
-    }).removeClass('canvas-slid')
+    this.$element.removeClass('in')
    
-    $('body').css('overflow', '')
-    this.$element.css(placement, '').removeClass('in canvas-slid')
+    elements.removeClass('canvas-slid')
+    elements.add(this.$element).add('body').each(function() {
+      $(this).attr('style', $(this).data('offcanvas-style')).removeData('offcanvas-style')
+    })
  }
  
  OffCanvas.prototype.autohide = function (e) {
@@ -264,10 +335,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    return this.each(function () {
      var $this   = $(this)
      var data    = $this.data('bs.offcanvas')
-      var options = $.extend({}, OffCanvas.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var options = $.extend({}, OffCanvas.DEFAULTS, $this.data(), typeof option === 'object' && option)

      if (!data) $this.data('bs.offcanvas', (data = new OffCanvas(this, options)))
-      if (typeof option == 'string') data[option]()
+      if (typeof option === 'string') data[option]()
    })
  }

@@ -304,10 +375,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
 }(window.jQuery);

 /* ============================================================
- * Bootstrap: rowlink.js v3.0.0-p7
- * http://jasny.github.io/bootstrap/javascript.html#rowlink
+ * Bootstrap: rowlink.js v3.1.2
+ * http://jasny.github.io/bootstrap/javascript/#rowlink
 * ============================================================
- * Copyright 2012 Jasny BV, Netherlands.
+ * Copyright 2012-2014 Arnold Daniels
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -380,6 +451,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
  // ==================

  $(document).on('click.bs.rowlink.data-api', '[data-link="row"]', function (e) {
+    if ($(e.target).closest('.rowlink-skip').length !== 0) return
+    
    var $this = $(this)
    if ($this.data('rowlink')) return
    $this.rowlink($this.data())
@@ -389,11 +462,12 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
 }(window.jQuery);

 /* ===========================================================
- * Bootstrap: inputmask.js v3.0.0-p7
- * http://jasny.github.io/bootstrap/javascript.html#inputmask
+ * Bootstrap: inputmask.js v3.1.0
+ * http://jasny.github.io/bootstrap/javascript/#inputmask
+ * 
 * Based on Masked Input plugin by Josh Bush (digitalbush.com)
 * ===========================================================
- * Copyright 2012 Jasny BV, Netherlands.
+ * Copyright 2012-2014 Arnold Daniels
 *
 * Licensed under the Apache License, Version 2.0 (the "License")
 * you may not use this file except in compliance with the License.
@@ -421,7 +495,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    if (isAndroid) return // No support because caret positioning doesn't work on Android
    
    this.$element = $(element)
-    this.options = $.extend({}, Inputmask.DEFAULS, options)
+    this.options = $.extend({}, Inputmask.DEFAULTS, options)
    this.mask = String(this.options.mask)
    
    this.init()
@@ -430,7 +504,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    this.checkVal() //Perform initial check for existing values
  }

-  Inputmask.DEFAULS = {
+  Inputmask.DEFAULTS = {
    mask: "",
    placeholder: "_",
    definitions: {
@@ -749,10 +823,10 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
 }(window.jQuery);

 /* ===========================================================
- * Bootstrap: fileinput.js v3.1.0
+ * Bootstrap: fileinput.js v3.1.2
 * http://jasny.github.com/bootstrap/javascript/#fileinput
 * ===========================================================
- * Copyright 2012-2014 Jasny BV, Netherlands.
+ * Copyright 2012-2014 Arnold Daniels
 *
 * Licensed under the Apache License, Version 2.0 (the "License")
 * you may not use this file except in compliance with the License.
@@ -784,14 +858,15 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr

    this.$hidden = this.$element.find('input[type=hidden][name="' + this.name + '"]')
    if (this.$hidden.length === 0) {
-      this.$hidden = $('<input type="hidden" />')
-      this.$element.prepend(this.$hidden)
+      this.$hidden = $('<input type="hidden">').insertBefore(this.$input)
    }

    this.$preview = this.$element.find('.fileinput-preview')
    var height = this.$preview.css('height')
-    if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height)
-
+    if (this.$preview.css('display') !== 'inline' && height !== '0px' && height !== 'none') {
+      this.$preview.css('line-height', height)
+    }
+        
    this.original = {
      exists: this.$element.hasClass('fileinput-exists'),
      preview: this.$preview.html(),
@@ -810,24 +885,30 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
  },

  Fileinput.prototype.change = function(e) {
-    if (e.target.files === undefined) e.target.files = e.target && e.target.value ? [ {name: e.target.value.replace(/^.+\\/, '')} ] : []
-    if (e.target.files.length === 0) return
+    var files = e.target.files === undefined ? (e.target && e.target.value ? [{ name: e.target.value.replace(/^.+\\/, '')}] : []) : e.target.files
+    
+    e.stopPropagation()
+
+    if (files.length === 0) {
+      this.clear()
+      return
+    }

    this.$hidden.val('')
    this.$hidden.attr('name', '')
    this.$input.attr('name', this.name)

-    var file = e.target.files[0]
+    var file = files[0]

-    if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
+    if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match(/^image\/(gif|png|jpeg)$/) : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
      var reader = new FileReader()
      var preview = this.$preview
      var element = this.$element

      reader.onload = function(re) {
-        var $img = $('<img>') // .attr('src', re.target.result)
+        var $img = $('<img>')
        $img[0].src = re.target.result
-        e.target.files[0].result = re.target.result
+        files[0].result = re.target.result
        
        element.find('.fileinput-filename').text(file.name)
        
@@ -837,7 +918,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
        preview.html($img)
        element.addClass('fileinput-exists').removeClass('fileinput-new')

-        element.trigger('change.bs.fileinput', e.target.files)
+        element.trigger('change.bs.fileinput', files)
      }

      reader.readAsDataURL(file)
@@ -872,14 +953,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Jasny Bootstrap\'s JavaScr
    this.$element.find('.fileinput-filename').text('')
    this.$element.addClass('fileinput-new').removeClass('fileinput-exists')
    
-    if (e !== false) {
+    if (e !== undefined) {
      this.$input.trigger('change')
      this.$element.trigger('clear.bs.fileinput')
    }
  },

  Fileinput.prototype.reset = function() {
-    this.clear(false)
+    this.clear()

    this.$hidden.val(this.original.hiddenVal)
    this.$preview.html(this.original.preview)
--- a/dist/js/jasny-bootstrap.min.js
+++ b/dist/js/jasny-bootstrap.min.js
--- a/docs/assets/js/customize.min.js
+++ b/docs/assets/js/customize.min.js
--- a/docs/assets/js/raw-files.min.js
+++ b/docs/assets/js/raw-files.min.js
--- a/docs/customize.html
+++ b/docs/customize.html
@@ -123,6 +123,12 @@ base_url: "../"
            Off canvas
          </label>
        </div>
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" checked value="transition.js">
+            Transitions <small>(required for any kind of animation)</small>
+          </label>
+        </div>
      </div>
    </div>

--- a/docs/dist/css/jasny-bootstrap.css.map
+++ b/docs/dist/css/jasny-bootstrap.css.map
--- a/docs/dist/css/jasny-bootstrap.min.css
+++ b/docs/dist/css/jasny-bootstrap.min.css
--- a/docs/dist/js/jasny-bootstrap.min.js
+++ b/docs/dist/js/jasny-bootstrap.min.js
--- a/docs/examples/navbar-offcanvas/index.html
+++ b/docs/examples/navbar-offcanvas/index.html
@@ -44,9 +44,10 @@
        <div class="navbar-offcanvas offcanvas">
          <a class="navmenu-brand" href="#">Project name</a>
          <ul class="nav navbar-nav">
-            <li class="active"><a href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
-            <li><a href="#">Link</a></li>
+            <li><a href="../navmenu/">Slide in</a></li>
+            <li><a href="../navmenu-push/">Push</a></li>
+            <li><a href="../navmenu-reveal">Reveal</a></li>
+            <li class="active"><a href="./">Off canvas navbar</a></li>
            <li class="dropdown">
              <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
              <ul class="dropdown-menu">
@@ -68,6 +69,11 @@
        <h1>Offcanvas Navbar example</h1>
        <p>This example demonstrates using the offcanvas plugin with the navbar.</p>
      </div>
+      
+      <p>
+        By default the navbar is show on the right side of the screen. You can show it on the left side instead by
+        adding <code>.navmenu-fixed-left</code> to the <code>.navbar-offcanvas</code>.
+      </p>
    </div> <!-- /container -->


--- a/docs/examples/navmenu-push/index.html
+++ b/docs/examples/navmenu-push/index.html
@@ -33,6 +33,7 @@
        <li><a href="../navmenu/">Slide in</a></li>
        <li class="active"><a href="./">Push</a></li>
        <li><a href="../navmenu-reveal/">Reveal</a></li>
+        <li><a href="../navbar-offcanvas/">Off canvas navbar</a></li>
      </ul>
      <ul class="nav navmenu-nav">
        <li><a href="#">Link</a></li>
@@ -76,5 +77,6 @@
    <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
    <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
    <script src="../../dist/js/jasny-bootstrap.min.js"></script>
+    <script src="../../../js/offcanvas.js"></script>
  </body>
 </html>
--- a/docs/examples/navmenu-reveal/index.html
+++ b/docs/examples/navmenu-reveal/index.html
@@ -33,6 +33,7 @@
        <li><a href="../navmenu/">Slide in</a></li>
        <li><a href="../navmenu-push/">Push</a></li>
        <li class="active"><a href="./">Reveal</a></li>
+        <li><a href="../navbar-offcanvas/">Off canvas navbar</a></li>
      </ul>
      <ul class="nav navmenu-nav">
        <li><a href="#">Link</a></li>
@@ -69,7 +70,7 @@
        <p class="lead">This example demonstrates the use of the offcanvas plugin with a reveal effect.</p>
        <p>On the contrary of the push effect, the menu doesn't move with the canvas.</p>
        <p>You get the reveal effect by wrapping the content in a div and setting the <code>canvas</code> option to target that div.</p>
-        <p>Note that in this example, the navmenu doesn't have the <code>.offcanvas</code> class, but is placed under the canvas by setting the <code>z-index</code>.</p>
+        <p>Note that in this example, the navmenu doesn't have the <code>offcanvas</code> class, but is placed under the canvas by setting the <code>z-index</code>.</p>
        <p>Also take a look at the examples for a navmenu with <a href="../navmenu">slide in effect</a> and <a href="../navmenu-push">push effect</a>.</p>
      </div><!-- /.container -->
    </div>
--- a/docs/examples/navmenu/index.html
+++ b/docs/examples/navmenu/index.html
@@ -33,6 +33,7 @@
        <li class="active"><a href="./">Slide in</a></li>
        <li><a href="../navmenu-push/">Push</a></li>
        <li><a href="../navmenu-reveal/">Reveal</a></li>
+        <li><a href="../navbar-offcanvas/">Off canvas navbar</a></li>
      </ul>
      <ul class="nav navmenu-nav">
        <li><a href="#">Link</a></li>
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -60,7 +60,7 @@ $.fn.bootstrapBtn = bootstrapButton            // give $().bootstrapBtn the Boot

    <h3 id="js-events">Events</h3>
    <p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
-    <p>As of 3.0.0, all Bootstrap events are namespaced.</p>
+    <p>As of 3.1.2, all Bootstrap events are namespaced.</p>
    <p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p>
 {% highlight js %}
 $('#myMenu').on('show.bs.offcanvas', function (e) {
@@ -180,6 +180,12 @@ $('.navmenu').offcanvas()
          <td>true</td>
          <td>Calculate if off canvas should be disabled for this viewport width on window resize. If your elements always gets hidden on window resize, try setting this to false.</td>
        </tr>
+        <tr>
+          <td>disableScrolling</td>
+          <td>boolean</td>
+          <td>true</td>
+          <td>Disable scrolling when the off canvas element is shown, by setting overflow to hidden for the body.</td>
+        </tr>
      </tbody>
    </table>
    
@@ -416,21 +422,17 @@ $('.inputmask').inputmask({

    <h3>File input widgets</h3>
    <div class="bs-example">
-      <div class="fileinput fileinput-new" data-provides="fileinput">
-        <div class="input-group">
-          <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
-          <span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file"></span>
-          <a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
-        </div>
+      <div class="fileinput fileinput-new input-group" data-provides="fileinput">
+        <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
+        <span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file"></span>
+        <a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
      </div>
    </div>
 {% highlight html %}
-<div class="fileinput fileinput-new" data-provides="fileinput">
-  <div class="input-group">
-    <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
-    <span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file" name="..."></span>
-    <a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
-  </div>
+<div class="fileinput fileinput-new input-group" data-provides="fileinput">
+  <div class="form-control" data-trigger="fileinput"><i class="glyphicon glyphicon-file fileinput-exists"></i> <span class="fileinput-filename"></span></div>
+  <span class="input-group-addon btn btn-default btn-file"><span class="fileinput-new">Select file</span><span class="fileinput-exists">Change</span><input type="file" name="..."></span>
+  <a href="#" class="input-group-addon btn btn-default fileinput-exists" data-dismiss="fileinput">Remove</a>
 </div>
 {% endhighlight %}

--- a/js/fileinput.js
+++ b/js/fileinput.js
@@ -1,5 +1,5 @@
 /* ===========================================================
- * Bootstrap: fileinput.js v3.1.0
+ * Bootstrap: fileinput.js v3.1.2
 * http://jasny.github.com/bootstrap/javascript/#fileinput
 * ===========================================================
 * Copyright 2012-2014 Arnold Daniels
@@ -34,14 +34,15 @@

    this.$hidden = this.$element.find('input[type=hidden][name="' + this.name + '"]')
    if (this.$hidden.length === 0) {
-      this.$hidden = $('<input type="hidden" />')
-      this.$element.prepend(this.$hidden)
+      this.$hidden = $('<input type="hidden">').insertBefore(this.$input)
    }

    this.$preview = this.$element.find('.fileinput-preview')
    var height = this.$preview.css('height')
-    if (this.$preview.css('display') != 'inline' && height != '0px' && height != 'none') this.$preview.css('line-height', height)
-
+    if (this.$preview.css('display') !== 'inline' && height !== '0px' && height !== 'none') {
+      this.$preview.css('line-height', height)
+    }
+        
    this.original = {
      exists: this.$element.hasClass('fileinput-exists'),
      preview: this.$preview.html(),
@@ -60,24 +61,30 @@
  },

  Fileinput.prototype.change = function(e) {
-    if (e.target.files === undefined) e.target.files = e.target && e.target.value ? [ {name: e.target.value.replace(/^.+\\/, '')} ] : []
-    if (e.target.files.length === 0) return
+    var files = e.target.files === undefined ? (e.target && e.target.value ? [{ name: e.target.value.replace(/^.+\\/, '')}] : []) : e.target.files
+    
+    e.stopPropagation()
+
+    if (files.length === 0) {
+      this.clear()
+      return
+    }

    this.$hidden.val('')
    this.$hidden.attr('name', '')
    this.$input.attr('name', this.name)

-    var file = e.target.files[0]
+    var file = files[0]

-    if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match('image.*') : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
+    if (this.$preview.length > 0 && (typeof file.type !== "undefined" ? file.type.match(/^image\/(gif|png|jpeg)$/) : file.name.match(/\.(gif|png|jpe?g)$/i)) && typeof FileReader !== "undefined") {
      var reader = new FileReader()
      var preview = this.$preview
      var element = this.$element

      reader.onload = function(re) {
-        var $img = $('<img>') // .attr('src', re.target.result)
+        var $img = $('<img>')
        $img[0].src = re.target.result
-        e.target.files[0].result = re.target.result
+        files[0].result = re.target.result
        
        element.find('.fileinput-filename').text(file.name)
        
@@ -87,7 +94,7 @@
        preview.html($img)
        element.addClass('fileinput-exists').removeClass('fileinput-new')

-        element.trigger('change.bs.fileinput', e.target.files)
+        element.trigger('change.bs.fileinput', files)
      }

      reader.readAsDataURL(file)
@@ -122,14 +129,14 @@
    this.$element.find('.fileinput-filename').text('')
    this.$element.addClass('fileinput-new').removeClass('fileinput-exists')
    
-    if (e !== false) {
+    if (e !== undefined) {
      this.$input.trigger('change')
      this.$element.trigger('clear.bs.fileinput')
    }
  },

  Fileinput.prototype.reset = function() {
-    this.clear(false)
+    this.clear()

    this.$hidden.val(this.original.hiddenVal)
    this.$preview.html(this.original.preview)
--- a/js/inputmask.js
+++ b/js/inputmask.js
@@ -32,7 +32,7 @@
    if (isAndroid) return // No support because caret positioning doesn't work on Android
    
    this.$element = $(element)
-    this.options = $.extend({}, Inputmask.DEFAULS, options)
+    this.options = $.extend({}, Inputmask.DEFAULTS, options)
    this.mask = String(this.options.mask)
    
    this.init()
@@ -41,7 +41,7 @@
    this.checkVal() //Perform initial check for existing values
  }

-  Inputmask.DEFAULS = {
+  Inputmask.DEFAULTS = {
    mask: "",
    placeholder: "_",
    definitions: {
--- a/js/offcanvas.js
+++ b/js/offcanvas.js
@@ -1,8 +1,6 @@
 /* ========================================================================
- * Bootstrap: offcanvas.js v3.1.0
+ * Bootstrap: offcanvas.js v3.1.2
 * http://jasny.github.io/bootstrap/javascript/#offcanvas
- * 
- * Based on Boostrap collapse.js by Twitter, Inc. 
 * ========================================================================
 * Copyright 2013-2014 Arnold Daniels
 *
@@ -28,6 +26,7 @@
    this.$element = $(element)
    this.options  = $.extend({}, OffCanvas.DEFAULTS, options)
    this.state    = null
+    this.placement = null
    
    if (this.options.recalc) {
      this.calcClone()
@@ -38,17 +37,23 @@
      $(document).on('click', $.proxy(this.autohide, this))

    if (this.options.toggle) this.toggle()
+    
+    if (this.options.disablescrolling) {
+        this.options.disableScrolling = this.options.disablescrolling
+        delete this.options.disablescrolling
+    }
  }

  OffCanvas.DEFAULTS = {
    toggle: true,
-    placement: 'left',
+    placement: 'auto',
    autohide: true,
-    recalc: true
+    recalc: true,
+    disableScrolling: true
  }

  OffCanvas.prototype.offset = function () {
-    switch (this.options.placement) {
+    switch (this.placement) {
      case 'left':
      case 'right':  return this.$element.outerWidth()
      case 'top':
@@ -57,26 +62,31 @@
  }
  
  OffCanvas.prototype.calcPlacement = function () {
-    var horizontal = $(window).width() / this.$element.width(),
-        vertical = $(window).height() / this.$element.height()
-        
+    if (this.options.placement !== 'auto') {
+        this.placement = this.options.placement
+        return
+    }
+    
    if (!this.$element.hasClass('in')) {
      this.$element.css('visiblity', 'hidden !important').addClass('in')
    } 
    
+    var horizontal = $(window).width() / this.$element.width()
+    var vertical = $(window).height() / this.$element.height()
+        
    var element = this.$element
    function ab(a, b) {
      if (element.css(b) === 'auto') return a
      if (element.css(a) === 'auto') return b
      
-      var size_a = parseInt(element.css(a), 10),
-          size_b = parseInt(element.css(b), 10)
+      var size_a = parseInt(element.css(a), 10)
+      var size_b = parseInt(element.css(b), 10)
  
      return size_a > size_b ? b : a
    }
    
-    this.options.placement = horizontal > vertical ? ab('left', 'right') : ab('top', 'bottom')
-    
+    this.placement = horizontal >= vertical ? ab('left', 'right') : ab('top', 'bottom')
+      
    if (this.$element.css('visibility') === 'hidden !important') {
      this.$element.removeClass('in').css('visiblity', '')
    }
@@ -106,12 +116,12 @@
    // Use jQuery animation if CSS transitions aren't supported
    if (!$.support.transition) {
      var anim = {}
-      anim[this.options.placement] = "+=" + offset
+      anim[this.placement] = "+=" + offset
      return elements.animate(anim, 350, callback)
    }

-    var placement = this.options.placement,
-        opposite = this.opposite(placement)
+    var placement = this.placement
+    var opposite = this.opposite(placement)
    
    elements.each(function() {
      if ($(this).css(placement) !== 'auto')
@@ -128,7 +138,7 @@

  OffCanvas.prototype.disableScrolling = function() {
    var bodyWidth = $('body').width()
-    var prop = 'padding-' + this.opposite(this.options.placement)
+    var prop = 'padding-' + this.opposite(this.placement)

    if ($('body').data('offcanvas-style') === undefined) $('body').data('offcanvas-style', $('body').attr('style'))
    
@@ -150,17 +160,22 @@
    this.$element.trigger(startEvent)
    if (startEvent.isDefaultPrevented()) return

-    if (this.options.placement === 'auto') this.calcPlacement()
-
-    this.state = 'sliding'
-
+    this.state = 'slide-in'
+    this.calcPlacement();
+    
    var elements = this.getCanvasElements()
-    var offset = this.offset(),
-        placement = this.options.placement,
-        opposite = this.opposite(placement)
+    var placement = this.placement
+    var opposite = this.opposite(placement)
+    var offset = this.offset()
+
+    if (elements.index(this.$element) !== -1) {
+      $(this.$element).data('offcanvas-style', $(this.$element).attr('style') || '')
+      this.$element.css(placement, -1 * offset)
+      this.$element.css(placement); // Workaround: Need to get the CSS property for it to be applied before the next line of code
+    }

    elements.addClass('canvas-sliding').each(function() {
-      $(this).data('offcanvas-style', $(this).attr('style') || '')
+      if ($(this).data('offcanvas-style') === undefined) $(this).data('offcanvas-style', $(this).attr('style') || '')
      if ($(this).css('position') === 'static') $(this).css('position', 'relative')
      if (($(this).css(placement) === 'auto' || $(this).css(placement) === '0px') &&
          ($(this).css(opposite) === 'auto' || $(this).css(opposite) === '0px')) {
@@ -168,11 +183,11 @@
      }
    })
    
-    if (elements.index(this.$element) !== -1) this.$element.css(placement, -1 * offset)
-
-    this.disableScrolling()
+    if (this.options.disableScrolling) this.disableScrolling()
    
    var complete = function () {
+      if (this.state != 'slide-in') return
+      
      this.state = 'slid'

      elements.removeClass('canvas-sliding').addClass('canvas-slid')
@@ -192,18 +207,22 @@
    this.$element.trigger(startEvent)
    if (startEvent.isDefaultPrevented()) return

-    this.state = 'sliding'
+    this.state = 'slide-out'

    var elements = $('.canvas-slid')
+    var placement = this.placement
    var offset = -1 * this.offset()

    var complete = function () {
+      if (this.state != 'slide-out') return
+      
      this.state = null
-
+      this.placement = null
+      
      this.$element.removeClass('in')
      
      elements.removeClass('canvas-sliding')
-      elements.add('body').each(function() {
+      elements.add(this.$element).add('body').each(function() {
        $(this).attr('style', $(this).data('offcanvas-style')).removeData('offcanvas-style')
      })

@@ -218,7 +237,7 @@
  }

  OffCanvas.prototype.toggle = function () {
-    if (this.state === 'sliding') return
+    if (this.state === 'slide-in' || this.state === 'slide-out') return
    this[this.state === 'slid' ? 'hide' : 'show']()
  }

@@ -230,17 +249,18 @@
  }

  OffCanvas.prototype.recalc = function () {
-    if (this.state() !== 'slid' || this.$calcClone.css('display') === 'none') return
+    if (this.$calcClone.css('display') === 'none' || (this.state !== 'slid' && this.state !== 'slide-in')) return
    
-    var offset = -1 * this.offset()
+    this.state = null
+    this.placement = null
+    var elements = this.getCanvasElements()
    
-    var placement = this.options.placement
-    this.getCanvasElements().each(function() {
-      $(this).css(placement, (parseInt($(this).css(placement), 10) || 0) + offset)
-    }).removeClass('canvas-slid')
+    this.$element.removeClass('in')
    
-    $('body').css('overflow', '')
-    this.$element.css(placement, '').removeClass('in canvas-slid')
+    elements.removeClass('canvas-slid')
+    elements.add(this.$element).add('body').each(function() {
+      $(this).attr('style', $(this).data('offcanvas-style')).removeData('offcanvas-style')
+    })
  }
  
  OffCanvas.prototype.autohide = function (e) {
@@ -256,10 +276,10 @@
    return this.each(function () {
      var $this   = $(this)
      var data    = $this.data('bs.offcanvas')
-      var options = $.extend({}, OffCanvas.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var options = $.extend({}, OffCanvas.DEFAULTS, $this.data(), typeof option === 'object' && option)

      if (!data) $this.data('bs.offcanvas', (data = new OffCanvas(this, options)))
-      if (typeof option == 'string') data[option]()
+      if (typeof option === 'string') data[option]()
    })
  }

--- a/js/rowlink.js
+++ b/js/rowlink.js
@@ -1,5 +1,5 @@
 /* ============================================================
- * Bootstrap: rowlink.js v3.1.0
+ * Bootstrap: rowlink.js v3.1.2
 * http://jasny.github.io/bootstrap/javascript/#rowlink
 * ============================================================
 * Copyright 2012-2014 Arnold Daniels
@@ -75,6 +75,8 @@
  // ==================

  $(document).on('click.bs.rowlink.data-api', '[data-link="row"]', function (e) {
+    if ($(e.target).closest('.rowlink-skip').length !== 0) return
+    
    var $this = $(this)
    if ($this.data('rowlink')) return
    $this.rowlink($this.data())
--- a/js/tests/unit/inputmask.js
+++ b/js/tests/unit/inputmask.js
@@ -1,6 +1,13 @@
 $(function () {

-    module('inputmask')
+      var $body;
+
+      module('inputmask', {
+        setup : function() {
+          $body = $(document.body);
+          $body.removeData('inputmask');
+        }
+      })

      test('should provide no conflict', function () {
        var inputmask = $.fn.inputmask.noConflict()
@@ -15,6 +22,60 @@ $(function () {
      test('should return element', function () {
        ok($(document.body).inputmask()[0] == document.body, 'document.body returned')
      })
-      
+
+      test('should use default mask', function() {
+        var expected = ""
+        $.fn.inputmask.Constructor.DEFAULTS.mask = expected
+
+        $body.inputmask()
+
+        equal(expected, $body.data('inputmask').options.mask)
+      })
+
+      test('should use default placeholder', function() {
+        var expected = "_"
+        $.fn.inputmask.Constructor.DEFAULTS.placeholder = expected
+
+        $body.inputmask()
+
+        equal(expected, $body.data('inputmask').options.placeholder)
+      })
+
+      test('should use default definitions', function() {
+        var expected = {
+          '9': "[0-9]",
+          'a': "[A-Za-z]"
+        }
+        $.fn.inputmask.Constructor.DEFAULTS.definitions = expected
+
+        $body.inputmask()
+
+        deepEqual(expected, $body.data('inputmask').options.definitions)
+      })
+
+      test('should override mask when options.mask provided', function() {
+        var expected = '99-99';
+        $body.inputmask({ mask: expected})
+
+        equal(expected, $body.data('inputmask').options.mask)
+      })
+
+      test('should override placeholder when options.placeholder provided', function() {
+          var expected = '-';
+          $body.inputmask({ placeholder: expected})
+
+          equal(expected, $body.data('inputmask').options.placeholder)
+      })
+
+      test('should override definitions when options.definitions provided', function() {
+        var expected = {
+          '9': "[0-9]",
+          'a': "[A-Za-z]"
+        }
+
+        $body.inputmask({definitions: expected})
+
+        deepEqual(expected, $body.data('inputmask').options.definitions)
+      })
      // TODO: add inputmask tests
 })
--- a/js/transition.js
+++ b/js/transition.js
@@ -0,0 +1,50 @@
+/* ========================================================================
+ * Bootstrap: transition.js v3.1.2
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
+function ($) {
+  'use strict';
+
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
+
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
+
+    var transEndEventNames = {
+      WebkitTransition : 'webkitTransitionEnd',
+      MozTransition    : 'transitionend',
+      OTransition      : 'oTransitionEnd otransitionend',
+      transition       : 'transitionend'
+    }
+
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
+      }
+    }
+
+    return false // explicit for ie8 (  ._.)
+  }
+
+  if ($.support.transition !== undefined) return  // Prevent conflict with Twitter Bootstrap
+
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false, $el = this
+    $(this).one($.support.transition.end, function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
+
+  $(function () {
+    $.support.transition = transitionEnd()
+  })
+
+}(window.jQuery);
--- a/less/alerts-fixed.less
+++ b/less/alerts-fixed.less
@@ -1,6 +1,6 @@
 // Fixed alerts
-//
 // Position to the top or bottom.
+// ------------------------------------------------

 .alert-fixed-top,
 .alert-fixed-bottom {
--- a/less/build/jasny-bootstrap.less
+++ b/less/build/jasny-bootstrap.less
@@ -1,4 +1,5 @@
 // Jasny Bootstrap with default variables

@import "variables.less";
+@import "mixins.less";
@import "../jasny-bootstrap.less";
--- a/less/build/mixins.less
+++ b/less/build/mixins.less
@@ -1,5 +1,6 @@
 //
-// Mixins
+// These mixins are used when Jasny Bootstrap is
+// built without importing Twitter Bootstrap.
 // --------------------------------------------------


@@ -29,19 +30,3 @@
  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
          box-shadow: @shadow;
 }
-
-
-// BUTTONS
-// --------------------------------------------------
-
-.button-label-size(@padding-vertical; @padding-horizontal; @border-radius) {
-  padding: @padding-vertical @padding-horizontal;
-  left: (-1 * @padding-horizontal);
-  border-radius: (@border-radius - 1px) 0 0 (@border-radius - 1px);
-
-  &.btn-label-right {
-    left: auto;
-    right: (-1 * @padding-horizontal);
-    border-radius: 0 (@border-radius - 1px) (@border-radius - 1px) 0;
-  }
-}
--- a/less/button-labels.less
+++ b/less/button-labels.less
@@ -1,6 +1,19 @@
 // Labels for buttons
 // --------------------------------------------------

+.button-label-size(@padding-vertical; @padding-horizontal; @border-radius) {
+  padding: @padding-vertical @padding-horizontal;
+  left: (-1 * @padding-horizontal);
+  border-radius: (@border-radius - 1px) 0 0 (@border-radius - 1px);
+
+  &.btn-label-right {
+    left: auto;
+    right: (-1 * @padding-horizontal);
+    border-radius: 0 (@border-radius - 1px) (@border-radius - 1px) 0;
+  }
+}
+
+
 .btn-labeled {
  padding-top: 0;
  padding-bottom: 0;
--- a/less/fileinput.less
+++ b/less/fileinput.less
@@ -13,9 +13,9 @@
    margin: 0;
    opacity: 0;
    filter: alpha(opacity=0);
-    transform: translate(-300px, 0) scale(4);
    font-size: 23px;
    height: 100%;
+    width: 100%;
    direction: ltr;
    cursor: pointer;
  }
@@ -63,16 +63,30 @@
  vertical-align: bottom;
 }

+.fileinput.input-group {
+    display: table;
+    
+    > * {
+        position: relative;
+        z-index: 2;
+    }
+    > .btn-file {
+        z-index: 1;
+    }
+}
+
 // Not 100% correct, but helps in typical use case
+.fileinput-new.input-group .btn-file,
 .fileinput-new .input-group .btn-file {
  border-radius: 0 @border-radius-base @border-radius-base 0;
-}
-.fileinput-new .input-group .btn-file.btn-xs,
-.fileinput-new .input-group .btn-file.btn-sm {
-  border-radius: 0 @border-radius-small @border-radius-small 0;
-}
-.fileinput-new .input-group .btn-file.btn-lg {
-  border-radius: 0 @border-radius-large @border-radius-large 0;
+
+  &.btn-xs,
+  &.btn-sm {
+    border-radius: 0 @border-radius-small @border-radius-small 0;
+  }
+  &.btn-lg {
+    border-radius: 0 @border-radius-large @border-radius-large 0;
+  }
 }

 .form-group.has-warning .fileinput {
--- a/less/grid-container-smooth.less
+++ b/less/grid-container-smooth.less
@@ -1,9 +1,10 @@
 // Smooth sizing container
 // -------------------------

-@media (min-width: 1px) {
-  .container-smooth {
-    max-width: @container-lg;
+.container-smooth {
+  max-width: @container-lg;
+    
+  @media (min-width: 1px) {
+    width: auto;
  }
 }
-
--- a/less/navmenu.less
+++ b/less/navmenu.less
@@ -1,4 +1,3 @@
-//
 // Navmenu and offcanvas navbar
 // --------------------------------------------------

@@ -26,11 +25,16 @@
  border-radius: 0;
 }
 .navmenu-fixed-left,
-.navbar-offcanvas {
+.navbar-offcanvas.navmenu-fixed-left {
  left: 0;
+  right: auto;
  border-width: 0 1px 0 0;
+  bottom: 0;
+  overflow-y: auto;
 }
-.navmenu-fixed-right {
+.navmenu-fixed-right,
+.navbar-offcanvas {
+  left: auto;
  right: 0;
  border-width: 0 0 0 1px;
 }
--- a/less/offcanvas.less
+++ b/less/offcanvas.less
@@ -1,4 +1,3 @@
-//
 // Off canvas navigation
 // --------------------------------------------------

--- a/less/rowlink.less
+++ b/less/rowlink.less
@@ -1,4 +1,3 @@
-//
 // Rowlink
 // --------------------------------------------------

--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "jasny-bootstrap",
  "description": "Additional features and components for Bootstrap",
-  "version": "3.1.0",
+  "version": "3.1.2",
  "keywords": [
    "bootstrap",
    "css"
@@ -30,25 +30,25 @@
    "grunt": "~0.4.2",
    "grunt-banner": "~0.2.0",
    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-connect": "~0.6.0",
+    "grunt-contrib-concat": "~0.4.0",
+    "grunt-contrib-connect": "~0.7.0",
    "grunt-contrib-copy": "~0.5.0",
    "grunt-contrib-csslint": "~0.2.0",
-    "grunt-contrib-cssmin": "~0.7.0",
-    "grunt-contrib-jade": "~0.9.1",
-    "grunt-contrib-jshint": "~0.8.0",
-    "grunt-contrib-less": "~0.9.0",
+    "grunt-contrib-cssmin": "~0.9.0",
+    "grunt-contrib-jade": "~0.11.0",
+    "grunt-contrib-jshint": "~0.10.0",
+    "grunt-contrib-less": "~0.11.0",
    "grunt-contrib-qunit": "~0.4.0",
-    "grunt-contrib-uglify": "~0.3.0",
-    "grunt-contrib-watch": "~0.5.3",
+    "grunt-contrib-uglify": "~0.4.0",
+    "grunt-contrib-watch": "~0.6.0",
    "grunt-csscomb": "~2.0.1",
-    "grunt-exec": "0.4.2",
+    "grunt-exec": "~0.4.2",
    "grunt-html-validation": "~0.1.13",
    "grunt-jekyll": "~0.4.1",
-    "grunt-jscs-checker": "~0.3.0",
-    "grunt-saucelabs": "~5.0.0",
-    "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.3.0",
+    "grunt-jscs-checker": "~0.4.0",
+    "grunt-saucelabs": "~5.1.0",
+    "grunt-text-replace": "~0.3.0",
+    "load-grunt-tasks": "~0.4.0",
    "markdown": "~0.5.0"
  },
  "jspm": {
--- a/scss/_alerts-fixed.scss
+++ b/scss/_alerts-fixed.scss
@@ -0,0 +1,39 @@
+// Fixed alerts
+// Position to the top or bottom.
+// ------------------------------------------------
+
+.alert-fixed-top,
+.alert-fixed-bottom {
+  position: fixed;
+  width: 100%;
+  z-index: $zindex-alert-fixed;
+  border-radius: 0;
+  margin: 0;
+  left: 0;
+
+  @media (min-width: $alert-fixed-width) {
+    width: $alert-fixed-width;
+    left: 50%;
+    margin-left: (-1 * ($alert-fixed-width / 2));
+  }
+}
+
+.alert-fixed-top {
+  top: 0;
+  border-width: 0 0 1px 0;
+
+  @media (min-width: $alert-fixed-width) {
+    @include border-bottom-radius($alert-border-radius);
+    border-width: 0 1px 1px 1px;
+  }
+}
+
+.alert-fixed-bottom {
+  bottom: 0;
+  border-width: 1px 0 0 0;
+
+  @media (min-width: $alert-fixed-width) {
+    @include border-top-radius($alert-border-radius);
+    border-width: 1px 1px 0 1px;
+  }
+}
--- a/scss/_button-labels.scss
+++ b/scss/_button-labels.scss
@@ -0,0 +1,38 @@
+// Labels for buttons
+// --------------------------------------------------
+
+@mixin button-label-size($padding-vertical, $padding-horizontal, $border-radius) {
+  padding: $padding-vertical $padding-horizontal;
+  left: (-1 * $padding-horizontal);
+  border-radius: ($border-radius - 1px) 0 0 ($border-radius - 1px);
+
+  &.btn-label-right {
+    left: auto;
+    right: (-1 * $padding-horizontal);
+    border-radius: 0 ($border-radius - 1px) ($border-radius - 1px) 0;
+  }
+}
+
+
+.btn-labeled {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.btn-label {
+  position: relative;
+  background: transparent;
+  background: rgba(0, 0, 0, 0.15);
+  display: inline-block;
+  @include button-label-size($padding-base-vertical, $padding-base-horizontal, $border-radius-base);
+}
+
+.btn-lg .btn-label {
+  @include button-label-size($padding-large-vertical, $padding-large-horizontal, $border-radius-large);
+}
+.btn-sm .btn-label {
+  @include button-label-size($padding-small-vertical, $padding-small-horizontal, $border-radius-small);
+}
+.btn-xs .btn-label {
+  @include button-label-size(1px, 5px, $border-radius-small);
+}
--- a/scss/_fileinput.scss
+++ b/scss/_fileinput.scss
@@ -0,0 +1,114 @@
+// Fileinput
+// CSS for file upload button and fileinput widget
+// ------------------------------------------------
+
+.btn-file {
+  overflow: hidden;
+  position: relative;
+  vertical-align: middle;
+  > input {
+    position: absolute;
+    top: 0;
+    right: 0;
+    margin: 0;
+    opacity: 0;
+    filter: alpha(opacity=0);
+    font-size: 23px;
+    height: 100%;
+    width: 100%;
+    direction: ltr;
+    cursor: pointer;
+  }
+}
+
+.fileinput {
+  margin-bottom: 9px;
+  display: inline-block;
+  .form-control {
+    padding-top: 7px;
+    padding-bottom: 5px;
+    display: inline-block;
+    margin-bottom: 0px;
+    vertical-align: middle;
+    cursor: text;
+  }
+  .thumbnail {
+    overflow: hidden;
+    display: inline-block;
+    margin-bottom: 5px;
+    vertical-align: middle;
+    text-align: center;
+    > img {
+      max-height: 100%;
+    }
+  }
+  .btn {
+    vertical-align: middle;
+  }
+}
+.fileinput-exists .fileinput-new,
+.fileinput-new .fileinput-exists {
+  display: none;
+}
+.fileinput-inline .fileinput-controls {
+  display: inline;
+}
+
+.fileinput-filename {
+  vertical-align: middle;
+  display: inline-block;
+  overflow: hidden;
+}
+.form-control .fileinput-filename {
+  vertical-align: bottom;
+}
+
+.fileinput.input-group {
+    display: table;
+}
+
+// Not 100% correct, but helps in typical use case
+.fileinput-new.input-group .btn-file,
+.fileinput-new .input-group .btn-file {
+  border-radius: 0 $border-radius-base $border-radius-base 0;
+
+  &.btn-xs,
+  &.btn-sm {
+    border-radius: 0 $border-radius-small $border-radius-small 0;
+  }
+  &.btn-lg {
+    border-radius: 0 $border-radius-large $border-radius-large 0;
+  }
+}
+
+.form-group.has-warning .fileinput {
+  .fileinput-preview {
+    color: $state-warning-text;
+  }
+  .thumbnail {
+    border-color: $state-warning-border;
+  }
+}
+.form-group.has-error .fileinput {
+  .fileinput-preview {
+    color: $state-danger-text;
+  }
+  .thumbnail {
+    border-color: $state-danger-border;
+  }
+}
+.form-group.has-success .fileinput {
+  .fileinput-preview {
+    color: $state-success-text;
+  }
+  .thumbnail {
+    border-color: $state-success-border;
+  }
+}
+
+
+// Input group fixes
+
+.input-group-addon:not(:first-child) {
+  border-left: 0;
+}
--- a/scss/_grid-container-smooth.scss
+++ b/scss/_grid-container-smooth.scss
@@ -0,0 +1,10 @@
+// Smooth sizing container
+// -------------------------
+
+.container-smooth {
+  max-width: $container-lg;
+    
+  @media (min-width: 1px) {
+    width: auto;
+  }
+}
--- a/scss/_nav-tab-alignment.scss
+++ b/scss/_nav-tab-alignment.scss
@@ -0,0 +1,97 @@
+// Alignment options
+// -------------------------
+
+// bottom
+.nav-tabs-bottom {
+  border-bottom: 0;
+  border-top: 1px solid $nav-tabs-border-color;
+
+  > li {
+    margin-bottom: 0;
+    margin-top: -1px;
+
+    > a {
+      border-radius: 0 0 $border-radius-base $border-radius-base;
+    }
+
+    > a:hover,
+    > a:focus,
+    &.active > a,
+    &.active > a:hover,
+    &.active > a:focus {
+      border: 1px solid $nav-tabs-active-link-hover-border-color;
+      border-top-color: transparent;
+    }
+  }
+}
+
+// left
+.nav-tabs-left {
+  border-bottom: 0;
+  border-right: 1px solid $nav-tabs-border-color;
+
+  > li {
+    margin-bottom: 0;
+    margin-right: -1px;
+    float: none;
+
+    > a {
+      border-radius: $border-radius-base 0 0 $border-radius-base;
+      margin-right: 0;
+      margin-bottom: 2px;
+    }
+
+    > a:hover,
+    > a:focus,
+    &.active > a,
+    &.active > a:hover,
+    &.active > a:focus {
+      border: 1px solid $nav-tabs-active-link-hover-border-color;
+      border-right-color: transparent;
+    }
+  }
+
+  .row > & {
+    padding-right: 0;
+    padding-left: ($grid-gutter-width / 2);
+    margin-right: -1px;
+    position: relative;
+    z-index: 1;
+
+    & + .tab-content {
+      border-left: 1px solid $nav-tabs-active-link-hover-border-color;
+    }
+  }
+}
+
+// right
+.nav-tabs-right {
+  border-bottom: 0;
+  border-left: 1px solid $nav-tabs-border-color;
+
+  > li {
+    margin-bottom: 0;
+    margin-left: -1px;
+    float: none;
+
+    > a {
+      border-radius: 0 $border-radius-base $border-radius-base 0;
+      margin-left: 0;
+      margin-bottom: 2px;
+    }
+
+    > a:hover,
+    > a:focus,
+    &.active > a,
+    &.active > a:hover,
+    &.active > a:focus {
+      border: 1px solid $nav-tabs-active-link-hover-border-color;
+      border-left-color: transparent;
+    }
+  }
+
+  .row > & {
+    padding-left: 0;
+    padding-right: ($grid-gutter-width / 2);
+  }
+}
--- a/scss/_navmenu.scss
+++ b/scss/_navmenu.scss
@@ -0,0 +1,273 @@
+// Navmenu and offcanvas navbar
+// --------------------------------------------------
+
+
+// Wrapper and base class
+//
+// Provide a static navmenu from which we expand to create the fixed navmenu
+// variations.
+
+.navmenu,
+.navbar-offcanvas {
+  width: $navmenu-width;
+  height: 100%;
+  border-width: 1px;
+  border-style: solid;
+  border-radius: $border-radius-base;
+}
+
+.navmenu-fixed-left,
+.navmenu-fixed-right,
+.navbar-offcanvas {
+  position: fixed;
+  z-index: $zindex-navmenu-fixed;
+  top: 0;
+  border-radius: 0;
+}
+.navmenu-fixed-left,
+.navbar-offcanvas.navmenu-fixed-left {
+  left: 0;
+  right: auto;
+  border-width: 0 1px 0 0;
+  bottom: 0;
+  overflow-y: auto;
+}
+.navmenu-fixed-right,
+.navbar-offcanvas {
+  left: auto;
+  right: 0;
+  border-width: 0 0 0 1px;
+}
+
+.navmenu-nav {
+  margin-bottom: $navmenu-margin-vertical;
+
+  &.dropdown-menu {
+    position: static;
+    margin: 0;
+    padding-top: 0;
+    float: none;
+    border: none;
+    @include box-shadow(none);
+    border-radius: 0;
+  }
+}
+
+.navbar-offcanvas {
+  .navbar-nav {
+    margin: 0;
+  }
+
+  @media (min-width: $grid-float-breakpoint) {
+    width: auto;
+    border-top: 0;
+    box-shadow: none;
+
+    &.offcanvas {
+      position: static;
+      display: block !important;
+      height: auto !important;
+      padding-bottom: 0; // Override default setting
+      overflow: visible !important;
+    }
+
+    // Account for first and last children spacing
+    .navbar-nav.navbar-left:first-child {
+      margin-left: -$navbar-padding-horizontal;
+    }
+    .navbar-nav.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+
+    .navmenu-brand {
+      display: none;
+    }
+  }
+}
+
+// Brand/project name
+
+.navmenu-brand {
+  display: block;
+  font-size: $font-size-large;
+  line-height: $line-height-computed;
+  padding: $nav-link-padding;
+  &:hover,
+  &:focus {
+    text-decoration: none;
+  }
+  margin: $navmenu-margin-vertical 0;
+}
+
+// Alternate navmenus
+// --------------------------------------------------
+
+// Default navmenu
+.navmenu-default,
+.navbar-default .navbar-offcanvas {
+  background-color: $navmenu-default-bg;
+  border-color: $navmenu-default-border;
+
+  .navmenu-brand {
+    color: $navmenu-default-brand-color;
+    &:hover,
+    &:focus {
+      color: $navmenu-default-brand-hover-color;
+      background-color: $navmenu-default-brand-hover-bg;
+    }
+  }
+
+  .navmenu-text {
+    color: $navmenu-default-color;
+  }
+
+  .navmenu-nav {
+    // Caret should match text color on hover
+    > .dropdown > a:hover .caret,
+    > .dropdown > a:focus .caret {
+      border-top-color: $navmenu-default-link-hover-color;
+      border-bottom-color: $navmenu-default-link-hover-color;
+    }
+
+    // Remove background color from open dropdown
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navmenu-default-link-active-bg;
+        color: $navmenu-default-link-active-color;
+        .caret {
+          border-top-color: $navmenu-default-link-active-color;
+          border-bottom-color: $navmenu-default-link-active-color;
+        }
+      }
+    }
+    > .dropdown > a .caret {
+      border-top-color: $navmenu-default-link-color;
+      border-bottom-color: $navmenu-default-link-color;
+    }
+    &.dropdown-menu {
+      background-color: $navmenu-default-link-active-bg;
+      & > .divider {
+        background-color: $navmenu-default-bg;
+      }
+      > .active > a {
+        &,
+        &:hover,
+        &:focus {
+          background-color: darken($navmenu-default-link-active-bg, 6.5%);
+        }
+      }
+    }
+
+    > li > a {
+      color: $navmenu-default-link-color;
+      &:hover,
+      &:focus {
+        color: $navmenu-default-link-hover-color;
+        background-color: $navmenu-default-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navmenu-default-link-active-color;
+        background-color: $navmenu-default-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navmenu-default-link-disabled-color;
+        background-color: $navmenu-default-link-disabled-bg;
+      }
+    }
+  }
+}
+
+// Inverse navmenu
+.navmenu-inverse,
+.navbar-inverse .navbar-offcanvas {
+  background-color: $navmenu-inverse-bg;
+  border-color: $navmenu-inverse-border;
+
+  .navmenu-brand {
+    color: $navmenu-inverse-brand-color;
+    &:hover,
+    &:focus {
+      color: $navmenu-inverse-brand-hover-color;
+      background-color: $navmenu-inverse-brand-hover-bg;
+    }
+  }
+
+  .navmenu-text {
+    color: $navmenu-inverse-color;
+  }
+
+  .navmenu-nav {
+    // Caret should match text color on hover
+    > .dropdown > a:hover .caret,
+    > .dropdown > a:focus .caret {
+      border-top-color: $navmenu-inverse-link-hover-color;
+      border-bottom-color: $navmenu-inverse-link-hover-color;
+    }
+
+    // Remove background color from open dropdown
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navmenu-inverse-link-active-bg;
+        color: $navmenu-inverse-link-active-color;
+        .caret {
+          border-top-color: $navmenu-inverse-link-active-color;
+          border-bottom-color: $navmenu-inverse-link-active-color;
+        }
+      }
+    }
+    > .dropdown > a .caret {
+      border-top-color: $navmenu-inverse-link-color;
+      border-bottom-color: $navmenu-inverse-link-color;
+    }
+    &.dropdown-menu {
+      background-color: $navmenu-inverse-link-active-bg;
+      & > .divider {
+        background-color: $navmenu-inverse-bg;
+      }
+      > .active > a {
+        &,
+        &:hover,
+        &:focus {
+          background-color: darken($navmenu-inverse-link-active-bg, 6.5%);
+        }
+      }
+    }
+
+    > li > a {
+      color: $navmenu-inverse-link-color;
+      &:hover,
+      &:focus {
+        color: $navmenu-inverse-link-hover-color;
+        background-color: $navmenu-inverse-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navmenu-inverse-link-active-color;
+        background-color: $navmenu-inverse-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navmenu-inverse-link-disabled-color;
+        background-color: $navmenu-inverse-link-disabled-bg;
+      }
+    }
+  }
+}
--- a/scss/_offcanvas.scss
+++ b/scss/_offcanvas.scss
@@ -0,0 +1,48 @@
+// Off canvas navigation
+// --------------------------------------------------
+
+@mixin offcanvas {
+  display: none;
+  &.in {
+    display: block;
+  }
+}
+
+@media (max-width: $screen-xs-max) {
+  .offcanvas-xs {
+    @include offcanvas;
+  }
+}
+@media (max-width: $screen-sm-max) {
+  .offcanvas-sm {
+    @include offcanvas;
+  }
+}
+@media (max-width: $screen-md-max) {
+  .offcanvas-md {
+    @include offcanvas;
+  }
+}
+.offcanvas-lg {
+  @include offcanvas;
+}
+
+.canvas-sliding {
+  -webkit-transition: top 0.35s, left 0.35s, bottom 0.35s, right 0.35s;
+          transition: top 0.35s, left 0.35s, bottom 0.35s, right 0.35s;
+}
+
+.offcanvas-clone {
+  height: 0px !important;
+  width: 0px !important;
+  overflow: hidden !important;
+  border: none !important;
+  margin: 0px !important;
+  padding: 0px !important;
+  position: absolute !important;
+  top: auto !important;
+  left: auto !important;
+  bottom: 0px !important;
+  right: 0px !important;
+  opacity: 0 !important;
+}
--- a/scss/_rowlink.scss
+++ b/scss/_rowlink.scss
@@ -0,0 +1,22 @@
+// Rowlink
+// --------------------------------------------------
+
+.table.rowlink,
+.table .rowlink {
+  td:not(.rowlink-skip) {
+    cursor: pointer;
+
+    a {
+      color: inherit;
+      font: inherit;
+      text-decoration: inherit;
+    }
+  }
+}
+
+.table-hover.rowlink,
+.table-hover .rowlink {
+  tr:hover td {
+    background-color: darken($table-bg-hover, 15%);
+  }
+}
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -0,0 +1,66 @@
+//
+// Variables
+//
+// Either Twitter Bootstrap's "variables.less" or this package's
+//  "default-variables.less" should be loaded before this file.
+// -------------------------------------------------------------
+
+$zindex-navmenu-fixed:     1030 !default;
+$zindex-alert-fixed:       1035 !default;
+
+$container-smooth:         $container-lg !default;
+
+$alert-fixed-width:        $screen-md-min !default;
+
+
+//== Navmenu
+
+// Basics of a navmenu
+$navmenu-width:                     300px !default;
+$navmenu-margin-vertical:           (0.5 * $line-height-computed) !default;
+$navmenu-default-color:             #777 !default;
+$navmenu-default-bg:                #f8f8f8 !default;
+$navmenu-default-border:            darken($navmenu-default-bg, 6.5%) !default;
+
+// Navmenu links
+$navmenu-default-link-color:                #777 !default;
+$navmenu-default-link-hover-color:          #333 !default;
+$navmenu-default-link-hover-bg:             transparent !default;
+$navmenu-default-link-active-color:         #555 !default;
+$navmenu-default-link-active-bg:            darken($navmenu-default-bg, 6.5%) !default;
+$navmenu-default-link-disabled-color:       #ccc !default;
+$navmenu-default-link-disabled-bg:          transparent !default;
+
+// Navmenu brand label
+$navmenu-default-brand-color:               $navmenu-default-link-color !default;
+$navmenu-default-brand-hover-color:         darken($navmenu-default-link-color, 10%) !default;
+$navmenu-default-brand-hover-bg:            transparent !default;
+
+
+// Inverted navmenu
+//
+// Reset inverted navmenu basics
+$navmenu-inverse-color:                      $gray-light !default;
+$navmenu-inverse-bg:                         #222 !default;
+$navmenu-inverse-border:                     darken($navmenu-inverse-bg, 10%) !default;
+
+// Inverted navmenu links
+$navmenu-inverse-link-color:                 $gray-light !default;
+$navmenu-inverse-link-hover-color:           #fff !default;
+$navmenu-inverse-link-hover-bg:              transparent !default;
+$navmenu-inverse-link-active-color:          $navmenu-inverse-link-hover-color !default;
+$navmenu-inverse-link-active-bg:             darken($navmenu-inverse-bg, 10%) !default;
+$navmenu-inverse-link-disabled-color:        #444 !default;
+$navmenu-inverse-link-disabled-bg:           transparent !default;
+
+// Inverted navmenu brand label
+$navmenu-inverse-brand-color:                $navmenu-inverse-link-color !default;
+$navmenu-inverse-brand-hover-color:          #fff !default;
+$navmenu-inverse-brand-hover-bg:             transparent !default;
+
+// Inverted navmenu search
+// Normal navmenu needs no special styles or vars
+$navmenu-inverse-search-bg:                  lighten($navmenu-inverse-bg, 25%) !default;
+$navmenu-inverse-search-bg-focus:            #fff !default;
+$navmenu-inverse-search-border:              $navmenu-inverse-bg !default;
+$navmenu-inverse-search-placeholder-color:   #ccc !default;
--- a/scss/jasny-bootstrap.scss
+++ b/scss/jasny-bootstrap.scss
@@ -0,0 +1,19 @@
+// Twitter Bootstrap's "variables.scss" should already be imported
+
+// Core variables and mixins
+@import "variables";
+@import "mixins";
+
+// Core CSS
+@import "grid-container-smooth";
+@import "button-labels";
+
+// Components
+@import "nav-tab-alignment";
+@import "navmenu";
+@import "alerts-fixed";
+
+// Components w/ JavaScript
+@import "offcanvas";
+@import "rowlink";
+@import "fileinput";
--- a/test-infra/npm-shrinkwrap.canonical.json
+++ b/test-infra/npm-shrinkwrap.canonical.json
Author	SHA1	Message	Date
Arnold Daniels	10b81be776	Fixed incorrect version number specified for required Twitter Bootstrap	2014-04-19 19:05:33 +02:00
Arnold Daniels	e822b1b3bf	Build v3.1.2	2014-04-19 18:25:38 +02:00
Arnold Daniels	285689081d	Use window.jQuery in transition.js	2014-04-19 16:43:27 +02:00
Arnold Daniels	1001ad214d	Fixed broken rowlink caused by check on .rowlink-skip. Fixed #221 Thanks @cervengoc	2014-04-19 16:42:25 +02:00
Arnold Daniels	249cb84f6b	Updated npm packages	2014-04-19 16:38:06 +02:00
Arnold Daniels	660e376b96	Replace grunt-sed with grunt-text-replace Set version to 3.1.2	2014-04-19 16:31:53 +02:00
Arnold Daniels	e919330916	Added transitions support check. Fixes #213 This is required to run Jasny Bootrstap standalone.	2014-04-19 16:09:41 +02:00
Arnold Daniels	24f8bffbaf	Offcanvas option disablescrolling (lowercase) as alias of disableScrolling (camel cased). Fixes #219	2014-04-19 15:15:46 +02:00
Arnold Daniels	e5b9930599	Don't trigger fileinput.change when fileinput.clear is called manually. Fixes #216 Insert fileinput <input type="hidden"> right before <input type="file">. Fixes #215 Clean up less and scss comment	2014-04-19 15:10:23 +02:00
Arnold Daniels	8fd9aca993	Updated scss for earlier changes - Move mixins taken from Twitter Bootstrap to build dir. - Removed the transformation for file input altogether.	2014-04-16 14:32:12 +02:00
Arnold Daniels	0038dd8c9f	Merge origin/master	2014-04-16 13:37:21 +02:00
Arnold Daniels	27794ba4e3	Removed the transformation for file input al together. Should test of this works correctly for IE and Opera.	2014-04-16 13:37:08 +02:00
Arnold Daniels	9e28a9b2bc	Move mixins taken from Twitter Bootstrap to build dir. Fixed #221 Move button-label mixin to button-labels.less.	2014-04-13 16:36:59 +02:00
Arnold Daniels	18116c5cd3	Merge pull request #218 from joshjb84/master Fix to naming in inputmask.js and added some inputmask tests	2014-04-06 22:10:54 +02:00
joshjb84	2336197e3a	Fix to naming in inputmask.js and tests Changed the name of Input.DEFAULS to Input.DEFAULTS and added unit tests around how the options are set up.	2014-04-05 19:10:24 +08:00
Arnold Daniels	ee5a80a6c3	Merge pull request #208 from inbep/master adding scss files	2014-03-30 14:15:56 +02:00
Sergio	4dc46204b4	adding scss files	2014-03-28 12:40:26 -03:00
Arnold Daniels	d5d4c5bd62	Build Bootstrap v3.1.1	2014-03-28 03:46:35 +01:00
Arnold Daniels	626d773366	stop propagation for file input, input element. Fixes #182	2014-03-28 03:25:36 +01:00
Arnold Daniels	a8a87b1958	Use `var files` instead of setting `e.target.files` for file input. Fixes #163 (thanks to @ducman)	2014-03-28 02:50:53 +01:00
Arnold Daniels	3769a8a8fc	Don't transform `.btn-file > input` for Firefox and do set width and height to 100%. Fixes #157	2014-03-28 02:39:14 +01:00
Arnold Daniels	1640650604	Only preview gif, png and jpeg images. Fixes #181	2014-03-28 01:04:48 +01:00
Arnold Daniels	4c53740597	Merge origin/master	2014-03-28 00:24:56 +01:00
Arnold Daniels	ca1145ca0b	Don't trigger rowlink initiasation when a element within .rowlink-skip is clicked. Fixes #162	2014-03-28 00:22:10 +01:00
Arnold Daniels	d87bea51c2	Added docs task to gruntfile	2014-03-27 22:40:54 +01:00
Arnold Daniels	e9a6df2cbd	Merge pull request #206 from wardley/master allow vertical scroll for navmenu-fixed-left.	2014-03-27 11:32:22 +01:00
Wardley Pogijanto	90b09cb3f8	allow vertical scroll for navmenu-fixed-left. [jasny/boostrap#202]	2014-03-27 14:01:13 +11:00
Arnold Daniels	ec797fb799	Pressing cancel in a file input clears it, so Fileinput.clear() needs to be called. Fixes #194	2014-03-25 19:46:17 +01:00
Arnold Daniels	36613f1655	Reset element style in offcanvas.recalc(). Fixes #201	2014-03-25 19:02:06 +01:00
Arnold Daniels	2ac056ab82	Fixed offcanvas position (only left was working). Fixes #195 Fixed calculating the position when 'auto' is used. Off canvas navbar is positioned to the right by default and can be placed left with `.navmenu-fixed-left`. Added link to off canvas navbar example in other offcanvas examples	2014-03-25 18:38:56 +01:00
Arnold Daniels	523965b3d5	Combine `.fileinput` and `.input-group`. Fixes #203	2014-03-25 15:29:31 +01:00
Arnold Daniels	59aef49163	Also add .btn-file transform: scal for Chrome. #157	2014-03-25 14:51:34 +01:00
Arnold Daniels	ac9e37fc64	Make disable scrolling optional for offcanvas. Fixes #193	2014-03-25 14:34:59 +01:00
Arnold Daniels	00a5a2d55b	Fixed offcanvas error because state is used as function. Fixes #192	2014-03-25 14:20:49 +01:00
Arnold Daniels	9b5357120e	Updated package versions Rebuild jasny-bootstrap Fixed test-infra permissions	2014-03-25 11:42:58 +01:00
Arnold Daniels	a43e720494	Corrected README	2014-03-25 11:36:54 +01:00
Arnold Daniels	32a5370467	Fixed download url	2014-02-18 05:34:27 +01:00