From 73453c7f79e6bf6be13917f854ed172e214eada2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 24 Apr 2012 02:02:06 -0700 Subject: [PATCH] changes for build in preperation for 2.0.3 release --- docs/assets/css/bootstrap.css | 8 ++++---- docs/assets/js/application.js | 3 +-- docs/download.html | 2 +- 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 cb7aa351684d..411d4cebfe46 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 f1b7c090accd..6463b902fb16 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 bb10bdf63dfa..8b4a385f7241 100644 --- a/docs/download.html +++ b/docs/download.html @@ -108,7 +108,7 @@

Scaffolding

Base CSS

- + diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index e9c27588b474..ffade0977701 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -31,7 +31,7 @@

{{_i}}Base CSS{{/i}}

- +