diff options
| author | Jacob Thornton <[email protected]> | 2012-04-24 02:02:06 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-04-24 02:02:06 -0700 |
| commit | 73453c7f79e6bf6be13917f854ed172e214eada2 (patch) | |
| tree | ed4525ccca978b19474f3029cf25b36a402d2ce1 | |
| parent | b8b1ffde055b9e04f658201f81cf7974d56ae0c2 (diff) | |
| download | bootstrap-73453c7f79e6bf6be13917f854ed172e214eada2.tar.xz bootstrap-73453c7f79e6bf6be13917f854ed172e214eada2.zip | |
changes for build in preperation for 2.0.3 release
| -rw-r--r-- | docs/assets/css/bootstrap.css | 8 | ||||
| -rw-r--r-- | docs/assets/js/application.js | 3 | ||||
| -rw-r--r-- | docs/download.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/download.mustache | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cb7aa3516..411d4cebf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4631,15 +4631,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 diff --git a/docs/download.html b/docs/download.html index bb10bdf63..8b4a385f7 100644 --- a/docs/download.html +++ b/docs/download.html @@ -108,7 +108,7 @@ <h3>Base CSS</h3> <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label> <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label> - <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels and badges</label> + <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> Labels and badges</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label> <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label> <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label> diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index e9c27588b..ffade0977 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -31,7 +31,7 @@ <h3>{{_i}}Base CSS{{/i}}</h3> <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label> - <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels and badges{{/i}}</label> + <label class="checkbox"><input checked="checked" type="checkbox" value="labels-badges.less"> {{_i}}Labels and badges{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label> |