From 5141e4da10a10952ad5357df29f3381345e48070 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 3 Jan 2014 14:37:03 -0800 Subject: [PATCH 1/5] Use $ instead of jQuery --- js/tooltip.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/tooltip.js b/js/tooltip.js index c472406ff2..ce9ee4c5a7 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -211,7 +211,7 @@ // $.fn.offset doesn't round pixel values // so we use setOffset directly with our own function B-0 - jQuery.offset.setOffset($tip[0], $.extend({ + $.offset.setOffset($tip[0], $.extend({ using: function (props) { $tip.css({ top: Math.round(props.top), From c61314363821428ca08d7674f4d80952fda13116 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sun, 5 Jan 2014 20:08:37 -0800 Subject: [PATCH 2/5] Delete reference to a non-existent class --- docs/css.html | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/css.html b/docs/css.html index 8eeb23d58e..e1adcaaa40 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2414,7 +2414,6 @@ For example, <section> should be wrapped as inline.

Donec ullamcorper nulla non metus auctor fringilla.

{% highlight html %} -

...

...

...

...

From 938bc12c58343dde20caf8c3e88a674774705172 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 5 Jan 2014 20:52:37 -0800 Subject: [PATCH 3/5] add /docs/assets JS to JSCS Grunt task config --- Gruntfile.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 9a2a5754e4..2c9e4f985a 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -60,6 +60,9 @@ module.exports = function (grunt) { }, test: { src: ['js/tests/unit/*.js'] + }, + assets: { + src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js'] } }, From 0593a206382d03b5e44b561946bef42fb30d6cb6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Jan 2014 20:54:31 -0800 Subject: [PATCH 4/5] grammarghhhhhhhhhhhh --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components.html b/docs/components.html index 6330e6be1e..ad7eb079cc 100644 --- a/docs/components.html +++ b/docs/components.html @@ -14,7 +14,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

Available glyphs

-

Includes 200 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to Glyphicons whenever possible.

+

Includes 200 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask you include a link back to Glyphicons whenever possible.

    {% for iconClassName in site.data.glyphicons %} From ed8ef845974d2c59254fca8e3e85cec62b1cae1e Mon Sep 17 00:00:00 2001 From: wangsai Date: Mon, 6 Jan 2014 14:39:09 +0800 Subject: [PATCH 5/5] fix the paragraph outside of '.bs-docs-section' --- docs/getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/getting-started.html b/docs/getting-started.html index eb2fe85129..a73179f3ae 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -105,8 +105,8 @@ bootstrap/ └── docs/ └── examples/ {% endhighlight %} +

    The less/, js/, and fonts/ are the source code for our CSS, JS, and icon fonts (respectively). The dist/ folder includes everything listed in the precompiled download section above. The docs/ folder includes the source code for our documentation, and examples/ of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.

-

The less/, js/, and fonts/ are the source code for our CSS, JS, and icon fonts (respectively). The dist/ folder includes everything listed in the precompiled download section above. The docs/ folder includes the source code for our documentation, and examples/ of Bootstrap usage. Beyond that, any other included file provides support for packages, license information, and development.