diff options
| author | Mark Otto <[email protected]> | 2012-04-24 02:12:09 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-04-24 02:12:09 -0700 |
| commit | 79d7092a393728ffeb94f592b8e8a0bca29f361e (patch) | |
| tree | 7a2ecd1baa163c05d162a9e71ef3c9e17ec437df /docs/assets | |
| parent | d8aaf507981dbecb146bc77e288a3f10387923cd (diff) | |
| parent | fc871a482142aa271bb8aeda85198f9fb93d73d1 (diff) | |
| download | bootstrap-79d7092a393728ffeb94f592b8e8a0bca29f361e.tar.xz bootstrap-79d7092a393728ffeb94f592b8e8a0bca29f361e.zip | |
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 62a2327ec..bca6b7c32 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4647,15 +4647,15 @@ a.badge:hover { -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; -webkit-transition: width 0.6s ease; -moz-transition: width 0.6s ease; -ms-transition: width 0.6s ease; -o-transition: width 0.6s ease; transition: width 0.6s ease; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - box-sizing: border-box; } .progress-striped .bar { diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index f1b7c090a..6463b902f 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -137,7 +137,7 @@ $.ajax({ type: 'POST' - , url: 'http://bootstrap.herokuapp.com' + , url: /\?dev/.test(window.location) ? 'http://localhost:3000' : 'http://bootstrap.herokuapp.com' , dataType: 'jsonpi' , params: { js: js @@ -147,7 +147,6 @@ } }) }) - }) // Modified from the original jsonpi https://github.com/benvinegar/jquery-jsonpi |