From ffa0d2f180a328133a0d14d381678d15541a91cd Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 13 Mar 2012 10:35:08 -0600 Subject: Some Doc Typos Fixed doc typos in Components and Scaffolding. --- docs/components.html | 4 ++-- docs/scaffolding.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 10b2aec20..aeddc32d2 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1040,7 +1040,7 @@ -

When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

+

When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.

Brand name

A simple link to show your brand or project name only requires an anchor tag.

@@ -1516,7 +1516,7 @@
   

Page header

-

A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).

+

A simple shell for an h1 to appropriately space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).

-

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

+

{{_i}}When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of padding to the <body>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.{{/i}}

{{_i}}Brand name{{/i}}

{{_i}}A simple link to show your brand or project name only requires an anchor tag.{{/i}}

@@ -1440,7 +1440,7 @@
   

{{_i}}Page header{{/i}}

-

{{_i}}A simple shell for an h1 to appropratiely space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

+

{{_i}}A simple shell for an h1 to appropriately space out and segment sections of content on a page. It can utilize the h1's default small, element as well most other components (with additional styles).{{/i}}

-- cgit v1.2.3 From 630ff4ff7dca4d51474b8b4168e48e60fc858e0c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 20:51:20 -0700 Subject: fix collapse bug in ie7+ for initial collapse in --- docs/assets/bootstrap.zip | Bin 55830 -> 55837 bytes docs/assets/js/bootstrap-collapse.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 92ba97c6d..d9a2d0e30 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 9a364468b..228d2a182 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -74,7 +74,7 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element[size ? 'addClass' : 'removeClass']('collapse') + this.$element[size != null ? 'addClass' : 'removeClass']('collapse') return this } -- cgit v1.2.3 From bce33bbb091e66a58418395188ea50be151f3f8e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 21:10:55 -0700 Subject: if parent in collapse, only grab children --- docs/assets/bootstrap.zip | Bin 55837 -> 55867 bytes docs/assets/js/bootstrap-collapse.js | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d9a2d0e30..8564e3d96 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 228d2a182..2dbf7a761 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -44,7 +44,7 @@ , show: function () { var dimension = this.dimension() , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('.in') + , actives = this.$parent && this.$parent.find('> .accordion-group > .in') , hasData if (actives && actives.length) { @@ -56,7 +56,6 @@ this.$element[dimension](0) this.transition('addClass', 'show', 'shown') this.$element[dimension](this.$element[0][scroll]) - } , hide: function () { -- cgit v1.2.3 From 63bd7cb478500463ac7339667d89792f7108f3c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 21:39:39 -0700 Subject: fix slide logic for ie+ in carousel --- docs/assets/bootstrap.zip | Bin 55867 -> 55871 bytes docs/assets/js/bootstrap-carousel.js | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8564e3d96..84b91830f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 287519900..7db5bea33 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -95,13 +95,7 @@ if ($next.hasClass('active')) return - if (!$.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger('slide') - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } else { + if ($.support.transition && this.$element.hasClass('slide')) { $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) @@ -113,6 +107,12 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid') }, 0) }) + } else { + this.$element.trigger('slide') + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') } isCycling && this.cycle() -- cgit v1.2.3 From 663e41d74f6369812da29a1dd66b0b1fcfd22827 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Mon, 19 Mar 2012 23:13:55 -0700 Subject: prevent dropdowns from closing when clicking inside form element inside dropdown --- docs/assets/bootstrap.zip | Bin 55871 -> 55902 bytes docs/assets/js/bootstrap-dropdown.js | 4 +++- docs/assets/js/bootstrap-typeahead.js | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 84b91830f..b23cd19c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 54b61c5e9..f26b83f41 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -86,7 +86,9 @@ $(function () { $('html').on('click.dropdown.data-api', clearMenus) - $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + $('body') + .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) }( window.jQuery ); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 804e60dc4..f4d26186c 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -39,8 +39,9 @@ , select: function () { var val = this.$menu.find('.active').attr('data-value') - this.$element.val(val) - this.$element.change(); + this.$element + .val(val) + .change() return this.hide() } -- cgit v1.2.3 From cb8dcfcebfbbd8f2ea26b786b44992f00d35ac30 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Tue, 20 Mar 2012 22:43:27 -0700 Subject: if transitioning collapse, don't start new transition --- docs/assets/bootstrap.zip | Bin 55902 -> 55972 bytes docs/assets/js/bootstrap-collapse.js | 20 ++++++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b23cd19c9..60cf1993b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 2dbf7a761..16b91eb24 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -42,11 +42,18 @@ } , show: function () { - var dimension = this.dimension() - , scroll = $.camelCase(['scroll', dimension].join('-')) - , actives = this.$parent && this.$parent.find('> .accordion-group > .in') + var dimension + , scroll + , actives , hasData + if (this.transitioning) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + hasData + if (actives && actives.length) { hasData = actives.data('collapse') actives.collapse('hide') @@ -59,7 +66,9 @@ } , hide: function () { - var dimension = this.dimension() + var dimension + if (this.transitioning) return + dimension = this.dimension() this.reset(this.$element[dimension]()) this.transition('removeClass', 'hide', 'hidden') this.$element[dimension](0) @@ -82,9 +91,12 @@ var that = this , complete = function () { if (startEvent == 'show') that.reset() + that.transitioning = 0 that.$element.trigger(completeEvent) } + this.transitioning = 1 + this.$element .trigger(startEvent) [method]('in') -- cgit v1.2.3 From a0203bc8e0aa79b8f8cfd8c082c4256bed29ae5b Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 21 Mar 2012 11:20:56 +0100 Subject: Fix and improve docs on tab config --- docs/javascript.html | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index a90562767..739e2475f 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -638,6 +638,11 @@ $('#myModal').on('hidden', function () {

Using bootstrap-tab.js

Enable tabbable tabs via javascript:

$('#myTab').tab('show')
+

You can also activate a specific tab (or a pseudo-selected one) on init:

+
+$('#myTab a[href="#profile"]').tab('show');
+$('#myTab a:last').tab('show');
+

Markup

You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

@@ -653,7 +658,7 @@ $('#myModal').on('hidden', function () {
             Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
           

-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs" id="myTab">
   <li class="active"><a href="#home">Home</a></li>
   <li><a href="#profile">Profile</a></li>
   <li><a href="#messages">Messages</a></li>
@@ -669,7 +674,7 @@ $('#myModal').on('hidden', function () {
 
 <script>
   $(function () {
-    $('.tabs a:last').tab('show')
+    $('#myTab a:last').tab('show')
   })
 </script>

Events

-- cgit v1.2.3 From 02a67ea59eb8ee28ba4220898c1a0b2052a80915 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 21 Mar 2012 11:28:23 +0100 Subject: Add note about styling tabs Fix typo in popover docs --- docs/javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/javascript.html b/docs/javascript.html index 739e2475f..c9b94a3ca 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -644,7 +644,7 @@ $('#myTab a[href="#profile"]').tab('show'); $('#myTab a:last').tab('show');

Markup

-

You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.

+

You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.

 <ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">Home</a></li>
@@ -898,7 +898,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           

Markup

- For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option. + For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

Methods

$().popover(options)

-- cgit v1.2.3 From 2f06366399f1b0572b0dbcbadcf06df9e4867f2b Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 21 Mar 2012 12:09:00 +0100 Subject: Make changes in page templates, rebuild --- docs/assets/bootstrap.zip | Bin 55592 -> 50100 bytes docs/assets/css/bootstrap-responsive.css | 4 ++-- docs/templates/pages/javascript.mustache | 13 +++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d6ecc5869..789d41cb3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d9fa91d6c..0bc6de916 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -169,9 +169,9 @@ width: 100%; min-height: 28px; /* Make inputs at least the height of their button counterpart */ - + /* Makes inputs behave like true block-level elements */ - + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 7fd4c98d0..b61a0d424 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -562,8 +562,13 @@ $('#myModal').on('hidden', function () {

{{_i}}Using bootstrap-tab.js{{/i}}

{{_i}}Enable tabbable tabs via javascript:{{/i}}

$('#myTab').tab('show')
+

{{_i}}You can also activate a specific tab (or a pseudo-selected one) on init:{{/i}}

+
+$('#myTab a[href="#profile"]').tab('show');
+$('#myTab a:last').tab('show');
+

{{_i}}Markup{{/i}}

-

{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element.{{/i}}

+

{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

 <ul class="nav nav-tabs">
   <li><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
@@ -577,7 +582,7 @@ $('#myModal').on('hidden', function () {
             {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}}
           

-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs" id="myTab">
   <li class="active"><a href="#home">{{_i}}Home{{/i}}</a></li>
   <li><a href="#profile">{{_i}}Profile{{/i}}</a></li>
   <li><a href="#messages">{{_i}}Messages{{/i}}</a></li>
@@ -593,7 +598,7 @@ $('#myModal').on('hidden', function () {
 
 <script>
   $(function () {
-    $('.tabs a:last').tab('show')
+    $('#myTab a:last').tab('show')
   })
 </script>

{{_i}}Events{{/i}}

@@ -817,7 +822,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

{{_i}}Markup{{/i}}

- {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a the selector option.{{/i}} + {{_i}}For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.{{/i}}

{{_i}}Methods{{/i}}

$().popover({{_i}}options{{/i}})

-- cgit v1.2.3 From d5fb653914617d63739142f6ecef00afd4d3c796 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 21:35:02 -0700 Subject: top stripping leading and trailing whitespace + always use .html method --- docs/assets/bootstrap.zip | Bin 55902 -> 55797 bytes docs/assets/js/bootstrap-popover.js | 6 ++---- docs/assets/js/bootstrap-tooltip.js | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b23cd19c9..e6c6aab42 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index e1aa5ac39..6f389785c 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -38,8 +38,8 @@ , title = this.getTitle() , content = this.getContent() - $tip.find('.popover-title')[ $.type(title) == 'object' ? 'append' : 'html' ](title) - $tip.find('.popover-content > *')[ $.type(content) == 'object' ? 'append' : 'html' ](content) + $tip.find('.popover-title').html(title) + $tip.find('.popover-content > *').html(content) $tip.removeClass('fade top bottom left right in') } @@ -56,8 +56,6 @@ content = $e.attr('data-content') || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - content = content.toString().replace(/(^\s*|\s*$)/, "") - return content } diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 49b5f7286..2b5f146b1 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -206,8 +206,6 @@ title = $e.attr('data-original-title') || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - title = (title || '').toString().replace(/(^\s*|\s*$)/, "") - return title } -- cgit v1.2.3 From 94b24aaa473755093677cb4eb80faf3daee53357 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 21:57:06 -0700 Subject: clear timeout to reset delays for tooltip/popover --- docs/assets/bootstrap.zip | Bin 55863 -> 55879 bytes docs/assets/js/bootstrap-tooltip.js | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a4e398229..4742135ef 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 2b5f146b1..7d58a6c8d 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -73,8 +73,9 @@ if (!self.options.delay || !self.options.delay.show) { self.show() } else { + clearTimeout(this.timeout) self.hoverState = 'in' - setTimeout(function() { + this.timeout = setTimeout(function() { if (self.hoverState == 'in') { self.show() } @@ -88,8 +89,9 @@ if (!self.options.delay || !self.options.delay.hide) { self.hide() } else { + clearTimeout(this.timeout) self.hoverState = 'out' - setTimeout(function() { + this.timeout = setTimeout(function() { if (self.hoverState == 'out') { self.hide() } -- cgit v1.2.3 From 706ee46b73b58059230b24589160da784778aad2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:45:58 -0700 Subject: sort scrollspy to prevent flicker for unordered nav --- docs/assets/bootstrap.zip | Bin 55879 -> 55964 bytes docs/assets/js/bootstrap-scrollspy.js | 21 +++++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4742135ef..caf293653 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index e0c74539e..5008b0fe9 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -43,16 +43,25 @@ constructor: ScrollSpy , refresh: function () { - this.targets = this.$body + var self = this + , $targets + + this.offsets = [] + this.targets = [] + + $targets = this.$body .find(this.selector) .map(function () { var href = $(this).attr('href') - return /^#\w/.test(href) && $(href).length ? href : null + return /^#\w/.test(href) + && $(href).length + && [[ $(href).position().top, href ]] + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) }) - - this.offsets = $.map(this.targets, function (id) { - return $(id).position().top - }) } , process: function () { -- cgit v1.2.3 From 20e085723b3f55fdc1db7f1687d535af7d127319 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:51:32 -0700 Subject: cache $(href) lookup --- docs/assets/bootstrap.zip | Bin 55964 -> 55979 bytes docs/assets/js/bootstrap-scrollspy.js | 7 ++++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index caf293653..72d0da006 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index 5008b0fe9..487e6818b 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -53,9 +53,10 @@ .find(this.selector) .map(function () { var href = $(this).attr('href') - return /^#\w/.test(href) - && $(href).length - && [[ $(href).position().top, href ]] + , $href = /^#\w/.test(href) && $(href) + return $href + && href.length + && [[ $href.position().top, href ]] }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { -- cgit v1.2.3 From b3bf223617754e658eb62ef0f068732e719a2c82 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 21 Mar 2012 23:59:27 -0700 Subject: filter out non matches in map --- docs/assets/bootstrap.zip | Bin 55979 -> 55986 bytes docs/assets/js/bootstrap-scrollspy.js | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 72d0da006..abd205cd1 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index 487e6818b..bd3f10604 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -54,9 +54,9 @@ .map(function () { var href = $(this).attr('href') , $href = /^#\w/.test(href) && $(href) - return $href + return ( $href && href.length - && [[ $href.position().top, href ]] + && [[ $href.position().top, href ]] ) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { -- cgit v1.2.3 From cfce34e3000b2c02549e3af280668afea61fa752 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Thu, 22 Mar 2012 20:36:49 +0100 Subject: Add more examples for activating tabs Make naming of tab id consistent --- docs/assets/bootstrap.zip | Bin 50100 -> 50100 bytes docs/javascript.html | 10 ++++++---- docs/templates/pages/javascript.mustache | 10 ++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 789d41cb3..716a5d509 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index c9b94a3ca..f2d23ef52 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -609,7 +609,7 @@ $('#myModal').on('hidden', function () {

Example tabs

Click the tabs below to toggle between hidden panes, even via dropdown menus.

-

{{_i}}Using bootstrap-tab.js{{/i}}

-

{{_i}}Enable tabbable tabs via javascript:{{/i}}

-
$('#myTab').tab('show')
-

{{_i}}You can select individual tabs in several ways:{{/i}}

+

{{_i}}Enable tabbable tabs via javascript (each tab needs to be activated individually):{{/i}}

+
+$('#myTab a').click(function (e) {
+  e.preventDefault();
+  $(this).tab('show');
+})
+

{{_i}}You can activate individual tabs in several ways:{{/i}}

 $('#myTab a[href="#profile"]').tab('show'); //Select tab by name
 $('#myTab a:first').tab('show'); //Select first tab
-- 
cgit v1.2.3


From d7af2714c66ce19ba63e0871837f35dac73ecf66 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 16:02:00 -0700
Subject: remove separate badges and labels, add single file instead, remove
 hover from non-link badges/labels

---
 docs/assets/bootstrap.zip                | Bin 55592 -> 55574 bytes
 docs/assets/css/bootstrap-responsive.css |   4 +-
 docs/assets/css/bootstrap.css            |  71 ++++++++++---------------------
 3 files changed, 25 insertions(+), 50 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d6ecc5869..49ccf75ec 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index d9fa91d6c..0bc6de916 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -169,9 +169,9 @@
     width: 100%;
     min-height: 28px;
     /* Make inputs at least the height of their button counterpart */
-
+  
     /* Makes inputs behave like true block-level elements */
-
+  
     -webkit-box-sizing: border-box;
     -moz-box-sizing: border-box;
     -ms-box-sizing: border-box;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 495188af7..e29bfbf70 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3562,8 +3562,8 @@ a.thumbnail:hover {
 .thumbnail .caption {
   padding: 9px;
 }
-.label {
-  padding: 1px 4px 2px;
+.label,
+.badge {
   font-size: 10.998px;
   font-weight: bold;
   line-height: 13px;
@@ -3572,88 +3572,63 @@ a.thumbnail:hover {
   white-space: nowrap;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #999999;
+}
+.label {
+  padding: 1px 4px 2px;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-.label:hover {
-  color: #ffffff;
-  text-decoration: none;
-}
-.label-important {
-  background-color: #b94a48;
-}
-.label-important:hover {
-  background-color: #953b39;
-}
-.label-warning {
-  background-color: #f89406;
-}
-.label-warning:hover {
-  background-color: #c67605;
-}
-.label-success {
-  background-color: #468847;
-}
-.label-success:hover {
-  background-color: #356635;
-}
-.label-info {
-  background-color: #3a87ad;
-}
-.label-info:hover {
-  background-color: #2d6987;
-}
-.label-inverse {
-  background-color: #333333;
-}
-.label-inverse:hover {
-  background-color: #1a1a1a;
-}
 .badge {
   padding: 1px 9px 2px;
-  font-size: 12.025px;
-  font-weight: bold;
-  white-space: nowrap;
-  color: #ffffff;
-  background-color: #999999;
   -webkit-border-radius: 9px;
   -moz-border-radius: 9px;
   border-radius: 9px;
 }
-.badge:hover {
+a.label:hover,
+a.badge:hover {
   color: #ffffff;
   text-decoration: none;
   cursor: pointer;
 }
-.badge-error {
+.label-important,
+.badge-important {
   background-color: #b94a48;
 }
-.badge-error:hover {
+.label-important[href],
+.badge-important[href] {
   background-color: #953b39;
 }
+.label-warning,
 .badge-warning {
   background-color: #f89406;
 }
-.badge-warning:hover {
+.label-warning[href],
+.badge-warning[href] {
   background-color: #c67605;
 }
+.label-success,
 .badge-success {
   background-color: #468847;
 }
-.badge-success:hover {
+.label-success[href],
+.badge-success[href] {
   background-color: #356635;
 }
+.label-info,
 .badge-info {
   background-color: #3a87ad;
 }
-.badge-info:hover {
+.label-info[href],
+.badge-info[href] {
   background-color: #2d6987;
 }
+.label-inverse,
 .badge-inverse {
   background-color: #333333;
 }
-.badge-inverse:hover {
+.label-inverse[href],
+.badge-inverse[href] {
   background-color: #1a1a1a;
 }
 @-webkit-keyframes progress-bar-stripes {
-- 
cgit v1.2.3


From 0e73a0e94b70eab01ca0cafbec48a892531304af Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 17:09:54 -0700
Subject: change spacing and fix code blocks

---
 docs/templates/pages/javascript.mustache | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index c6d1f403c..01fcb9761 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -568,10 +568,10 @@ $('#myTab a').click(function (e) {
 })

{{_i}}You can activate individual tabs in several ways:{{/i}}

-$('#myTab a[href="#profile"]').tab('show'); //Select tab by name
-$('#myTab a:first').tab('show'); //Select first tab
-$('#myTab a:last').tab('show'); //Select last tab
-$('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
+$('#myTab a[href="#profile"]').tab('show'); // Select tab by name
+$('#myTab a:first').tab('show'); // Select first tab
+$('#myTab a:last').tab('show'); // Select last tab
+$('#myTab li:eq(2) a').tab('show'); // Select third tab (0-indexed)
 

{{_i}}Markup{{/i}}

{{_i}}You can activate a tab or pill navigation without writing any javascript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the bootstrap tab styling.{{/i}}

@@ -585,7 +585,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)

{{_i}}Methods{{/i}}

$().tab

- {{_i}}Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.{{/i}} + {{_i}}Activates a tab element and content container. Tab should have either a data-target or an href targeting a container node in the DOM.{{/i}}

 <ul class="nav nav-tabs" id="myTab">
@@ -604,7 +604,7 @@ $('#myTab li:eq(2) a').tab('show'); //Select third tab (0-indexed)
 
 <script>
   $(function () {
-    $('#myTab a:last').tab('show')
+    $('#myTab a:last').tab('show');
   })
 </script>

{{_i}}Events{{/i}}

-- cgit v1.2.3 From 89ea238c32716aabe59dcab7d4e2480858bbba91 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:13:20 -0700 Subject: move navbarBrandColor closer to link color --- docs/assets/bootstrap.zip | Bin 55584 -> 55584 bytes docs/download.html | 4 ++-- docs/templates/pages/download.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a7b695041..8fedb1f08 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/download.html b/docs/download.html index 680e851f9..89ddd76a2 100644 --- a/docs/download.html +++ b/docs/download.html @@ -317,6 +317,8 @@ + + @@ -335,8 +337,6 @@ - -

Dropdowns

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index c7f6cfab8..b282db6c9 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -241,6 +241,8 @@ + + @@ -259,8 +261,6 @@ - -

{{_i}}Dropdowns{{/i}}

-- cgit v1.2.3 From e0c85fb69cfc4a9956856e0b14afb12def2fccf0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:18:07 -0700 Subject: use new font-stack mixins in base and alt font family mixins --- docs/assets/bootstrap.zip | Bin 55584 -> 55584 bytes docs/download.html | 16 ++++++++-------- docs/templates/pages/download.mustache | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8fedb1f08..2f10c7654 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/download.html b/docs/download.html index 427dad76d..5e6a1dc17 100644 --- a/docs/download.html +++ b/docs/download.html @@ -276,14 +276,20 @@

Typography

+ + + + + + - + - + @@ -296,12 +302,6 @@ - - - - - -

Tables

diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index d7cc9e9f7..e5564a1f2 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -200,14 +200,20 @@

{{_i}}Typography{{/i}}

+ + + + + + - + - + @@ -220,12 +226,6 @@ - - - - - -

{{_i}}Tables{{/i}}

-- cgit v1.2.3 From 42f636032cf8ce66a61ef1fbdcac60b1d498aaf5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:22:19 -0700 Subject: fix #2716, incorrect required markup for navbar search form --- docs/assets/bootstrap.zip | Bin 55584 -> 55584 bytes docs/components.html | 2 +- docs/templates/pages/components.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2f10c7654..7cd6216da 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/components.html b/docs/components.html index a8979729e..518c38ddb 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1055,7 +1055,7 @@ <input type="text" class="span2"> </form>
-

For a more customized search form, add the .navbar-search class to receive specialized styles in the navbar.

+

For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.

 <form class="navbar-search pull-left">
   <input type="text" class="search-query" placeholder="Search">
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index a3aabe966..3ca43a206 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -979,7 +979,7 @@
   <input type="text" class="span2">
 </form>
 
-

{{_i}}For a more customized search form, add the .navbar-search class to receive specialized styles in the navbar.{{/i}}

+

{{_i}}For a more customized search form, add .navbar-search to the form and .search-query to the input for specialized styles in the navbar.{{/i}}

 <form class="navbar-search pull-left">
   <input type="text" class="search-query" placeholder="{{_i}}Search{{/i}}">
-- 
cgit v1.2.3


From 1a6a1828bf92aec044387ff7020a1f77abcd6730 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 22 Mar 2012 17:23:20 -0700
Subject: remove mention of siteWidth, no longer used

---
 docs/assets/bootstrap.zip                 | Bin 55584 -> 55584 bytes
 docs/scaffolding.html                     |   7 +------
 docs/templates/pages/scaffolding.mustache |   7 +------
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'docs')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 7cd6216da..a02d277b6 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index f5a756790..b49ec4031 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -374,11 +374,6 @@
         20px
         Negative space between columns
       
-      
-        @siteWidth
-        Computed sum of all columns and gutters
-        Counts number of columns and gutters to set width of the .container-fixed() mixin
-      
     
   
   
@@ -627,7 +622,7 @@
- +
diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 2d6d54c4c..b64c63af3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -298,11 +298,6 @@ 20px {{_i}}Negative space between columns{{/i}} - - @siteWidth - {{_i}}Computed sum of all columns and gutters{{/i}} - {{_i}}Counts number of columns and gutters to set width of the .container-fixed() mixin{{/i}} -
@@ -551,7 +546,7 @@
- +
-- cgit v1.2.3 From ceab161324119c1392e8c26b68d2a14c32d43ab8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:31:09 -0700 Subject: fix unescaped reset filter per #2575 --- docs/assets/bootstrap.zip | Bin 55584 -> 55567 bytes docs/assets/css/bootstrap.css | 16 ++++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index a02d277b6..4a90bab80 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4796e1288..7e39e62a1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1986,7 +1986,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); border: 1px solid #cccccc; border-bottom-color: #b3b3b3; -webkit-border-radius: 4px; @@ -2108,7 +2108,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0); border-color: #0055cc #0055cc #003580; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-primary:hover, .btn-primary:active, @@ -2133,7 +2133,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0); border-color: #f89406 #f89406 #ad6704; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-warning:hover, .btn-warning:active, @@ -2158,7 +2158,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); border-color: #bd362f #bd362f #802420; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-danger:hover, .btn-danger:active, @@ -2183,7 +2183,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); border-color: #51a351 #51a351 #387038; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-success:hover, .btn-success:active, @@ -2208,7 +2208,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); border-color: #2f96b4 #2f96b4 #1f6377; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-info:hover, .btn-info:active, @@ -2233,7 +2233,7 @@ table .span24 { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); } .btn-inverse:hover, .btn-inverse:active, @@ -2820,7 +2820,7 @@ input[type="submit"].btn.btn-mini { filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); border-color: #222222 #222222 #000000; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:dximagetransform.microsoft.gradient(enabled=false); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -- cgit v1.2.3 From b7b84c7a0dfaad5134258b5a50e8d42bd0656b81 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:36:32 -0700 Subject: remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append --- docs/assets/bootstrap.zip | Bin 55567 -> 55573 bytes docs/assets/css/bootstrap.css | 1 + docs/base-css.html | 3 +-- docs/templates/pages/base-css.mustache | 3 +-- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4a90bab80..82d184fdc 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7e39e62a1..825c764f3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -992,6 +992,7 @@ select:focus:required:invalid:focus { .input-append select, .input-prepend .uneditable-input, .input-append .uneditable-input { + margin-bottom: 0; *margin-left: 0; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; diff --git a/docs/base-css.html b/docs/base-css.html index d44b65891..76b13b783 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1639,8 +1639,7 @@ For example, <code>section</code> should be wrapped as inline.
- - +
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9b2964d74..b463462bc 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1563,8 +1563,7 @@
- - +
-- cgit v1.2.3 From edca6f28f0ae78cdc3dbfe0ce5183153830a77ee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:41:20 -0700 Subject: fix #2718, misaligned uneditable inputs in prepends/appends --- docs/assets/bootstrap.zip | Bin 55573 -> 55576 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 82d184fdc..fac56f1bb 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 825c764f3..393d9e606 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -951,7 +951,6 @@ select:focus:required:invalid:focus { clear: both; } .uneditable-input { - display: block; background-color: #ffffff; border-color: #eee; -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); @@ -994,6 +993,7 @@ select:focus:required:invalid:focus { .input-append .uneditable-input { margin-bottom: 0; *margin-left: 0; + vertical-align: middle; -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; -- cgit v1.2.3 From 254bb40f006ebe0c546a9840bd3cae51047e3628 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 17:49:13 -0700 Subject: remove mentions of unused button variable per #2537 --- docs/assets/bootstrap.zip | Bin 55576 -> 55576 bytes docs/less.html | 78 ++++++++++++++++++++++++++++++++++++- docs/templates/pages/less.mustache | 78 ++++++++++++++++++++++++++++++++++++- 3 files changed, 154 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index fac56f1bb..4dc9b4f2f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index f8e4d9b33..de11c79ba 100644 --- a/docs/less.html +++ b/docs/less.html @@ -290,10 +290,86 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@primaryButtonBackground@btnBackground@white
@btnBackgroundHighlightdarken(@white, 10%)
@btnBorderdarken(@white, 20%)
@btnPrimaryBackground @linkColor
@btnPrimaryBackgroundHighlightspin(@btnPrimaryBackground, 15%)
@btnInfoBackground#5bc0de
@btnInfoBackgroundHighlight#2f96b4
@btnSuccessBackground#62c462
@btnSuccessBackgroundHighlight51a351
@btnWarningBackgroundlighten(@orange, 15%)
@btnWarningBackgroundHighlight@orange
@btnDangerBackground#ee5f5b
@btnDangerBackgroundHighlight#bd362f
@btnInverseBackground@gray
@btnInverseBackgroundHighlight@grayDarker

Forms

diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 23a4486a1..00130550a 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -214,10 +214,86 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@primaryButtonBackground@btnBackground@white
@btnBackgroundHighlightdarken(@white, 10%)
@btnBorderdarken(@white, 20%)
@btnPrimaryBackground @linkColor
@btnPrimaryBackgroundHighlightspin(@btnPrimaryBackground, 15%)
@btnInfoBackground#5bc0de
@btnInfoBackgroundHighlight#2f96b4
@btnSuccessBackground#62c462
@btnSuccessBackgroundHighlight51a351
@btnWarningBackgroundlighten(@orange, 15%)
@btnWarningBackgroundHighlight@orange
@btnDangerBackground#ee5f5b
@btnDangerBackgroundHighlight#bd362f
@btnInverseBackground@gray
@btnInverseBackgroundHighlight@grayDarker

{{_i}}Forms{{/i}}

-- cgit v1.2.3 From b011daf67fbb3cde6c33b40a0347d7e1a8d183ad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 19:36:55 -0700 Subject: finish adding remaining component variables to less docs page --- docs/assets/bootstrap.zip | Bin 55576 -> 55576 bytes docs/less.html | 225 +++++++++++++++++++++++++++++++------ docs/templates/pages/less.mustache | 225 +++++++++++++++++++++++++++++++------ 3 files changed, 386 insertions(+), 64 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4dc9b4f2f..7246485c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index de11c79ba..19b2b2235 100644 --- a/docs/less.html +++ b/docs/less.html @@ -139,12 +139,24 @@
-

Hyperlinks

+

Scaffolding and links

- - + + + + + + + + + + + + + + @@ -184,18 +196,69 @@

Typography

@linkColor#08c@bodyBackground@whitePage background color
@textColor@grayDarkDefault text color for entire body, headings, and more
@linkColor#08c Default link text color
+ + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + +
@sansFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@serifFontFamilyGeorgia, "Times New Roman", Times, serif
@monoFontFamilyMenlo, Monaco, "Courier New", monospace
@baseFontSize 13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif@sansFontFamily
@baseLineHeight 18px
@altFontFamily@serifFontFamily
@headingsFontFamilyinherit
@headingsFontWeightbold
@headingsColorinherit
+

Tables

+ + + + + + + + + + + + + + + + + +
@tableBackgroundtransparent
@tableBackgroundAccent#f9f9f9
@tableBackgroundHover#f5f5f5
@tableBorderddd
@@ -378,10 +441,68 @@ @placeholderText @grayLight - + + + @inputBackground + @white + + + @inputBorder + #ccc + + + @inputDisabledBackground + @grayLighter +

Form states and alerts

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@warningText#c09853
@warningBackground#f3edd2
@errorText#b94a48
@errorBackground#f2dede
@successText#468847
@successBackground#dff0d8
@infoText#3a87ad
@infoBackground#d9edf7
+
+

Navbar

@@ -400,6 +521,7 @@ + @@ -415,52 +537,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@grayDark
@navbarText @grayLight@white
@navbarLinkColorActive@navbarLinkColorHover
@navbarLinkBackgroundHovertransparent
@navbarLinkBackgroundActive@navbarBackground
@navbarSearchBackgroundlighten(@navbarBackground, 25%)
@navbarSearchBackgroundFocus@white
@navbarSearchBorderdarken(@navbarSearchBackground, 30%)
@navbarSearchPlaceholderColor#ccc
@navbarBrandColor@navbarLinkColor
-
-
-

Form states and alerts

+

Dropdowns

- - - + + - - - + + - - - + + - - - + + - - - + + + +
@warningText#c09853@dropdownBackground@white
@warningBackground#f3edd2@dropdownBorderrgba(0,0,0,.2)
@errorText#b94a48@dropdownLinkColor@grayDark
@errorBackground#f2dede@dropdownLinkColorHover@white
@successText#468847@dropdownLinkBackgroundHover@linkColor
+

Hero unit

+ + - - - + + + - - - + + + - - - + + +
@successBackground#dff0d8@heroUnitBackground@grayLighter
@infoText#3a87ad@heroUnitHeadingColorinherit
@infoBackground#d9edf7@heroUnitLeadColorinhereit
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 00130550a..129c76e9c 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -63,12 +63,24 @@
-

{{_i}}Hyperlinks{{/i}}

+

{{_i}}Scaffolding and links{{/i}}

- - + + + + + + + + + + + + + + @@ -108,18 +120,69 @@

{{_i}}Typography{{/i}}

@linkColor#08c@bodyBackground@white{{_i}}Page background color{{/i}}
@textColor@grayDark{{_i}}Default text color for entire body, headings, and more{{/i}}
@linkColor#08c {{_i}}Default link text color{{/i}}
+ + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + +
@sansFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@serifFontFamilyGeorgia, "Times New Roman", Times, serif
@monoFontFamilyMenlo, Monaco, "Courier New", monospace
@baseFontSize 13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif@sansFontFamily
@baseLineHeight 18px
@altFontFamily@serifFontFamily
@headingsFontFamilyinherit
@headingsFontWeightbold
@headingsColorinherit
+

{{_i}}Tables{{/i}}

+ + + + + + + + + + + + + + + + + +
@tableBackgroundtransparent
@tableBackgroundAccent#f9f9f9
@tableBackgroundHover#f5f5f5
@tableBorderddd
@@ -302,10 +365,68 @@ @placeholderText @grayLight - + + + @inputBackground + @white + + + @inputBorder + #ccc + + + @inputDisabledBackground + @grayLighter +

{{_i}}Form states and alerts{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@warningText#c09853
@warningBackground#f3edd2
@errorText#b94a48
@errorBackground#f2dede
@successText#468847
@successBackground#dff0d8
@infoText#3a87ad
@infoBackground#d9edf7
+
+

{{_i}}Navbar{{/i}}

@@ -324,6 +445,7 @@ + @@ -339,52 +461,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@grayDark
@navbarText @grayLight@white
@navbarLinkColorActive@navbarLinkColorHover
@navbarLinkBackgroundHovertransparent
@navbarLinkBackgroundActive@navbarBackground
@navbarSearchBackgroundlighten(@navbarBackground, 25%)
@navbarSearchBackgroundFocus@white
@navbarSearchBorderdarken(@navbarSearchBackground, 30%)
@navbarSearchPlaceholderColor#ccc
@navbarBrandColor@navbarLinkColor
-
-
-

{{_i}}Form states and alerts{{/i}}

+

{{_i}}Dropdowns{{/i}}

- - - + + - - - + + - - - + + - - - + + - - - + + + +
@warningText#c09853@dropdownBackground@white
@warningBackground#f3edd2@dropdownBorderrgba(0,0,0,.2)
@errorText#b94a48@dropdownLinkColor@grayDark
@errorBackground#f2dede@dropdownLinkColorHover@white
@successText#468847@dropdownLinkBackgroundHover@linkColor
+

{{_i}}Hero unit{{/i}}

+ + - - - + + + - - - + + + - - - + + +
@successBackground#dff0d8@heroUnitBackground@grayLighter
@infoText#3a87ad@heroUnitHeadingColorinherit
@infoBackground#d9edf7@heroUnitLeadColorinhereit
-- cgit v1.2.3 From 1852d077bfa15308808c470a031f6e6b5c3dc8d2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:08:41 -0700 Subject: add shell of tests page, lighten form actions background and give it a variable --- docs/assets/bootstrap.zip | Bin 55576 -> 55601 bytes docs/assets/css/bootstrap.css | 4 +- docs/css-tests.html | 120 ++++++++++++++++++++++++++++++++ docs/less.html | 4 ++ docs/templates/pages/css-tests.mustache | 6 ++ docs/templates/pages/less.mustache | 4 ++ 6 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 docs/css-tests.html create mode 100644 docs/templates/pages/css-tests.mustache (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7246485c9..01d89c88e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 393d9e606..8b22f8928 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -938,7 +938,7 @@ select:focus:required:invalid:focus { padding: 17px 20px 18px; margin-top: 18px; margin-bottom: 18px; - background-color: #eeeeee; + background-color: #f5f5f5; border-top: 1px solid #ddd; *zoom: 1; } @@ -1208,6 +1208,8 @@ table { .table thead th { vertical-align: bottom; } +.table caption + thead tr:first-child th, +.table caption + thead tr:first-child td, .table colgroup + thead tr:first-child th, .table colgroup + thead tr:first-child td, .table thead:first-child tr:first-child th, diff --git a/docs/css-tests.html b/docs/css-tests.html new file mode 100644 index 000000000..3eeac5924 --- /dev/null +++ b/docs/css-tests.html @@ -0,0 +1,120 @@ + + + + + Css · Twitter Bootstrap + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+

Tests

+

+
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/less.html b/docs/less.html index 19b2b2235..08987d128 100644 --- a/docs/less.html +++ b/docs/less.html @@ -454,6 +454,10 @@ @inputDisabledBackground @grayLighter + + @formActionsBackground + #f5f5f5 +

Form states and alerts

diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache new file mode 100644 index 000000000..6455039c4 --- /dev/null +++ b/docs/templates/pages/css-tests.mustache @@ -0,0 +1,6 @@ + +
+

{{_i}}Tests{{/i}}

+

{{_i}}{{/i}}

+
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 129c76e9c..263ec7fce 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -378,6 +378,10 @@ @inputDisabledBackground @grayLighter + + @formActionsBackground + #f5f5f5 +

{{_i}}Form states and alerts{{/i}}

-- cgit v1.2.3 From dbadac183df8efff4307b2c28daac8414165feaa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:09:27 -0700 Subject: add new @formActionsBackground to customize page --- docs/assets/bootstrap.zip | Bin 55601 -> 55601 bytes docs/download.html | 2 ++ docs/templates/pages/download.mustache | 2 ++ 3 files changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 01d89c88e..4cdd3a0cd 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/download.html b/docs/download.html index 5e6a1dc17..65ef15d00 100644 --- a/docs/download.html +++ b/docs/download.html @@ -366,6 +366,8 @@ + + diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index e5564a1f2..dfc96fdc3 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -290,6 +290,8 @@ + + -- cgit v1.2.3 From bdf8a6966be7d2b2e62ea1860501fbdf59ef671d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:17:55 -0700 Subject: remove labels and badges from customizer and replace with single file --- docs/assets/bootstrap.zip | Bin 55601 -> 55601 bytes docs/download.html | 3 +-- docs/templates/pages/download.mustache | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4cdd3a0cd..613eef56b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/download.html b/docs/download.html index 65ef15d00..b22478e14 100644 --- a/docs/download.html +++ b/docs/download.html @@ -107,8 +107,7 @@

Base CSS

- - + diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index dfc96fdc3..cec420f3e 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -31,8 +31,7 @@

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

- - + -- cgit v1.2.3 From ab068f6fda525236220af6e1bf879a677ed6bfc0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 21:33:06 -0700 Subject: bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization --- docs/assets/bootstrap.zip | Bin 55601 -> 55604 bytes docs/assets/css/bootstrap-responsive.css | 230 +++++++++++++++---------------- docs/assets/css/bootstrap.css | 2 +- docs/download.html | 6 +- docs/templates/pages/download.mustache | 6 +- 5 files changed, 126 insertions(+), 118 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 613eef56b..c6d21fc96 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index b007300c2..14d7594d2 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.0.2 + * Bootstrap Responsive v2.0.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 @@ -375,120 +375,6 @@ width: 32px; } } -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top { - position: static; - margin-bottom: 18px; - } - .navbar-fixed-top .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-left: 10px; - padding-right: 10px; - margin: 0 0 0 -5px; - } - .navbar .nav-collapse { - clear: left; - } - .navbar .nav { - float: none; - margin: 0 0 9px; - } - .navbar .nav > li { - float: none; - } - .navbar .nav > li > a { - margin-bottom: 2px; - } - .navbar .nav > .divider-vertical { - display: none; - } - .navbar .nav .nav-header { - color: #999999; - text-shadow: none; - } - .navbar .nav > li > a, - .navbar .dropdown-menu a { - padding: 6px 15px; - font-weight: bold; - color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .navbar .dropdown-menu li + li a { - margin-bottom: 2px; - } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { - background-color: #222222; - } - .navbar .dropdown-menu { - position: static; - top: auto; - left: auto; - float: none; - display: block; - max-width: none; - margin: 0 15px; - padding: 0; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { - display: none; - } - .navbar .dropdown-menu .divider { - display: none; - } - .navbar-form, - .navbar-search { - float: none; - padding: 9px 15px; - margin: 9px 0; - border-top: 1px solid #222222; - border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar .nav.pull-right { - float: none; - margin-left: 0; - } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .btn-navbar { - display: block; - } - .nav-collapse { - overflow: hidden; - height: 0; - } -} -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} @media (min-width: 1200px) { .row { margin-left: -30px; @@ -686,3 +572,117 @@ margin-left: 30px; } } +@media (max-width: 979px) { + body { + padding-top: 0; + } + .navbar-fixed-top { + position: static; + margin-bottom: 18px; + } + .navbar-fixed-top .navbar-inner { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + .navbar .brand { + padding-left: 10px; + padding-right: 10px; + margin: 0 0 0 -5px; + } + .navbar .nav-collapse { + clear: left; + } + .navbar .nav { + float: none; + margin: 0 0 9px; + } + .navbar .nav > li { + float: none; + } + .navbar .nav > li > a { + margin-bottom: 2px; + } + .navbar .nav > .divider-vertical { + display: none; + } + .navbar .nav .nav-header { + color: #999999; + text-shadow: none; + } + .navbar .nav > li > a, + .navbar .dropdown-menu a { + padding: 6px 15px; + font-weight: bold; + color: #999999; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + } + .navbar .dropdown-menu li + li a { + margin-bottom: 2px; + } + .navbar .nav > li > a:hover, + .navbar .dropdown-menu a:hover { + background-color: #222222; + } + .navbar .dropdown-menu { + position: static; + top: auto; + left: auto; + float: none; + display: block; + max-width: none; + margin: 0 15px; + padding: 0; + background-color: transparent; + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .navbar .dropdown-menu:before, + .navbar .dropdown-menu:after { + display: none; + } + .navbar .dropdown-menu .divider { + display: none; + } + .navbar-form, + .navbar-search { + float: none; + padding: 9px 15px; + margin: 9px 0; + border-top: 1px solid #222222; + border-bottom: 1px solid #222222; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + .navbar .nav.pull-right { + float: none; + margin-left: 0; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } + .btn-navbar { + display: block; + } + .nav-collapse { + overflow: hidden; + height: 0; + } +} +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } +} diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8b22f8928..4f72e0770 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.0.2 + * Bootstrap v2.0.3 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/docs/download.html b/docs/download.html index b22478e14..a35354947 100644 --- a/docs/download.html +++ b/docs/download.html @@ -142,7 +142,11 @@

Responsive

- + + + + +
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index cec420f3e..051291148 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -66,7 +66,11 @@

{{_i}}Responsive{{/i}}

- + + + + + -- cgit v1.2.3 From 50b2245be5bd7cd12d37e38a00c4978a211bdcd3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 22:06:23 -0700 Subject: restore max-width 100% for images --- docs/assets/bootstrap.zip | Bin 55604 -> 55613 bytes docs/assets/css/bootstrap.css | 1 + 2 files changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c6d21fc96..0e3c888c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 4f72e0770..de6963138 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -57,6 +57,7 @@ sub { bottom: -0.25em; } img { + max-width: 100%; height: auto; border: 0; -ms-interpolation-mode: bicubic; -- cgit v1.2.3 From ac64d9405b3f650704f2e63b52c26b9f6f792cb8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 22 Mar 2012 23:09:31 -0700 Subject: Dropdowns overhaul: 1. Removed broken and unused dropup examples from the navs/pills docs 2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified 3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button 4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less. 5. Annnnnnnnnd I think that's it. --- docs/assets/bootstrap.zip | Bin 55613 -> 55642 bytes docs/assets/css/bootstrap.css | 70 ++++++++++++++++--------------- docs/components.html | 20 --------- docs/templates/pages/components.mustache | 20 --------- 4 files changed, 37 insertions(+), 73 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0e3c888c9..f503a1168 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index de6963138..af94c7402 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1800,7 +1800,7 @@ table .span24 { margin-left: 2px; } .dropdown:hover .caret, -.open.dropdown .caret { +.open .caret { opacity: 1; filter: alpha(opacity=100); } @@ -1813,16 +1813,14 @@ table .span24 { display: none; min-width: 160px; padding: 4px 0; - margin: 0; + margin: 1px 0 0; list-style: none; background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; + border: 1px solid #ccc; + border: 1px solid rgba(0, 0, 0, 0.2); + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); @@ -1861,15 +1859,10 @@ table .span24 { text-decoration: none; background-color: #0088cc; } -.dropdown.open { +.open { *z-index: 1000; } -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { +.open .dropdown-menu { display: block; } .pull-right .dropdown-menu { @@ -2382,21 +2375,32 @@ input[type="submit"].btn.btn-mini { padding-left: 12px; padding-right: 12px; } -.btn-group.open { - *z-index: 1000; -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); +} +.btn-group.open .btn.dropdown-toggle { + background-color: #e6e6e6; +} +.btn-group.open .btn-primary.dropdown-toggle { + background-color: #0055cc; +} +.btn-group.open .btn-warning.dropdown-toggle { + background-color: #f89406; +} +.btn-group.open .btn-danger.dropdown-toggle { + background-color: #bd362f; +} +.btn-group.open .btn-success.dropdown-toggle { + background-color: #51a351; +} +.btn-group.open .btn-info.dropdown-toggle { + background-color: #2f96b4; +} +.btn-group.open .btn-inverse.dropdown-toggle { + background-color: #222222; } .btn .caret { margin-top: 7px; @@ -2635,10 +2639,10 @@ input[type="submit"].btn.btn-mini { .nav-pills.nav-stacked > li:last-child > a { margin-bottom: 1px; } -.nav-tabs .dropdown-menu, -.nav-pills .dropdown-menu { - margin-top: 1px; - border-width: 1px; +.nav-tabs .dropdown-menu { + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; } .nav-pills .dropdown-menu { -webkit-border-radius: 4px; diff --git a/docs/components.html b/docs/components.html index 518c38ddb..be1143877 100644 --- a/docs/components.html +++ b/docs/components.html @@ -639,16 +639,6 @@
  • Separated link
  • -
     <ul class="nav nav-tabs">
    @@ -681,16 +671,6 @@
                 
  • Separated link
  • -
     <ul class="nav nav-pills">
    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
    index 3ca43a206..25741608b 100644
    --- a/docs/templates/pages/components.mustache
    +++ b/docs/templates/pages/components.mustache
    @@ -563,16 +563,6 @@
                 
  • {{_i}}Separated link{{/i}}
  • -
     <ul class="nav nav-tabs">
    @@ -605,16 +595,6 @@
                 
  • {{_i}}Separated link{{/i}}
  • -
     <ul class="nav nav-pills">
    -- 
    cgit v1.2.3
    
    
    From c4fb7032690ed10162562dfbf893311389a64dee Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Thu, 22 Mar 2012 23:38:50 -0700
    Subject: fix left and right tab-content alignment with width: auto;
    
    ---
     docs/assets/bootstrap.zip     | Bin 55642 -> 55645 bytes
     docs/assets/css/bootstrap.css |  12 +++++-------
     2 files changed, 5 insertions(+), 7 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index f503a1168..9263e41cc 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
    index af94c7402..cbed3f7c8 100644
    --- a/docs/assets/css/bootstrap.css
    +++ b/docs/assets/css/bootstrap.css
    @@ -2735,6 +2735,10 @@ input[type="submit"].btn.btn-mini {
     .tabs-below .nav-tabs .active > a:hover {
       border-color: transparent #ddd #ddd #ddd;
     }
    +.tabs-left .tab-content,
    +.tabs-right .tab-content {
    +  width: auto;
    +}
     .tabs-left .nav-tabs > li,
     .tabs-right .nav-tabs > li {
       float: none;
    @@ -3039,12 +3043,6 @@ input[type="submit"].btn.btn-mini {
       margin-left: 10px;
       margin-right: 0;
     }
    -.navbar .dropdown-menu {
    -  margin-top: 1px;
    -  -webkit-border-radius: 4px;
    -  -moz-border-radius: 4px;
    -  border-radius: 4px;
    -}
     .navbar .dropdown-menu:before {
       content: '';
       display: inline-block;
    @@ -3080,7 +3078,7 @@ input[type="submit"].btn.btn-mini {
       top: auto;
     }
     .navbar .nav .dropdown-toggle .caret,
    -.navbar .nav .open.dropdown .caret {
    +.navbar .nav .open .caret {
       border-top-color: #ffffff;
       border-bottom-color: #ffffff;
     }
    -- 
    cgit v1.2.3
    
    
    From a28fa20018a2529ecc5d91604486abbd0730b511 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Thu, 22 Mar 2012 23:49:39 -0700
    Subject: remove redundant max-width img from docs css
    
    ---
     docs/assets/css/docs.css | 4 ----
     1 file changed, 4 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
    index cb7224e38..3a8bfbc58 100644
    --- a/docs/assets/css/docs.css
    +++ b/docs/assets/css/docs.css
    @@ -492,10 +492,6 @@ hr.soften {
     /* Misc
     -------------------------------------------------- */
     
    -img {
    -  max-width: 100%;
    -}
    -
     /* Make tables spaced out a bit more */
     h2 + table,
     h3 + table,
    -- 
    cgit v1.2.3
    
    
    From b8d8ab1aad8d222e245f9dc0e6776e50c98bc48d Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:28:58 -0700
    Subject: run make on merge of progress bars change
    
    ---
     docs/assets/bootstrap.zip     | Bin 55645 -> 55643 bytes
     docs/assets/css/bootstrap.css |  16 ++++++++--------
     2 files changed, 8 insertions(+), 8 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index 9263e41cc..4ccab064f 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
    index cbed3f7c8..c70b4959f 100644
    --- a/docs/assets/css/bootstrap.css
    +++ b/docs/assets/css/bootstrap.css
    @@ -3641,34 +3641,34 @@ a.badge:hover {
     }
     @-webkit-keyframes progress-bar-stripes {
       from {
    -    background-position: 0 0;
    +    background-position: 40px 0;
       }
       to {
    -    background-position: 40px 0;
    +    background-position: 0 0;
       }
     }
     @-moz-keyframes progress-bar-stripes {
       from {
    -    background-position: 0 0;
    +    background-position: 40px 0;
       }
       to {
    -    background-position: 40px 0;
    +    background-position: 0 0;
       }
     }
     @-ms-keyframes progress-bar-stripes {
       from {
    -    background-position: 0 0;
    +    background-position: 40px 0;
       }
       to {
    -    background-position: 40px 0;
    +    background-position: 0 0;
       }
     }
     @keyframes progress-bar-stripes {
       from {
    -    background-position: 0 0;
    +    background-position: 40px 0;
       }
       to {
    -    background-position: 40px 0;
    +    background-position: 0 0;
       }
     }
     .progress {
    -- 
    cgit v1.2.3
    
    
    From 2729d15742e61c0bf52966064eb260409b55a600 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:37:15 -0700
    Subject: fix #2625 manually: account for dropup caret on large button
    
    ---
     docs/assets/bootstrap.zip     | Bin 55643 -> 55687 bytes
     docs/assets/css/bootstrap.css |  10 +++++++---
     2 files changed, 7 insertions(+), 3 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index 4ccab064f..d7ffa1271 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
    index c70b4959f..747fd4b55 100644
    --- a/docs/assets/css/bootstrap.css
    +++ b/docs/assets/css/bootstrap.css
    @@ -2419,9 +2419,13 @@ input[type="submit"].btn.btn-mini {
     }
     .btn-large .caret {
       margin-top: 6px;
    -  border-left: 5px solid transparent;
    -  border-right: 5px solid transparent;
    -  border-top: 5px solid #000000;
    +  border-left-width: 5px;
    +  border-right-width: 5px;
    +  border-top-width: 5px;
    +}
    +.dropup .btn-large .caret {
    +  border-bottom: 5px solid #000000;
    +  border-top: 0;
     }
     .btn-primary .caret,
     .btn-warning .caret,
    -- 
    cgit v1.2.3
    
    
    From ee3fc11addc047f82b0e3629e22a9e439fb789b6 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:38:13 -0700
    Subject: fix #2617: add negative margin to fixed-bottom navbar
    
    ---
     docs/assets/bootstrap.zip                | Bin 55687 -> 55700 bytes
     docs/assets/css/bootstrap-responsive.css |   3 ++-
     2 files changed, 2 insertions(+), 1 deletion(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index d7ffa1271..743cd3fbd 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
    index 14d7594d2..78ce60d7f 100644
    --- a/docs/assets/css/bootstrap-responsive.css
    +++ b/docs/assets/css/bootstrap-responsive.css
    @@ -140,7 +140,8 @@
         padding-left: 20px;
         padding-right: 20px;
       }
    -  .navbar-fixed-top {
    +  .navbar-fixed-top,
    +  .navbar-fixed-bottom {
         margin-left: -20px;
         margin-right: -20px;
       }
    -- 
    cgit v1.2.3
    
    
    From 281e058ef24aabd6ed47e3a2a9de7617dc685964 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:40:10 -0700
    Subject: fix #2613: labels hang too low
    
    ---
     docs/assets/bootstrap.zip     | Bin 55700 -> 55701 bytes
     docs/assets/css/bootstrap.css |   2 +-
     2 files changed, 1 insertion(+), 1 deletion(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index 743cd3fbd..d025abf0a 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
    index 747fd4b55..f4d2dbe37 100644
    --- a/docs/assets/css/bootstrap.css
    +++ b/docs/assets/css/bootstrap.css
    @@ -3578,7 +3578,7 @@ a.thumbnail:hover {
     .badge {
       font-size: 10.998px;
       font-weight: bold;
    -  line-height: 13px;
    +  line-height: 14px;
       color: #ffffff;
       vertical-align: middle;
       white-space: nowrap;
    -- 
    cgit v1.2.3
    
    
    From e84161076b6c54be4ab0950f5d91c23456a967a7 Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Fri, 23 Mar 2012 00:58:41 -0700
    Subject: add mention of transitions plugin requirement on collapse
    
    ---
     docs/assets/bootstrap.zip                | Bin 55701 -> 55701 bytes
     docs/javascript.html                     |   3 ++-
     docs/templates/pages/javascript.mustache |   3 ++-
     3 files changed, 4 insertions(+), 2 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index d025abf0a..1f11406c8 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/javascript.html b/docs/javascript.html
    index f0382bf49..4f6059cb7 100644
    --- a/docs/javascript.html
    +++ b/docs/javascript.html
    @@ -1112,7 +1112,8 @@ $('#my-alert').bind('closed', function () {
               

    About

    Get base styles and flexible support for collapsible components like accordions and navigation.

    Download file - +

    * Requires the Transitions plugin to be included.

    +

    Example accordion

    Using the collapse plugin, we built a simple accordion style widget:

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 01fcb9761..06816c7ad 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1036,7 +1036,8 @@ $('#my-alert').bind('closed', function () {

    {{_i}}About{{/i}}

    {{_i}}Get base styles and flexible support for collapsible components like accordions and navigation.{{/i}}

    {{_i}}Download file{{/i}} -
    +

    * {{_i}}Requires the Transitions plugin to be included.{{/i}}

    +

    {{_i}}Example accordion{{/i}}

    {{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}

    -- cgit v1.2.3 From 622b8fa3f0d54e1c356fbe76d7bdc407919ff840 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:13:20 -0700 Subject: adding blog link to docs homepage --- docs/assets/bootstrap.zip | Bin 55701 -> 55701 bytes docs/assets/css/docs.css | 2 +- docs/index.html | 1 + docs/templates/pages/index.mustache | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1f11406c8..566d3e621 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 3a8bfbc58..b7e0c8dbf 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -228,7 +228,7 @@ hr.soften { } .quick-links li { display: inline; - margin: 0 5px; + margin: 0 8px; color: #999; } .quick-links .github-btn, diff --git a/docs/index.html b/docs/index.html index 2dba90a3f..1f009bcb5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -90,6 +90,7 @@ diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 9d8253df1..bef11b810 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -14,6 +14,7 @@ -- cgit v1.2.3 From de7aee246591f0be9ee58079175b42af7f5a6947 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:28:04 -0700 Subject: fix broken tables with double borders and such, add css tests page to start with table edge cases --- docs/assets/bootstrap.zip | Bin 55701 -> 55760 bytes docs/assets/css/bootstrap.css | 6 ++ docs/css-tests.html | 184 +++++++++++++++++++++++++++++++- docs/templates/pages/css-tests.mustache | 184 +++++++++++++++++++++++++++++++- 4 files changed, 370 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 566d3e621..6262fbb6c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f4d2dbe37..bdf6a771f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1237,6 +1237,12 @@ table { .table-bordered td { border-left: 1px solid #dddddd; } +.table-bordered caption + thead tr:first-child th, +.table-bordered caption + tbody tr:first-child th, +.table-bordered caption + tbody tr:first-child td, +.table-bordered colgroup + thead tr:first-child th, +.table-bordered colgroup + tbody tr:first-child th, +.table-bordered colgroup + tbody tr:first-child td, .table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { diff --git a/docs/css-tests.html b/docs/css-tests.html index 3eeac5924..6dcec9798 100644 --- a/docs/css-tests.html +++ b/docs/css-tests.html @@ -74,13 +74,193 @@
    + +
    -

    Tests

    -

    +

    CSS Tests

    +

    One stop shop for quick debugging and edge-case tests of CSS.

    + + +
    +
    +

    Bordered without thead

    + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered without thead, with caption

    + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    +

    Bordered without thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered with thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    123
    +
    +
    +

    Bordered with thead and caption

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    123
    +

    Bordered with rowspan and colspan

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    1 and 23
    123
    13
    2 and 3
    +
    +
    + diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache index 6455039c4..cde7484dc 100644 --- a/docs/templates/pages/css-tests.mustache +++ b/docs/templates/pages/css-tests.mustache @@ -1,6 +1,186 @@ + +
    -

    {{_i}}Tests{{/i}}

    -

    {{_i}}{{/i}}

    +

    {{_i}}CSS Tests{{/i}}

    +

    {{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}

    + + + +
    +
    +

    Bordered without thead

    + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered without thead, with caption

    + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    +

    Bordered without thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    +

    Bordered with thead, with colgroup

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    123
    123
    123
    +
    +
    +

    Bordered with thead and caption

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table caption
    123
    123
    123
    123
    +

    Bordered with rowspan and colspan

    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    123
    1 and 23
    123
    13
    2 and 3
    +
    +
    -- cgit v1.2.3 From 5179df1928e82670a2f16ce414a42f1008c6d652 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 01:31:22 -0700 Subject: css tests cleanup --- docs/assets/bootstrap.zip | Bin 55760 -> 55760 bytes docs/css-tests.html | 31 +++++++++++++++++++------------ docs/templates/pages/css-tests.mustache | 31 +++++++++++++++++++------------ 3 files changed, 38 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6262fbb6c..8b7459387 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/css-tests.html b/docs/css-tests.html index 6dcec9798..081b27a57 100644 --- a/docs/css-tests.html +++ b/docs/css-tests.html @@ -75,18 +75,25 @@
    @@ -103,6 +108,11 @@

    One stop shop for quick debugging and edge-case tests of CSS.

    + + + + @@ -269,6 +279,52 @@
    + + + + + +
    +
    +

    Prepend and append on inputs

    +
    +
    +
    + @ +
    +
    +
    +
    + @ +
    +
    +
    +
    + $.00 +
    +
    +
    +
    +
    +

    Prepend and append with uneditable

    +
    +
    + $Some value here +
    +
    + Some value here.00 +
    +
    + +
    +
    + + + +
    diff --git a/docs/templates/pages/css-tests.mustache b/docs/templates/pages/css-tests.mustache index 6f460569d..0220d733b 100644 --- a/docs/templates/pages/css-tests.mustache +++ b/docs/templates/pages/css-tests.mustache @@ -8,6 +8,10 @@ margin-bottom: 36px; } + h4 { + margin-bottom: 5px; + } + /* colgroup tests */ .col1 { background-color: rgba(255,0,0,.1); @@ -20,6 +24,7 @@ } +
    @@ -27,6 +32,11 @@

    {{_i}}One stop shop for quick debugging and edge-case tests of CSS.{{/i}}

    + + + + @@ -191,3 +201,49 @@
    + + + + + + + +
    +
    +

    Prepend and append on inputs

    +
    +
    +
    + @ +
    +
    +
    +
    + @ +
    +
    +
    +
    + $.00 +
    +
    +
    +
    +
    +

    Prepend and append with uneditable

    +
    +
    + $Some value here +
    +
    + Some value here.00 +
    +
    + +
    +
    + + -- cgit v1.2.3 From c7afe382a26834cce5b8bf2fc7333ce7e945a2d4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 23 Mar 2012 20:56:04 -0700 Subject: fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition --- docs/assets/bootstrap.zip | Bin 55592 -> 55591 bytes docs/assets/css/bootstrap-responsive.css | 4 ++-- docs/assets/css/bootstrap.css | 30 +++++++++++++++--------------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index d6ecc5869..03259655f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index d9fa91d6c..0bc6de916 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -169,9 +169,9 @@ width: 100%; min-height: 28px; /* Make inputs at least the height of their button counterpart */ - + /* Makes inputs behave like true block-level elements */ - + -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -ms-box-sizing: border-box; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 495188af7..624f599ef 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -748,9 +748,9 @@ textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; outline: thin dotted \9; /* IE6-9 */ @@ -1990,9 +1990,9 @@ table .span24 { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; *margin-left: .3em; } @@ -2029,9 +2029,9 @@ table .span24 { .btn.active, .btn:active { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; outline: 0; @@ -2356,9 +2356,9 @@ input[type="submit"].btn.btn-mini { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); *padding-top: 3px; *padding-bottom: 3px; } @@ -2388,9 +2388,9 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); } .btn .caret { margin-top: 7px; -- cgit v1.2.3 From de0aaff4338acc72b5c6220f4731b7fa7c52ac2c Mon Sep 17 00:00:00 2001 From: Andreas Bovens Date: Sat, 24 Mar 2012 18:53:27 +0100 Subject: Added -o- and -ms- prefixes to animations CSS Added -o- and -ms- prefixes to make the animated progress bars to work in the latest/upcoming versions of IE and Opera. --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 495188af7..118eb10ca 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3753,6 +3753,8 @@ a.thumbnail:hover { .progress.active .bar { -webkit-animation: progress-bar-stripes 2s linear infinite; -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; animation: progress-bar-stripes 2s linear infinite; } .progress-danger .bar { -- cgit v1.2.3 From ef5ac02b698ffab3a42d21f20859b70df85543c0 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 17:50:21 -0700 Subject: allow prevent default for show and hide event in modal --- docs/assets/bootstrap.zip | Bin 56147 -> 56207 bytes docs/assets/js/bootstrap-modal.js | 19 ++++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 954f4d3e1..8ad9a0695 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index e92970627..3e0fb1481 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -41,13 +41,15 @@ , show: function () { var that = this + , e = $.Event('show') - if (this.isShown) return + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return $('body').addClass('modal-open') this.isShown = true - this.$element.trigger('show') escape.call(this) backdrop.call(this, function () { @@ -74,18 +76,21 @@ , hide: function ( e ) { e && e.preventDefault() - if (!this.isShown) return - var that = this + + e = $.Event('hide') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + this.isShown = false $('body').removeClass('modal-open') escape.call(this) - this.$element - .trigger('hide') - .removeClass('in') + this.$element.removeClass('in') $.support.transition && this.$element.hasClass('fade') ? hideWithTransition.call(this) : -- cgit v1.2.3 From bccc2cb7191eb54a4d67563625a748d7ecd381d4 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:20:09 -0700 Subject: add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last --- docs/assets/bootstrap.zip | Bin 56207 -> 56306 bytes docs/assets/js/bootstrap-alert.js | 9 +++++---- docs/assets/js/bootstrap-carousel.js | 7 +++++-- docs/assets/js/bootstrap-collapse.js | 12 +++++++----- docs/assets/js/bootstrap-scrollspy.js | 4 ++-- docs/assets/js/bootstrap-tab.js | 10 +++++++--- 6 files changed, 26 insertions(+), 16 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8ad9a0695..594fb24db 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index d17f44e15..7a1607da1 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -45,15 +45,16 @@ } $parent = $(selector) - $parent.trigger('close') e && e.preventDefault() $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - $parent - .trigger('close') - .removeClass('in') + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') function removeElement() { $parent diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 7db5bea33..8ce7418d2 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -86,6 +86,7 @@ , direction = type == 'next' ? 'left' : 'right' , fallback = type == 'next' ? 'first' : 'last' , that = this + , e = $.Event('slide') this.sliding = true @@ -96,11 +97,12 @@ if ($next.hasClass('active')) return if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $next.addClass(type) $next[0].offsetWidth // force reflow $active.addClass(direction) $next.addClass(direction) - this.$element.trigger('slide') this.$element.one($.support.transition.end, function () { $next.removeClass([type, direction].join(' ')).addClass('active') $active.removeClass(['active', direction].join(' ')) @@ -108,7 +110,8 @@ setTimeout(function () { that.$element.trigger('slid') }, 0) }) } else { - this.$element.trigger('slide') + this.$element.trigger(e) + if (e.isDefaultPrevented()) return $active.removeClass('active') $next.addClass('active') this.sliding = false diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 16b91eb24..478eea391 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -61,7 +61,7 @@ } this.$element[dimension](0) - this.transition('addClass', 'show', 'shown') + this.transition('addClass', $.Event('show'), 'shown') this.$element[dimension](this.$element[0][scroll]) } @@ -70,7 +70,7 @@ if (this.transitioning) return dimension = this.dimension() this.reset(this.$element[dimension]()) - this.transition('removeClass', 'hide', 'hidden') + this.transition('removeClass', $.Event('hide'), 'hidden') this.$element[dimension](0) } @@ -95,11 +95,13 @@ that.$element.trigger(completeEvent) } + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + this.transitioning = 1 - this.$element - .trigger(startEvent) - [method]('in') + this.$element[method]('in') $.support.transition && this.$element.hasClass('collapse') ? this.$element.one($.support.transition.end, complete) : diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index bd3f10604..c02e263b0 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -46,8 +46,8 @@ var self = this , $targets - this.offsets = [] - this.targets = [] + this.offsets = $([]) + this.targets = $([]) $targets = this.$body .find(this.selector) diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index b3938f671..974cc0aca 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -39,6 +39,7 @@ , selector = $this.attr('data-target') , previous , $target + , e if (!selector) { selector = $this.attr('href') @@ -49,11 +50,14 @@ previous = $ul.find('.active a').last()[0] - $this.trigger({ - type: 'show' - , relatedTarget: previous + e = $.Event('show', { + relatedTarget: previous }) + $this.trigger(e) + + if (e.isDefaultPrevented()) return + $target = $(selector) this.activate($this.parent('li'), $ul) -- cgit v1.2.3 From 6dc59a9c3e0facab3abed7cb66d90c2316530014 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:45:12 -0700 Subject: add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip --- docs/assets/bootstrap.zip | Bin 56306 -> 56306 bytes docs/javascript.html | 4 ++-- docs/templates/pages/javascript.mustache | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 594fb24db..9301d50c4 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 8728eb66d..631b7e2ec 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -797,7 +797,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { number | object 0 -

    delay showing and hiding the tooltip (ms)

    +

    delay showing and hiding the tooltip (ms) - does not apply to manual trigger type

    If a number is supplied, delay is applied to both hide/show

    Object structure is: delay: { show: 500, hide: 100 }

    @@ -906,7 +906,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { number | object 0 -

    delay showing and hiding the popover (ms)

    +

    delay showing and hiding the popover (ms) - does not apply to manual trigger type

    If a number is supplied, delay is applied to both hide/show

    Object structure is: delay: { show: 500, hide: 100 }

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 1c5b96d2e..e037dd024 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -721,7 +721,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

    {{_i}}delay showing and hiding the tooltip (ms){{/i}}

    +

    {{_i}}delay showing and hiding the tooltip (ms) - does not apply to manual trigger type{{/i}}

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    @@ -830,7 +830,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { {{_i}}number | object{{/i}} 0 -

    {{_i}}delay showing and hiding the popover (ms){{/i}}

    +

    {{_i}}delay showing and hiding the popover (ms) - does not apply to manual trigger type{{/i}}

    {{_i}}If a number is supplied, delay is applied to both hide/show{{/i}}

    {{_i}}Object structure is: delay: { show: 500, hide: 100 }{{/i}}

    -- cgit v1.2.3 From f02d017ffa2f63609db034410979f62fde328816 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 18:59:04 -0700 Subject: return matcher value directly + cleanup first lines of files --- docs/assets/bootstrap.zip | Bin 56306 -> 56278 bytes docs/assets/js/bootstrap-alert.js | 2 +- docs/assets/js/bootstrap-button.js | 3 ++- docs/assets/js/bootstrap-carousel.js | 2 +- docs/assets/js/bootstrap-collapse.js | 3 ++- docs/assets/js/bootstrap-dropdown.js | 2 +- docs/assets/js/bootstrap-modal.js | 2 +- docs/assets/js/bootstrap-popover.js | 2 +- docs/assets/js/bootstrap-scrollspy.js | 1 + docs/assets/js/bootstrap-tab.js | 2 +- docs/assets/js/bootstrap-tooltip.js | 3 ++- docs/assets/js/bootstrap-transition.js | 3 ++- docs/assets/js/bootstrap-typeahead.js | 3 ++- 13 files changed, 17 insertions(+), 11 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9301d50c4..e55e7eee2 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 7a1607da1..c7171855d 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -18,7 +18,7 @@ * ========================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index 6b36753d8..77af03760 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -17,7 +17,8 @@ * limitations under the License. * ============================================================ */ -!function( $ ){ + +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 8ce7418d2..0c8c5a202 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -18,7 +18,7 @@ * ========================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 478eea391..9f462e6bc 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -17,7 +17,8 @@ * limitations under the License. * ============================================================ */ -!function( $ ){ + +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index f26b83f41..661b22713 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -18,7 +18,7 @@ * ============================================================ */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index 3e0fb1481..f16b56500 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -18,7 +18,7 @@ * ========================================================= */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index 6f389785c..ee47e43a2 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -18,7 +18,7 @@ * =========================================================== */ -!function( $ ) { +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index c02e263b0..518ccafb2 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -17,6 +17,7 @@ * limitations under the License. * ============================================================== */ + !function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index 974cc0aca..d46ef790a 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -18,7 +18,7 @@ * ======================================================== */ -!function( $ ){ +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 7d58a6c8d..4704d1e02 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -18,7 +18,8 @@ * limitations under the License. * ========================================================== */ -!function( $ ) { + +!function ( $ ) { "use strict" diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index f5226f96d..f73de1c58 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -17,7 +17,8 @@ * limitations under the License. * ========================================================== */ -!function( $ ) { + +!function ( $ ) { $(function () { diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index f4d26186c..f366bea63 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -17,6 +17,7 @@ * limitations under the License. * ============================================================ */ + !function( $ ){ "use strict" @@ -78,7 +79,7 @@ } items = $.grep(this.source, function (item) { - if (that.matcher(item)) return item + return that.matcher(item) }) items = this.sorter(items) -- cgit v1.2.3 From 3e7920820a4c8b93282628ade9281ff0d4484a45 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 24 Mar 2012 20:01:51 -0700 Subject: add missing closing brace --- docs/assets/bootstrap.zip | Bin 56278 -> 56297 bytes docs/assets/js/bootstrap-transition.js | 2 ++ 2 files changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e55e7eee2..4c2c62034 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index f73de1c58..8c82cc311 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -39,6 +39,8 @@ transitionEnd = "webkitTransitionEnd" } else if ( $.browser.mozilla ) { transitionEnd = "transitionend" + } else if ( $.browser.msie ) { + transitionEnd = "MSTransitionEnd" } else if ( $.browser.opera ) { transitionEnd = "oTransitionEnd" } -- cgit v1.2.3 From 1837b8ef2c1a28f966965985c33d38a8f6a72438 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 00:20:30 -0700 Subject: remove height: auto on images since it interferes with inline dimensions --- docs/assets/bootstrap.zip | Bin 56297 -> 56321 bytes docs/assets/css/bootstrap.css | 9 ++++++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4c2c62034..7dfee52de 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 794156e27..c0a7520d8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -58,7 +58,6 @@ sub { } img { max-width: 100%; - height: auto; border: 0; -ms-interpolation-mode: bicubic; vertical-align: middle; @@ -3674,6 +3673,14 @@ a.badge:hover { background-position: 0 0; } } +@-o-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} @keyframes progress-bar-stripes { from { background-position: 40px 0; -- cgit v1.2.3 From d1864b3608d215ee22daf96268f878b1818c6de1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 00:46:03 -0700 Subject: adding 144x144 ipad touch icon --- docs/assets/bootstrap.zip | Bin 56321 -> 56321 bytes .../assets/ico/apple-touch-icon-144-precomposed.png | Bin 0 -> 8457 bytes docs/assets/ico/apple-touch-icon-72-precomposed.png | Bin 3163 -> 3204 bytes docs/base-css.html | 1 + docs/components.html | 1 + docs/css-tests.html | 1 + docs/download.html | 1 + docs/examples.html | 1 + docs/examples/fluid.html | 1 + docs/examples/hero.html | 1 + docs/examples/starter-template.html | 1 + docs/index.html | 1 + docs/javascript.html | 1 + docs/less.html | 1 + docs/scaffolding.html | 1 + docs/templates/layout.mustache | 1 + docs/upgrading.html | 1 + 17 files changed, 14 insertions(+) create mode 100644 docs/assets/ico/apple-touch-icon-144-precomposed.png (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7dfee52de..eed5be2e0 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/ico/apple-touch-icon-144-precomposed.png b/docs/assets/ico/apple-touch-icon-144-precomposed.png new file mode 100644 index 000000000..3c80087b1 Binary files /dev/null and b/docs/assets/ico/apple-touch-icon-144-precomposed.png differ diff --git a/docs/assets/ico/apple-touch-icon-72-precomposed.png b/docs/assets/ico/apple-touch-icon-72-precomposed.png index 7ec5ff238..f77bd6c99 100644 Binary files a/docs/assets/ico/apple-touch-icon-72-precomposed.png and b/docs/assets/ico/apple-touch-icon-72-precomposed.png differ diff --git a/docs/base-css.html b/docs/base-css.html index 76b13b783..6ccc216d1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -20,6 +20,7 @@ + diff --git a/docs/components.html b/docs/components.html index 1fc8368de..71134045a 100644 --- a/docs/components.html +++ b/docs/components.html @@ -20,6 +20,7 @@ + diff --git a/docs/css-tests.html b/docs/css-tests.html index 99ea08338..0db105796 100644 --- a/docs/css-tests.html +++ b/docs/css-tests.html @@ -20,6 +20,7 @@ + diff --git a/docs/download.html b/docs/download.html index a35354947..44299b927 100644 --- a/docs/download.html +++ b/docs/download.html @@ -20,6 +20,7 @@ + diff --git a/docs/examples.html b/docs/examples.html index 947f635b1..dffb46fd9 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -20,6 +20,7 @@ + diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index e3426c7a9..e51062082 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -27,6 +27,7 @@ + diff --git a/docs/examples/hero.html b/docs/examples/hero.html index 2267a5f3c..7fb3f67b7 100644 --- a/docs/examples/hero.html +++ b/docs/examples/hero.html @@ -24,6 +24,7 @@ + diff --git a/docs/examples/starter-template.html b/docs/examples/starter-template.html index af27165f9..538ff08be 100644 --- a/docs/examples/starter-template.html +++ b/docs/examples/starter-template.html @@ -23,6 +23,7 @@ + diff --git a/docs/index.html b/docs/index.html index 1f009bcb5..f7bbfc2b5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,6 +20,7 @@ + diff --git a/docs/javascript.html b/docs/javascript.html index 631b7e2ec..4904eba16 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -20,6 +20,7 @@ + diff --git a/docs/less.html b/docs/less.html index 08987d128..8b02f1961 100644 --- a/docs/less.html +++ b/docs/less.html @@ -20,6 +20,7 @@ + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index b49ec4031..dd2641237 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -20,6 +20,7 @@ + diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 3434bdcbf..d3c06e096 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -20,6 +20,7 @@ + diff --git a/docs/upgrading.html b/docs/upgrading.html index 01dd02aee..05930c25e 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -20,6 +20,7 @@ + -- cgit v1.2.3 From a7b8e52f8e08cc821d7324153885c085fad25c1a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 01:12:51 -0700 Subject: Overhaul the responsive utility classes: 1. Rename file from responsive-utility-classes.less to responsive-utilities.less 2. Add additional help text around the documentation for the classes in Scaffolding 3. Remove unnecessary display values on initial classes 4. Drop block values for inherit for better support on inline and table elements 5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid) --- docs/assets/bootstrap.zip | Bin 56321 -> 56340 bytes docs/assets/css/bootstrap-responsive.css | 31 +++++++++++------------------- docs/download.html | 2 +- docs/scaffolding.html | 2 ++ docs/templates/pages/download.mustache | 2 +- docs/templates/pages/scaffolding.mustache | 14 ++++++++------ 6 files changed, 23 insertions(+), 28 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index eed5be2e0..604ba03d3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 78ce60d7f..1ad16d6fd 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -43,49 +43,40 @@ visibility: hidden; } .visible-phone { - display: none; + display: none !important; } .visible-tablet { - display: none; -} -.visible-desktop { - display: block; -} -.hidden-phone { - display: block; -} -.hidden-tablet { - display: block; + display: none !important; } .hidden-desktop { - display: none; + display: none !important; } @media (max-width: 767px) { .visible-phone { - display: block; + display: inherit !important; } .hidden-phone { - display: none; + display: none !important; } .hidden-desktop { - display: block; + display: inherit !important; } .visible-desktop { - display: none; + display: none !important; } } @media (min-width: 768px) and (max-width: 979px) { .visible-tablet { - display: block; + display: inherit !important; } .hidden-tablet { - display: none; + display: none !important; } .hidden-desktop { - display: block; + display: inherit !important; } .visible-desktop { - display: none; + display: none !important ; } } @media (max-width: 480px) { diff --git a/docs/download.html b/docs/download.html index 44299b927..e4097ea4e 100644 --- a/docs/download.html +++ b/docs/download.html @@ -143,7 +143,7 @@

    Responsive

    - + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index dd2641237..017fd493e 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -609,12 +609,14 @@

    Test case

    Resize your browser or load on different devices to test the above classes.

    Visible on...

    +

    Green checkmarks indicate that class is visible in your current viewport.

    • Phone✔ Phone
    • Tablet✔ Tablet
    • Desktop✔ Desktop

    Hidden on...

    +

    Here, green checkmarks indicate that class is hidden in your current viewport.

    • Phone✔ Phone
    • Tablet✔ Tablet
    • diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 051291148..0e73c44a4 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -66,7 +66,7 @@

      {{_i}}Responsive{{/i}}

      - + diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index b64c63af3..6d99965b3 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -532,16 +532,18 @@

      {{_i}}Test case{{/i}}

      {{_i}}Resize your browser or load on different devices to test the above classes.{{/i}}

      {{_i}}Visible on...{{/i}}

      +

      {{_i}}Green checkmarks indicate that class is visible in your current viewport.{{/i}}

        -
      • Phone✔ Phone
      • -
      • Tablet✔ Tablet
      • -
      • Desktop✔ Desktop
      • +
      • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
      • +
      • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
      • +
      • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}

      {{_i}}Hidden on...{{/i}}

      +

      {{_i}}Here, green checkmarks indicate that class is hidden in your current viewport.{{/i}}

        -
      • Phone✔ Phone
      • -
      • Tablet✔ Tablet
      • -
      • Desktop✔ Desktop
      • +
      • {{_i}}Phone{{/i}}✔ {{_i}}Phone{{/i}}
      • +
      • {{_i}}Tablet{{/i}}✔ {{_i}}Tablet{{/i}}
      • +
      • {{_i}}Desktop{{/i}}✔ {{_i}}Desktop{{/i}}
      -- cgit v1.2.3 From 6c5c29ada2430c884888c9138ba09b0030584d17 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 01:21:47 -0700 Subject: introduce .navbar-link to resolve issue with buttons in .navbar-text --- docs/assets/bootstrap.zip | Bin 56340 -> 56369 bytes docs/assets/css/bootstrap.css | 6 ++++++ docs/examples/fluid.html | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 604ba03d3..69849219e 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0a7520d8..b4d9d80c6 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2896,6 +2896,12 @@ input[type="submit"].btn.btn-mini { margin-bottom: 0; line-height: 40px; } +.navbar .navbar-link { + color: #999999; +} +.navbar .navbar-link:hover { + color: #ffffff; +} .navbar .btn, .navbar .btn-group { margin-top: 5px; diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index e51062082..651b6f2f9 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -50,7 +50,7 @@
    • About
    • Contact
    - + -- cgit v1.2.3 From b81a082cd13759bd5f0ff2a90513a56d59ace313 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 12:32:29 -0700 Subject: add navbarheight support to .brand and .nav links in navbar --- docs/assets/bootstrap.zip | Bin 56369 -> 56381 bytes docs/assets/css/bootstrap.css | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 69849219e..582dc5348 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b4d9d80c6..1c80a05d7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2804,6 +2804,7 @@ input[type="submit"].btn.btn-mini { margin-bottom: 18px; } .navbar-inner { + height: 40px; padding-left: 20px; padding-right: 20px; background-color: #2c2c2c; @@ -3030,7 +3031,7 @@ input[type="submit"].btn.btn-mini { } .navbar .nav > li > a { float: none; - padding: 10px 10px 11px; + padding: 9px 10px 11px; line-height: 19px; color: #999999; text-decoration: none; -- cgit v1.2.3 From a5552a1d700a1caa2d87ea4bbccc59205b6e72f9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 25 Mar 2012 12:42:47 -0700 Subject: revert bart's mixin fix --- docs/assets/bootstrap.zip | Bin 56381 -> 56381 bytes docs/assets/css/bootstrap.css | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 582dc5348..fbf2c7506 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1c80a05d7..c1d995e30 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -750,9 +750,9 @@ textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075) 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); outline: 0; outline: thin dotted \9; /* IE6-9 */ @@ -1995,9 +1995,9 @@ table .span24 { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); cursor: pointer; *margin-left: .3em; } @@ -2034,9 +2034,9 @@ table .span24 { .btn.active, .btn:active { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; outline: 0; @@ -2361,9 +2361,9 @@ input[type="submit"].btn.btn-mini { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125) inset 0 1px 0 rgba(255, 255, 255, 0.2) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); *padding-top: 3px; *padding-bottom: 3px; } @@ -2383,9 +2383,9 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15) 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); } .btn-group.open .btn.dropdown-toggle { background-color: #e6e6e6; -- cgit v1.2.3 From a62810918f8a27b5755258521422eb912a1edfd8 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 25 Mar 2012 13:33:36 -0700 Subject: fix responsive navbar --- docs/assets/bootstrap.zip | Bin 56381 -> 56390 bytes docs/assets/css/bootstrap-responsive.css | 3 ++- docs/assets/css/bootstrap.css | 2 +- docs/base-css.html | 2 +- docs/components.html | 2 +- docs/css-tests.html | 2 +- docs/download.html | 2 +- docs/examples.html | 2 +- docs/index.html | 2 +- docs/javascript.html | 2 +- docs/less.html | 2 +- docs/scaffolding.html | 2 +- docs/templates/layout.mustache | 2 +- docs/upgrading.html | 2 +- 14 files changed, 14 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index fbf2c7506..9de6e49c6 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 1ad16d6fd..c374fb8e5 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -667,7 +667,8 @@ .btn-navbar { display: block; } - .nav-collapse { + .nav-collapse, + .nav-collapse.collapse { overflow: hidden; height: 0; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c1d995e30..50fb64dfc 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2804,7 +2804,7 @@ input[type="submit"].btn.btn-mini { margin-bottom: 18px; } .navbar-inner { - height: 40px; + min-height: 40px; padding-left: 20px; padding-right: 20px; background-color: #2c2c2c; diff --git a/docs/base-css.html b/docs/base-css.html index 6ccc216d1..1cb10a806 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -40,7 +40,7 @@ Bootstrap -
    - - -
    -
    -

    {{_i}}Search form{{/i}}

    -

    {{_i}}Reflecting default WebKit styles, just add .form-search for extra rounded search fields.{{/i}}

    -
    -
    - - - - +
    +
    +

    {{_i}}Search form{{/i}}

    +

    {{_i}}Add .form-search to the form and .search-query to the input.{{/i}}

    +
     <form class="well form-search">
       <input type="text" class="input-medium search-query">
       <button type="submit" class="btn">{{_i}}Search{{/i}}</button>
     </form>
     
    -
    -
    -
    -
    +

    {{_i}}Inline form{{/i}}

    -

    {{_i}}Inputs are block level to start. For .form-inline and .form-horizontal, we use inline-block.{{/i}}

    -
    -
    +

    {{_i}}Add .form-inline to finesse the vertical alignment and spacing of form controls.{{/i}}

    @@ -867,7 +856,7 @@ <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button> </form>
    - +
    -- cgit v1.2.3 From 3308d1968f37eb81ef1578a409742e93813a8492 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 18:18:41 -0700 Subject: fix #2846: Firefox required two clicks on selects to get to options dropdown --- docs/assets/bootstrap.zip | Bin 56915 -> 56916 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2c5b3d8b2..7eeb7ca84 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7ed443efb..9684cc912 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -991,6 +991,7 @@ select:focus:required:invalid:focus { .input-append select, .input-prepend .uneditable-input, .input-append .uneditable-input { + position: relative; margin-bottom: 0; *margin-left: 0; vertical-align: middle; @@ -1004,7 +1005,6 @@ select:focus:required:invalid:focus { .input-append select:focus, .input-prepend .uneditable-input:focus, .input-append .uneditable-input:focus { - position: relative; z-index: 2; } .input-prepend .uneditable-input, -- cgit v1.2.3 From 04baa07547692f75dd708afaf50700075df1a60a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 18:25:27 -0700 Subject: document .backface-visibility and update comments and initial value --- docs/assets/bootstrap.zip | Bin 56916 -> 56916 bytes docs/less.html | 5 +++++ docs/templates/pages/less.mustache | 5 +++++ 3 files changed, 10 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7eeb7ca84..164d0c267 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index a641c9ee3..a9ae68f9e 100644 --- a/docs/less.html +++ b/docs/less.html @@ -870,6 +870,11 @@ @select Control cursor selection of text on a page + + .backface-visibility() + @visibility: visible + Prevent flickering of content when using CSS 3D transforms + .resizable() @direction: both diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 0b58cfc9e..280c39318 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -793,6 +793,11 @@ @select {{_i}}Control cursor selection of text on a page{{/i}} + + .backface-visibility() + @visibility: visible + {{_i}}Prevent flickering of content when using CSS 3D transforms{{/i}} + .resizable() @direction: both -- cgit v1.2.3 From a9f9949b3e4a0b3cd84f3088c050296e18a0f8df Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 28 Mar 2012 19:41:23 -0700 Subject: rearrange other parts of forms docs --- docs/assets/bootstrap.zip | Bin 56916 -> 56916 bytes docs/base-css.html | 87 ++++++++++++++++----------------- docs/templates/pages/base-css.mustache | 87 ++++++++++++++++----------------- 3 files changed, 82 insertions(+), 92 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 164d0c267..875d7d9f4 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index b9dbd372f..0a1ea0d9d 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -940,10 +940,22 @@ For example, <code>section</code> should be wrapped as inline.

    Horizontal forms

    +
    +

    +

    Shown on the right are all the default form controls we support. Here's the bulleted list:

    +
      +
    • text inputs (text, password, email, etc)
    • +
    • checkbox
    • +
    • radio
    • +
    • select
    • +
    • multiple select
    • +
    • file input
    • +
    • textarea
    • +
    +
    - Controls Bootstrap supports
    @@ -1019,31 +1031,27 @@ For example, <code>section</code> should be wrapped as inline. </form>
    -
    -

    What's included

    -

    Shown on the left are all the default form controls we support. Here's the bulleted list:

    -
      -
    • text inputs (text, password, email, etc)
    • -
    • checkbox
    • -
    • radio
    • -
    • select
    • -
    • multiple select
    • -
    • file input
    • -
    • textarea
    • -
    -
    -

    New defaults with v2.0

    -

    Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.

    -

    +

    Form control states

    +
    +

    Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

    +
    +

    Form validation

    +

    It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.

    +
    +<fieldset
    +  class="control-group error">
    +  …
    +</fieldset>
    +
    +
    - Form control states
    @@ -1112,28 +1120,29 @@ For example, <code>section</code> should be wrapped as inline.
    -
    -

    Redesigned browser states

    -

    Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.

    -
    -

    Form validation

    -

    It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.

    -
    -<fieldset
    -  class="control-group error">
    -  …
    -</fieldset>
    -
    -

    +

    Extending form controls

    +
    +

    Prepend & append inputs

    +

    Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

    +
    +

    Checkboxes and radios

    +

    Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

    +

    Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

    +
    +

    Inline forms and append/prepend

    +

    To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.

    +
    +

    Form help text

    +

    To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.

    +
    - Extending form controls
    @@ -1259,20 +1268,6 @@ For example, <code>section</code> should be wrapped as inline.
    -
    -

    Prepend & append inputs

    -

    Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.

    -
    -

    Checkboxes and radios

    -

    Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.

    -

    Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.

    -
    -

    Inline forms and append/prepend

    -

    To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.

    -
    -

    Form help text

    -

    To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.

    -
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9644ea770..0b6e17e69 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -863,10 +863,22 @@

    {{_i}}Horizontal forms{{/i}}

    +
    +

    {{_i}}{{/i}}

    +

    {{_i}}Shown on the right are all the default form controls we support. Here's the bulleted list:{{/i}}

    +
      +
    • {{_i}}text inputs (text, password, email, etc){{/i}}
    • +
    • {{_i}}checkbox{{/i}}
    • +
    • {{_i}}radio{{/i}}
    • +
    • {{_i}}select{{/i}}
    • +
    • {{_i}}multiple select{{/i}}
    • +
    • {{_i}}file input{{/i}}
    • +
    • {{_i}}textarea{{/i}}
    • +
    +
    - {{_i}}Controls Bootstrap supports{{/i}}
    @@ -942,31 +954,27 @@ </form>
    -
    -

    {{_i}}What's included{{/i}}

    -

    {{_i}}Shown on the left are all the default form controls we support. Here's the bulleted list:{{/i}}

    -
      -
    • {{_i}}text inputs (text, password, email, etc){{/i}}
    • -
    • {{_i}}checkbox{{/i}}
    • -
    • {{_i}}radio{{/i}}
    • -
    • {{_i}}select{{/i}}
    • -
    • {{_i}}multiple select{{/i}}
    • -
    • {{_i}}file input{{/i}}
    • -
    • {{_i}}textarea{{/i}}
    • -
    -
    -

    {{_i}}New defaults with v2.0{{/i}}

    -

    {{_i}}Up to v1.4, Bootstrap's default form styles used the horizontal layout. With Bootstrap 2, we removed that constraint to have smarter, more scalable defaults for any form.{{/i}}

    -

    +

    {{_i}}Form control states{{/i}}

    +
    +

    {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

    +
    +

    {{_i}}Form validation{{/i}}

    +

    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

    +
    +<fieldset
    +  class="control-group error">
    +  …
    +</fieldset>
    +
    +
    - {{_i}}Form control states{{/i}}
    @@ -1035,28 +1043,29 @@
    -
    -

    {{_i}}Redesigned browser states{{/i}}

    -

    {{_i}}Bootstrap features styles for browser-supported focused and disabled states. We remove the default Webkit outline and apply a box-shadow in its place for :focus.{{/i}}

    -
    -

    {{_i}}Form validation{{/i}}

    -

    {{_i}}It also includes validation styles for errors, warnings, and success. To use, add the error class to the surrounding .control-group.{{/i}}

    -
    -<fieldset
    -  class="control-group error">
    -  …
    -</fieldset>
    -
    -

    +

    {{_i}}Extending form controls{{/i}}

    +
    +

    {{_i}}Prepend & append inputs{{/i}}

    +

    {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

    +
    +

    {{_i}}Checkboxes and radios{{/i}}

    +

    {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

    +

    {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

    +
    +

    {{_i}}Inline forms and append/prepend{{/i}}

    +

    {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

    +
    +

    {{_i}}Form help text{{/i}}

    +

    {{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

    +
    - {{_i}}Extending form controls{{/i}}
    @@ -1182,20 +1191,6 @@
    -
    -

    {{_i}}Prepend & append inputs{{/i}}

    -

    {{_i}}Input groups—with appended or prepended text—provide an easy way to give more context for your inputs. Great examples include the @ sign for Twitter usernames or $ for finances.{{/i}}

    -
    -

    {{_i}}Checkboxes and radios{{/i}}

    -

    {{_i}}Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <label class="checkbox"> that wraps the <input type="checkbox">.{{/i}}

    -

    {{_i}}Inline checkboxes and radios are also supported. Just add .inline to any .checkbox or .radio and you're done.{{/i}}

    -
    -

    {{_i}}Inline forms and append/prepend{{/i}}

    -

    {{_i}}To use prepend or append inputs in an inline form, be sure to place the .add-on and input on the same line, without spaces.{{/i}}

    -
    -

    {{_i}}Form help text{{/i}}

    -

    {{_i}}To add help text for your form inputs, include inline help text with <span class="help-inline"> or a help text block with <p class="help-block"> after the input element.{{/i}}

    -
    -- cgit v1.2.3 From 8ea8c312ea631ec7f8c80ae8751da18e93094a4e Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 12:35:06 -0700 Subject: replace UA sniffing --- docs/assets/bootstrap.zip | Bin 56916 -> 57000 bytes docs/assets/js/bootstrap-transition.js | 29 ++++++++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 875d7d9f4..c4734bcd9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 8c82cc311..7b0113484 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -24,28 +24,35 @@ "use strict" - /* CSS TRANSITION SUPPORT (https://gist.github.com/373874) + /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) * ======================================================= */ $.support.transition = (function () { + var thisBody = document.body || document.documentElement , thisStyle = thisBody.style , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined return support && { end: (function () { - var transitionEnd = "TransitionEnd" - if ( $.browser.webkit ) { - transitionEnd = "webkitTransitionEnd" - } else if ( $.browser.mozilla ) { - transitionEnd = "transitionend" - } else if ( $.browser.msie ) { - transitionEnd = "MSTransitionEnd" - } else if ( $.browser.opera ) { - transitionEnd = "oTransitionEnd" + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' + } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } } - return transitionEnd + }()) + } })() -- cgit v1.2.3 From 30b3f47e31487b9f7db6a42ed633597c3f5e764c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 12:48:37 -0700 Subject: remove "technique" --- docs/assets/bootstrap.zip | Bin 57000 -> 56988 bytes docs/assets/js/bootstrap-transition.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c4734bcd9..50e92b3e3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 7b0113484..028b03c84 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -24,7 +24,7 @@ "use strict" - /* CSS TRANSITION SUPPORT (technique from http://www.modernizr.com/) + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) * ======================================================= */ $.support.transition = (function () { -- cgit v1.2.3 From 422d04cb2b59ced380c2fa6dcb637dab70a916a3 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 13:51:23 -0700 Subject: simplify transition plugin a little --- docs/assets/bootstrap.zip | Bin 56988 -> 56890 bytes docs/assets/js/bootstrap-transition.js | 39 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 20 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 50e92b3e3..9b0207321 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 028b03c84..b87d60071 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -29,31 +29,30 @@ $.support.transition = (function () { - var thisBody = document.body || document.documentElement - , thisStyle = thisBody.style - , support = thisStyle.transition !== undefined || thisStyle.WebkitTransition !== undefined || thisStyle.MozTransition !== undefined || thisStyle.MsTransition !== undefined || thisStyle.OTransition !== undefined - - return support && { - end: (function () { - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MsTransitionEnd' + , 'transition' : 'transitionend' } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] } + } - }()) + })() + return transitionEnd && { + end: transitionEnd } + })() }) -- cgit v1.2.3 From 0665c3ebf781e228b32c5714dd36f5279b4fb211 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 13:55:56 -0700 Subject: move over paren just because. --- docs/assets/bootstrap.zip | Bin 56890 -> 56893 bytes docs/assets/js/bootstrap-transition.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 9b0207321..6d85ff5f7 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index b87d60071..805f314be 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -47,7 +47,7 @@ } } - })() + }()) return transitionEnd && { end: transitionEnd -- cgit v1.2.3 From 2dc979a2029d909945011a8e6dac3543aa9f0198 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Thu, 29 Mar 2012 14:14:17 -0700 Subject: MSTransitionEnd + move paren (thanks rick waldron) --- docs/assets/bootstrap.zip | Bin 56893 -> 56893 bytes docs/assets/js/bootstrap-transition.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6d85ff5f7..ea0088fcf 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 805f314be..8ff3c9002 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -36,7 +36,7 @@ 'WebkitTransition' : 'webkitTransitionEnd' , 'MozTransition' : 'transitionend' , 'OTransition' : 'oTransitionEnd' - , 'msTransition' : 'MsTransitionEnd' + , 'msTransition' : 'MSTransitionEnd' , 'transition' : 'transitionend' } , name -- cgit v1.2.3 From 37745cd8997bdc1d0bb21c276a7aa671bb018eed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 00:53:38 -0700 Subject: fix fluid grid selectors to remove > in selectors --- docs/assets/bootstrap.zip | Bin 56893 -> 56907 bytes docs/assets/css/bootstrap-responsive.css | 70 ++++++++++++++++++++----------- docs/assets/css/bootstrap.css | 35 ++++++++++------ 3 files changed, 69 insertions(+), 36 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ea0088fcf..8711ab2e7 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 560bd7566..1cd0f2185 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -286,46 +286,57 @@ clear: both; } .row-fluid [class*="span"] { + display: block; + width: 100%; + min-height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; float: left; margin-left: 2.762430939%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span12 { + .row-fluid .span12 { width: 99.999999993%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.436464082%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.87292817100001%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.30939226%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.74585634900001%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.182320438000005%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.618784527%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.055248616%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.491712705%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 22.928176794%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.364640883%; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.801104972%; } input, @@ -477,46 +488,57 @@ clear: both; } .row-fluid [class*="span"] { + display: block; + width: 100%; + min-height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; float: left; margin-left: 2.564102564%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } - .row-fluid > .span12 { + .row-fluid .span12 { width: 100%; } - .row-fluid > .span11 { + .row-fluid .span11 { width: 91.45299145300001%; } - .row-fluid > .span10 { + .row-fluid .span10 { width: 82.905982906%; } - .row-fluid > .span9 { + .row-fluid .span9 { width: 74.358974359%; } - .row-fluid > .span8 { + .row-fluid .span8 { width: 65.81196581200001%; } - .row-fluid > .span7 { + .row-fluid .span7 { width: 57.264957265%; } - .row-fluid > .span6 { + .row-fluid .span6 { width: 48.717948718%; } - .row-fluid > .span5 { + .row-fluid .span5 { width: 40.170940171000005%; } - .row-fluid > .span4 { + .row-fluid .span4 { width: 31.623931624%; } - .row-fluid > .span3 { + .row-fluid .span3 { width: 23.076923077%; } - .row-fluid > .span2 { + .row-fluid .span2 { width: 14.529914530000001%; } - .row-fluid > .span1 { + .row-fluid .span1 { width: 5.982905983%; } input, diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9684cc912..e39f431eb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -254,46 +254,57 @@ a:hover { clear: both; } .row-fluid [class*="span"] { + display: block; + width: 100%; + min-height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + box-sizing: border-box; float: left; margin-left: 2.127659574%; } .row-fluid [class*="span"]:first-child { margin-left: 0; } -.row-fluid > .span12 { +.row-fluid .span12 { width: 99.99999998999999%; } -.row-fluid > .span11 { +.row-fluid .span11 { width: 91.489361693%; } -.row-fluid > .span10 { +.row-fluid .span10 { width: 82.97872339599999%; } -.row-fluid > .span9 { +.row-fluid .span9 { width: 74.468085099%; } -.row-fluid > .span8 { +.row-fluid .span8 { width: 65.95744680199999%; } -.row-fluid > .span7 { +.row-fluid .span7 { width: 57.446808505%; } -.row-fluid > .span6 { +.row-fluid .span6 { width: 48.93617020799999%; } -.row-fluid > .span5 { +.row-fluid .span5 { width: 40.425531911%; } -.row-fluid > .span4 { +.row-fluid .span4 { width: 31.914893614%; } -.row-fluid > .span3 { +.row-fluid .span3 { width: 23.404255317%; } -.row-fluid > .span2 { +.row-fluid .span2 { width: 14.89361702%; } -.row-fluid > .span1 { +.row-fluid .span1 { width: 6.382978723%; } .container { -- cgit v1.2.3 From 56ecc6ba96550d8e66d0484c21fc20da5f8e52e6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 12:31:56 -0700 Subject: clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html --- docs/assets/bootstrap.zip | Bin 56907 -> 56907 bytes docs/javascript.html | 14 ++++++++++++++ docs/templates/pages/javascript.mustache | 14 ++++++++++++++ 3 files changed, 28 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8711ab2e7..7f95f01c6 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 4f777e031..2a0f3d861 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -493,6 +493,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul>
    +

    To keep URLs intact, use the data-target attribute instead of href="#".

    +
    +<ul class="nav nav-pills">
    +  <li class="dropdown">
    +    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
    +      Dropdown
    +      <b class="caret"></b>
    +    </a>
    +    <ul class="dropdown-menu">
    +      ...
    +    </ul>
    +  </li>
    +</ul>
    +

    Methods

    $().dropdown()

    A programatic api for activating menus for a given navbar or tabbed navigation.

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index d61a364f0..bb25f0957 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -416,6 +416,20 @@ $('#myModal').on('hidden', function () { </li> ... </ul>
    +

    {{_i}}To keep URLs intact, use the data-target attribute instead of href="#".{{/i}}

    +
    +<ul class="nav nav-pills">
    +  <li class="dropdown">
    +    <a class="dropdown-toggle" data-toggle="dropdown" data-target="#" href="path/to/page.html">
    +      {{_i}}Dropdown{{/i}}
    +      <b class="caret"></b>
    +    </a>
    +    <ul class="dropdown-menu">
    +      ...
    +    </ul>
    +  </li>
    +</ul>
    +

    {{_i}}Methods{{/i}}

    $().dropdown()

    {{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}

    -- cgit v1.2.3 From 2355fd224ddcd571765c5ad2f2242dac65789aa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:06:16 -0700 Subject: remove @shadow instances and replace with escaped values, update mixins to not use a default value at all --- docs/assets/bootstrap.zip | Bin 56907 -> 56943 bytes docs/assets/css/bootstrap-responsive.css | 6 ++-- docs/assets/css/bootstrap.css | 48 +++++++++++++++---------------- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7f95f01c6..e2f5087b3 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 1cd0f2185..f95e46e16 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -677,9 +677,9 @@ margin: 9px 0; border-top: 1px solid #222222; border-bottom: 1px solid #222222; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } .navbar .nav.pull-right { float: none; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e39f431eb..02949da9f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -761,9 +761,9 @@ textarea { input:focus, textarea:focus { border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); + -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); + box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6); outline: 0; outline: thin dotted \9; /* IE6-9 */ @@ -2028,9 +2028,9 @@ button.close { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); cursor: pointer; *margin-left: .3em; /* Remove the border to prevent IE7's black border on input:focus */ @@ -2075,9 +2075,9 @@ button.close { .btn.active, .btn:active { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); background-color: #e6e6e6; background-color: #d9d9d9 \9; outline: 0; @@ -2426,9 +2426,9 @@ input[type="submit"].btn.btn-mini { .btn-group .dropdown-toggle { padding-left: 8px; padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); *padding-top: 3px; *padding-bottom: 3px; } @@ -2448,9 +2448,9 @@ input[type="submit"].btn.btn-mini { } .btn-group.open .dropdown-toggle { background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); + -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); } .btn-group.open .btn.dropdown-toggle { background-color: #e6e6e6; @@ -2887,9 +2887,9 @@ input[type="submit"].btn.btn-mini { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); + -webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + -moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); + box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1); } .navbar .container { width: auto; @@ -2915,9 +2915,9 @@ input[type="submit"].btn.btn-mini { *background-color: #222222; /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); } .btn-navbar:hover, .btn-navbar:active, @@ -3034,9 +3034,9 @@ input[type="submit"].btn.btn-mini { color: #ffffff; background-color: #626262; border: 1px solid #151515; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); + -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); + -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); + box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15); -webkit-transition: none; -moz-transition: none; -ms-transition: none; -- cgit v1.2.3 From f37d9aeaef12c3019112fa915b7bd4d927652a15 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:31:01 -0700 Subject: fix #2856: make inputs using .span* classes responsive at <767px layout --- docs/assets/bootstrap.zip | Bin 56943 -> 56958 bytes docs/assets/css/bootstrap-responsive.css | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e2f5087b3..4b7227a7d 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index f95e46e16..a8457dc45 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -148,8 +148,8 @@ .row { margin-left: 0; } - .row > [class*="span"], - .row-fluid > [class*="span"] { + [class*="span"], + .row-fluid [class*="span"] { float: none; display: block; width: auto; @@ -174,8 +174,11 @@ -ms-box-sizing: border-box; box-sizing: border-box; } + .input-prepend input, + .input-append input, .input-prepend input[class*="span"], .input-append input[class*="span"] { + display: inline-block; width: auto; } } -- cgit v1.2.3 From 452ddc0f0dd5cfd3bb867e17d603c98d6db2ec19 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 21:36:45 -0700 Subject: update less docs page to reflect changes in mixins (no more default values) and variable name fix --- docs/assets/bootstrap.zip | Bin 56958 -> 56958 bytes docs/less.html | 14 +++++++------- docs/templates/pages/less.mustache | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4b7227a7d..7f6f5dd76 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index a9ae68f9e..d6a0fd64a 100644 --- a/docs/less.html +++ b/docs/less.html @@ -704,17 +704,17 @@ .size() - @height: 5px, @width: 5px + @height @width Quickly set the height and width on one line .square() - @size: 5px + @size Builds on .size() to set the width and height as same value .opacity() - @opacity: 100 + @opacity Set, in whole numbers, the opacity percentage (e.g., "50" or "75") @@ -822,12 +822,12 @@ .border-radius() - @radius: 5px + @radius Round the corners of an element. Can be a single value or four space-separated values .box-shadow() - @shadow: 0 1px 3px rgba(0,0,0,.25) + @shadow Add a drop shadow to an element @@ -847,7 +847,7 @@ .translate() - @x: 0, @y: 0 + @x, @y Move an element on the x and y planes @@ -882,7 +882,7 @@ .content-columns() - @columnCount, @columnGap: @gridColumnGutter + @columnCount, @columnGap: @gridGutterWidth Make the content of any element use CSS3 columns diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 280c39318..8b7f4495d 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -627,17 +627,17 @@ .size() - @height: 5px, @width: 5px + @height @width {{_i}}Quickly set the height and width on one line{{/i}} .square() - @size: 5px + @size {{_i}}Builds on .size() to set the width and height as same value{{/i}} .opacity() - @opacity: 100 + @opacity {{_i}}Set, in whole numbers, the opacity percentage (e.g., "50" or "75"){{/i}} @@ -745,12 +745,12 @@ .border-radius() - @radius: 5px + @radius {{_i}}Round the corners of an element. Can be a single value or four space-separated values{{/i}} .box-shadow() - @shadow: 0 1px 3px rgba(0,0,0,.25) + @shadow {{_i}}Add a drop shadow to an element{{/i}} @@ -770,7 +770,7 @@ .translate() - @x: 0, @y: 0 + @x, @y {{_i}}Move an element on the x and y planes{{/i}} @@ -805,7 +805,7 @@ .content-columns() - @columnCount, @columnGap: @gridColumnGutter + @columnCount, @columnGap: @gridGutterWidth {{_i}}Make the content of any element use CSS3 columns{{/i}} -- cgit v1.2.3 From d652af10971d79cde92336700e156c63ff2c0b24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 31 Mar 2012 23:53:54 -0700 Subject: fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts --- docs/assets/bootstrap.zip | Bin 56958 -> 57027 bytes docs/assets/css/bootstrap-responsive.css | 9 +++++++++ docs/assets/css/bootstrap.css | 3 +++ docs/base-css.html | 7 +++++++ docs/templates/pages/base-css.mustache | 7 +++++++ 5 files changed, 26 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 7f6f5dd76..674503a73 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index a8457dc45..106fed157 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -139,6 +139,15 @@ .container-fluid { padding: 0; } + .dl-horizontal dt { + float: none; + clear: none; + width: auto; + text-align: left; + } + .dl-horizontal dd { + margin-left: 0; + } .container { width: auto; } diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 02949da9f..201d917a8 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -458,6 +458,9 @@ dd { margin-left: 9px; } .dl-horizontal dt { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; float: left; clear: left; width: 120px; diff --git a/docs/base-css.html b/docs/base-css.html index 0a1ea0d9d..647b396c6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -371,7 +371,14 @@
    Donec id elit non mi porta gravida at eget metus.
    Malesuada porta
    Etiam porta sem malesuada magna mollis euismod.
    +
    Felis euismod semper eget lacinia
    +
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    +
    +

    + Heads up! + Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout. +

    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 0b6e17e69..66bf70474 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -294,7 +294,14 @@
    Donec id elit non mi porta gravida at eget metus.
    Malesuada porta
    Etiam porta sem malesuada magna mollis euismod.
    +
    Felis euismod semper eget lacinia
    +
    Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
    +
    +

    + {{_i}}Heads up!{{/i}} + {{_i}}Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow. In narrower viewports, they will change to the default stacked layout.{{/i}} +

    -- cgit v1.2.3 From 33fa705c7fa9cc9e8c255cc2e161336ba21b3cff Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 00:15:04 -0700 Subject: fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width --- docs/assets/bootstrap.zip | Bin 57027 -> 56995 bytes docs/assets/css/bootstrap.css | 7 +------ 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 674503a73..3f7c2b967 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 201d917a8..7f47a2124 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2780,8 +2780,7 @@ input[type="submit"].btn.btn-mini { clear: both; } .tab-content { - display: table; - width: 100%; + overflow: auto; } .tabs-below .nav-tabs, .tabs-right .nav-tabs, @@ -2816,10 +2815,6 @@ input[type="submit"].btn.btn-mini { .tabs-below .nav-tabs .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .tab-content, -.tabs-right .tab-content { - width: auto; -} .tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li { float: none; -- cgit v1.2.3 From fe05f9aeb259733de4598014db9df9193cc01ea2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 00:59:34 -0700 Subject: fix #2572: streamline thumbnails css to allow for offsets --- docs/assets/bootstrap.zip | Bin 56995 -> 56961 bytes docs/assets/css/bootstrap-responsive.css | 6 ------ docs/assets/css/bootstrap.css | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 3f7c2b967..30547f2ba 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 106fed157..adb1402c0 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -164,9 +164,6 @@ width: auto; margin: 0; } - .thumbnails [class*="span"] { - width: auto; - } input[class*="span"], select[class*="span"], textarea[class*="span"], @@ -597,9 +594,6 @@ .thumbnails { margin-left: -30px; } - .thumbnails > li { - margin-left: 30px; - } } @media (max-width: 979px) { body { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7f47a2124..7d6d80079 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3627,8 +3627,7 @@ input[type="submit"].btn.btn-mini { clear: both; } .thumbnails > li { - float: left; - margin: 0 0 18px 20px; + margin-bottom: 18px; } .thumbnail { display: block; -- cgit v1.2.3 From 647f1c98eda0f150e54e9193181acb462a3b9357 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 1 Apr 2012 01:05:00 -0700 Subject: fix #2296: allow fluid thumbnails --- docs/assets/bootstrap.zip | Bin 56961 -> 56985 bytes docs/assets/css/bootstrap-responsive.css | 3 +++ docs/assets/css/bootstrap.css | 3 +++ 3 files changed, 6 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 30547f2ba..badb33c21 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index adb1402c0..df663f69f 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -594,6 +594,9 @@ .thumbnails { margin-left: -30px; } + .row-fluid .thumbnails { + margin-left: 0; + } } @media (max-width: 979px) { body { diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7d6d80079..1b09b7904 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3626,6 +3626,9 @@ input[type="submit"].btn.btn-mini { .thumbnails:after { clear: both; } +.row-fluid .thumbnails { + margin-left: 0; +} .thumbnails > li { margin-bottom: 18px; } -- cgit v1.2.3 From 030265eaecf2c7287df6fac1ba45e1057ff37483 Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Sun, 1 Apr 2012 16:22:52 -0600 Subject: Restrict collapsed items in Navbar to only those in .nav-collapse, and buttons in Navbar. --- docs/examples/fluid.html | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/examples/fluid.html b/docs/examples/fluid.html index 651b6f2f9..f235d7614 100644 --- a/docs/examples/fluid.html +++ b/docs/examples/fluid.html @@ -44,13 +44,23 @@ Project name + -- cgit v1.2.3 From 2988de6377d8ccc456af6d4ef1b3064c6c5a1f3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:37:58 -0700 Subject: fix #2913: get more specific with button group selectors --- docs/assets/bootstrap.zip | Bin 56985 -> 56990 bytes docs/assets/css/bootstrap.css | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index badb33c21..148858cc1 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b09b7904..e8547add7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2372,7 +2372,7 @@ input[type="submit"].btn.btn-mini { *zoom: 1; } -.btn-group .btn { +.btn-group > .btn { position: relative; float: left; margin-left: -1px; @@ -2380,7 +2380,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius: 0; border-radius: 0; } -.btn-group .btn:first-child { +.btn-group > .btn:first-child { margin-left: 0; -webkit-border-top-left-radius: 4px; -moz-border-radius-topleft: 4px; @@ -2389,8 +2389,8 @@ input[type="submit"].btn.btn-mini { -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } -.btn-group .btn:last-child, -.btn-group .dropdown-toggle { +.btn-group > .btn:last-child, +.btn-group > .dropdown-toggle { -webkit-border-top-right-radius: 4px; -moz-border-radius-topright: 4px; border-top-right-radius: 4px; @@ -2398,7 +2398,7 @@ input[type="submit"].btn.btn-mini { -moz-border-radius-bottomright: 4px; border-bottom-right-radius: 4px; } -.btn-group .btn.large:first-child { +.btn-group > .btn.large:first-child { margin-left: 0; -webkit-border-top-left-radius: 6px; -moz-border-radius-topleft: 6px; @@ -2407,8 +2407,8 @@ input[type="submit"].btn.btn-mini { -moz-border-radius-bottomleft: 6px; border-bottom-left-radius: 6px; } -.btn-group .btn.large:last-child, -.btn-group .large.dropdown-toggle { +.btn-group > .btn.large:last-child, +.btn-group > .large.dropdown-toggle { -webkit-border-top-right-radius: 6px; -moz-border-radius-topright: 6px; border-top-right-radius: 6px; @@ -2416,17 +2416,17 @@ input[type="submit"].btn.btn-mini { -moz-border-radius-bottomright: 6px; border-bottom-right-radius: 6px; } -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { +.btn-group > .btn:hover, +.btn-group > .btn:focus, +.btn-group > .btn:active, +.btn-group > .btn.active { z-index: 2; } .btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { outline: 0; } -.btn-group .dropdown-toggle { +.btn-group > .dropdown-toggle { padding-left: 8px; padding-right: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); @@ -2435,17 +2435,17 @@ input[type="submit"].btn.btn-mini { *padding-top: 3px; *padding-bottom: 3px; } -.btn-group .btn-mini.dropdown-toggle { +.btn-group > .btn-mini.dropdown-toggle { padding-left: 5px; padding-right: 5px; *padding-top: 1px; *padding-bottom: 1px; } -.btn-group .btn-small.dropdown-toggle { +.btn-group > .btn-small.dropdown-toggle { *padding-top: 4px; *padding-bottom: 4px; } -.btn-group .btn-large.dropdown-toggle { +.btn-group > .btn-large.dropdown-toggle { padding-left: 12px; padding-right: 12px; } -- cgit v1.2.3 From 4462f24753463dda66a8301ff10b8e7c0abc5ac8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:40:06 -0700 Subject: fix #2911: correct /lib/ path to /less/ --- docs/assets/bootstrap.zip | Bin 56990 -> 56990 bytes docs/less.html | 2 +- docs/templates/pages/less.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 148858cc1..75edca45a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index d6a0fd64a..354285815 100644 --- a/docs/less.html +++ b/docs/less.html @@ -969,7 +969,7 @@

    Command line

    Install the LESS command line tool via Node and run the following command:

    -
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +
    $ lessc ./less/bootstrap.less > bootstrap.css

    Be sure to include --compress in that command if you're trying to save some bytes!

    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 8b7f4495d..5005fb166 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -892,7 +892,7 @@

    {{_i}}Command line{{/i}}

    {{_i}}Install the LESS command line tool via Node and run the following command:{{/i}}

    -
    $ lessc ./lib/bootstrap.less > bootstrap.css
    +
    $ lessc ./less/bootstrap.less > bootstrap.css

    {{_i}}Be sure to include --compress in that command if you're trying to save some bytes!{{/i}}

    -- cgit v1.2.3 From 2ea437f353a636a277320513db04ced4fc0f7da2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 2 Apr 2012 22:49:19 -0700 Subject: fix #2908: unfloat inputs using .span* in fluid row --- docs/assets/bootstrap.zip | Bin 56990 -> 57025 bytes docs/assets/css/bootstrap.css | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 75edca45a..a6b39f69a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e8547add7..c0b2325ba 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -804,7 +804,11 @@ select:focus { input[class*="span"], select[class*="span"], textarea[class*="span"], -.uneditable-input[class*="span"] { +.uneditable-input[class*="span"], +.row-fluid input[class*="span"], +.row-fluid select[class*="span"], +.row-fluid textarea[class*="span"], +.row-fluid .uneditable-input[class*="span"] { float: none; margin-left: 0; } -- cgit v1.2.3 From 83febb3452ecd81241ddc004509ec64de8b13a92 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 4 Apr 2012 15:02:30 -0700 Subject: remake and add isHTML check to popover as well --- docs/assets/bootstrap.zip | Bin 56893 -> 57150 bytes docs/assets/js/bootstrap-popover.js | 4 ++-- docs/assets/js/bootstrap-tooltip.js | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index ea0088fcf..9b90ba477 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index ee47e43a2..df6ef3dff 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -38,8 +38,8 @@ , title = this.getTitle() , content = this.getContent() - $tip.find('.popover-title').html(title) - $tip.find('.popover-content > *').html(content) + $tip.find('.popover-title')[this.isHTML(title) ? 'html' : 'text'](title) + $tip.find('.popover-content > *')[this.isHTML(content) ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') } diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 4704d1e02..2f9254ed2 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -155,9 +155,20 @@ } } + , isHTML: function( text ) { + // html string detection logic adapted from jQuery + return typeof text != 'string' + || ( text.charAt(0) === "<" + && text.charAt( text.length - 1 ) === ">" + && text.length >= 3 + ) || /^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(text) + } + , setContent: function () { var $tip = this.tip() - $tip.find('.tooltip-inner').html(this.getTitle()) + , title = this.getTitle() + + $tip.find('.tooltip-inner')[this.isHTML(title) ? 'html' : 'text'](title) $tip.removeClass('fade in top bottom left right') } -- cgit v1.2.3 From 4b81c0dff371edad2afd5df77c957265235e34b1 Mon Sep 17 00:00:00 2001 From: Bryan Petty Date: Thu, 5 Apr 2012 13:48:17 -0600 Subject: Changed .nav-collapse to clear both instead of left, and added compiled files. --- docs/assets/bootstrap.zip | Bin 56985 -> 57172 bytes docs/assets/css/bootstrap-responsive.css | 49 ++++++---- docs/assets/css/bootstrap.css | 148 +++++++++++++++++-------------- 3 files changed, 109 insertions(+), 88 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index badb33c21..d301c2fe8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index df663f69f..1e1488c62 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -619,27 +619,27 @@ margin: 0 0 0 -5px; } .navbar .nav-collapse { - clear: left; + clear: both; } - .navbar .nav { + .navbar .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav > li { + .navbar .nav-collapse .nav > li { float: none; } - .navbar .nav > li > a { + .navbar .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav > .divider-vertical { + .navbar .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav .nav-header { + .navbar .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav > li > a, - .navbar .dropdown-menu a { + .navbar .nav-collapse .nav > li > a, + .navbar .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -647,14 +647,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .dropdown-menu li + li a { + .navbar .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + .navbar .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav > li > a:hover, - .navbar .dropdown-menu a:hover { + .navbar .nav-collapse .nav > li > a:hover, + .navbar .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .dropdown-menu { + .navbar .nav-collapse.in .btn-group { + margin-top: 5px; + padding: 0; + } + .navbar .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -672,15 +683,15 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .dropdown-menu:before, - .navbar .dropdown-menu:after { + .navbar .nav-collapse .dropdown-menu:before, + .navbar .nav-collapse .dropdown-menu:after { display: none; } - .navbar .dropdown-menu .divider { + .navbar .nav-collapse .dropdown-menu .divider { display: none; } - .navbar-form, - .navbar-search { + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { float: none; padding: 9px 15px; margin: 9px 0; @@ -690,7 +701,7 @@ -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1); } - .navbar .nav.pull-right { + .navbar .nav-collapse .nav.pull-right { float: none; margin-left: 0; } @@ -698,7 +709,7 @@ padding-left: 10px; padding-right: 10px; } - .btn-navbar { + .navbar .btn-navbar { display: block; } .nav-collapse, diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1b09b7904..16bd705fb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2752,14 +2752,14 @@ input[type="submit"].btn.btn-mini { } .nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, -.nav > .open.active > a:hover { +.nav > li.dropdown.open.active > a:hover { color: #ffffff; background-color: #999999; border-color: #999999; } -.nav .open .caret, -.nav .open.active .caret, -.nav .open a:hover .caret { +.nav li.dropdown.open .caret, +.nav li.dropdown.open.active .caret, +.nav li.dropdown.open a:hover .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; opacity: 1; @@ -2892,58 +2892,6 @@ input[type="submit"].btn.btn-mini { .navbar .container { width: auto; } -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - *background-color: #222222; - /* Darken IE7 buttons by default so they stand out more given they won't have borders */ - - -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); - box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; - *background-color: #151515; -} -.btn-navbar:active, -.btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .icon-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .icon-bar + .icon-bar { - margin-top: 3px; -} .nav-collapse.collapse { height: auto; } @@ -3107,6 +3055,16 @@ input[type="submit"].btn.btn-mini { text-decoration: none; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); } +.navbar .btn { + display: inline-block; + padding: 4px 10px 4px; + margin: 5px 5px 6px; + line-height: 18px; +} +.navbar .btn-group { + margin: 0; + padding: 5px 5px 6px; +} .navbar .nav > li > a:hover { background-color: transparent; color: #ffffff; @@ -3130,6 +3088,58 @@ input[type="submit"].btn.btn-mini { margin-left: 10px; margin-right: 0; } +.navbar .btn-navbar { + display: none; + float: right; + padding: 7px 10px; + margin-left: 5px; + margin-right: 5px; + background-color: #2c2c2c; + background-image: -moz-linear-gradient(top, #333333, #222222); + background-image: -ms-linear-gradient(top, #333333, #222222); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); + background-image: -webkit-linear-gradient(top, #333333, #222222); + background-image: -o-linear-gradient(top, #333333, #222222); + background-image: linear-gradient(top, #333333, #222222); + background-repeat: repeat-x; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); + border-color: #222222 #222222 #000000; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); + filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); + *background-color: #222222; + /* Darken IE7 buttons by default so they stand out more given they won't have borders */ + + -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); + box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075); +} +.navbar .btn-navbar:hover, +.navbar .btn-navbar:active, +.navbar .btn-navbar.active, +.navbar .btn-navbar.disabled, +.navbar .btn-navbar[disabled] { + background-color: #222222; + *background-color: #151515; +} +.navbar .btn-navbar:active, +.navbar .btn-navbar.active { + background-color: #080808 \9; +} +.navbar .btn-navbar .icon-bar { + display: block; + width: 18px; + height: 2px; + background-color: #f5f5f5; + -webkit-border-radius: 1px; + -moz-border-radius: 1px; + border-radius: 1px; + -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); +} +.btn-navbar .icon-bar + .icon-bar { + margin-top: 3px; +} .navbar .dropdown-menu:before { content: ''; display: inline-block; @@ -3164,35 +3174,35 @@ input[type="submit"].btn.btn-mini { bottom: -6px; top: auto; } -.navbar .nav .dropdown-toggle .caret, -.navbar .nav .open .caret { +.navbar .nav li.dropdown .dropdown-toggle .caret, +.navbar .nav li.dropdown.open .caret { border-top-color: #ffffff; border-bottom-color: #ffffff; } -.navbar .nav .active .caret { +.navbar .nav li.dropdown.active .caret { opacity: 1; filter: alpha(opacity=100); } -.navbar .nav .open > .dropdown-toggle, -.navbar .nav .active > .dropdown-toggle, -.navbar .nav .open.active > .dropdown-toggle { +.navbar .nav li.dropdown.open > .dropdown-toggle, +.navbar .nav li.dropdown.active > .dropdown-toggle, +.navbar .nav li.dropdown.open.active > .dropdown-toggle { background-color: transparent; } -.navbar .nav .active > .dropdown-toggle:hover { +.navbar .nav li.dropdown.active > .dropdown-toggle:hover { color: #ffffff; } -.navbar .nav.pull-right .dropdown-menu, -.navbar .nav .dropdown-menu.pull-right { +.navbar .pull-right .dropdown-menu, +.navbar .dropdown-menu.pull-right { left: auto; right: 0; } -.navbar .nav.pull-right .dropdown-menu:before, -.navbar .nav .dropdown-menu.pull-right:before { +.navbar .pull-right .dropdown-menu:before, +.navbar .dropdown-menu.pull-right:before { left: auto; right: 12px; } -.navbar .nav.pull-right .dropdown-menu:after, -.navbar .nav .dropdown-menu.pull-right:after { +.navbar .pull-right .dropdown-menu:after, +.navbar .dropdown-menu.pull-right:after { left: auto; right: 13px; } -- cgit v1.2.3 From 10ff5f16a64bf9b5cc45ba42e30cbf191e866eec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 14:25:58 -0700 Subject: fix #2968 manually: add consolas to monospace font stack --- docs/assets/bootstrap.zip | Bin 57282 -> 57299 bytes docs/assets/css/bootstrap.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1694b7375..01dc38fad 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0b2325ba..bc0592563 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -543,7 +543,7 @@ cite { code, pre { padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 12px; color: #333333; -webkit-border-radius: 3px; -- cgit v1.2.3 From 798363eda743f4e04bf8dd30964ee97f49e86a79 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 14:31:55 -0700 Subject: fix left margin on .thumbnails for responsive <767 --- docs/assets/bootstrap.zip | Bin 57299 -> 57304 bytes docs/assets/css/bootstrap-responsive.css | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 01dc38fad..45b05f39f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index df663f69f..f730fb20c 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -154,7 +154,8 @@ .row-fluid { width: 100%; } - .row { + .row, + .thumbnails { margin-left: 0; } [class*="span"], @@ -162,7 +163,7 @@ float: none; display: block; width: auto; - margin: 0; + margin-left: 0; } input[class*="span"], select[class*="span"], -- cgit v1.2.3 From 5591a9b96668c0f151872ce5f473a968d042a73c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 14:56:37 -0700 Subject: use yui-compress by default instead of regular compress --- docs/assets/bootstrap.zip | Bin 57304 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/assets/bootstrap.zip (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip deleted file mode 100644 index 45b05f39f..000000000 Binary files a/docs/assets/bootstrap.zip and /dev/null differ -- cgit v1.2.3 From f563b1db43e702854a6065d132e487bc49dc4b24 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 15:59:14 -0700 Subject: update kippt screenshot --- docs/assets/img/example-sites/kippt.png | Bin 50203 -> 50695 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/assets/img/example-sites/kippt.png b/docs/assets/img/example-sites/kippt.png index a28a63d2e..4afa772cc 100644 Binary files a/docs/assets/img/example-sites/kippt.png and b/docs/assets/img/example-sites/kippt.png differ -- cgit v1.2.3 From 0a71f171bc63dcfea42fe002bab00454d728fc42 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:17:15 -0700 Subject: readd bootstrap.zip, add @inputBorderRadius var to close #2946 --- docs/assets/bootstrap.zip | Bin 0 -> 57364 bytes docs/download.html | 2 ++ docs/less.html | 4 ++++ docs/templates/pages/download.mustache | 2 ++ docs/templates/pages/less.mustache | 4 ++++ 5 files changed, 12 insertions(+) create mode 100644 docs/assets/bootstrap.zip (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip new file mode 100644 index 000000000..95241ab82 Binary files /dev/null and b/docs/assets/bootstrap.zip differ diff --git a/docs/download.html b/docs/download.html index c0e3b9cf0..bb10bdf63 100644 --- a/docs/download.html +++ b/docs/download.html @@ -368,6 +368,8 @@ + + diff --git a/docs/less.html b/docs/less.html index 354285815..4fe26af56 100644 --- a/docs/less.html +++ b/docs/less.html @@ -453,6 +453,10 @@ @inputBorder #ccc + + @inputBorderRadius + 3px + @inputDisabledBackground @grayLighter diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache index 0e73c44a4..e9c27588b 100644 --- a/docs/templates/pages/download.mustache +++ b/docs/templates/pages/download.mustache @@ -291,6 +291,8 @@ + + diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 5005fb166..5345cbf97 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -376,6 +376,10 @@ @inputBorder #ccc + + @inputBorderRadius + 3px + @inputDisabledBackground @grayLighter -- cgit v1.2.3 From 3ecf1098357618092280b2e7c562a1ef5bf11959 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:44:03 -0700 Subject: fix conflicts, add docs example for two buttons on an append --- docs/assets/bootstrap.zip | Bin 57364 -> 57396 bytes docs/assets/css/bootstrap.css | 18 ++++++++++++------ docs/base-css.html | 8 ++++++++ docs/templates/pages/base-css.mustache | 8 ++++++++ 4 files changed, 28 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 95241ab82..23fa44936 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index bc0592563..dd141c599 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1048,9 +1048,10 @@ select:focus:required:invalid:focus { .input-append .add-on, .input-prepend .btn, .input-append .btn { - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; + margin-left: -1px; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; } .input-prepend .active, .input-append .active { @@ -1061,6 +1062,12 @@ select:focus:required:invalid:focus { .input-prepend .btn { margin-right: -1px; } +.input-prepend .add-on:first-child, +.input-prepend .btn:first-child { + -webkit-border-radius: 3px 0 0 3px; + -moz-border-radius: 3px 0 0 3px; + border-radius: 3px 0 0 3px; +} .input-append input, .input-append select, .input-append .uneditable-input { @@ -1072,9 +1079,8 @@ select:focus:required:invalid:focus { border-left-color: #eee; border-right-color: #ccc; } -.input-append .add-on, -.input-append .btn { - margin-left: -1px; +.input-append .add-on:last-child, +.input-append .btn:last-child { -webkit-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0; diff --git a/docs/base-css.html b/docs/base-css.html index 647b396c6..05ef04b7e 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1223,6 +1223,14 @@ For example, <code>section</code> should be wrapped as inline.
    +
    + +
    +
    + +
    +
    +
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 66bf70474..57e2401d1 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1146,6 +1146,14 @@
    +
    + +
    +
    + +
    +
    +
    -- cgit v1.2.3 From a20cd66ba479053f060b1a7ed61cb1f0cd90450f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 16:49:06 -0700 Subject: clean up new input append examples --- docs/assets/bootstrap.zip | Bin 57396 -> 57396 bytes docs/base-css.html | 8 ++++---- docs/templates/pages/base-css.mustache | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 23fa44936..1e18acbb8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/base-css.html b/docs/base-css.html index 05ef04b7e..578b9ff27 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1216,18 +1216,18 @@ For example, <code>section</code> should be wrapped as inline.
    - +
    - +
    - +
    - +
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 57e2401d1..b61e77ac5 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1139,18 +1139,18 @@
    - +
    - +
    - +
    - +
    -- cgit v1.2.3 From 08fee005a8a879498255611c18dede3112896d3d Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 7 Apr 2012 21:26:46 -0700 Subject: https://github.com/twitter/bootstrap/issues/2954 --- docs/assets/bootstrap.zip | Bin 57396 -> 57424 bytes docs/assets/js/bootstrap-typeahead.js | 2 ++ 2 files changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1e18acbb8..221c8a14c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index f366bea63..3876e6307 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -204,11 +204,13 @@ break case 38: // up arrow + if (e.type != 'keydown') break e.preventDefault() this.prev() break case 40: // down arrow + if (e.type != 'keydown') break e.preventDefault() this.next() break -- cgit v1.2.3 From 5bc601d9a8c330a4ad14375e63519fcf11bb08ab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 7 Apr 2012 23:37:58 -0700 Subject: fix typo on js docs selector --- docs/assets/bootstrap.zip | Bin 57396 -> 57396 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 1e18acbb8..e40a00a77 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index 2a0f3d861..ce495414f 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1088,7 +1088,7 @@ $('#my-alert').bind('closed', function () {

    Using bootstrap-button.js

    Enable buttons via javascript:

    -
    $('.tabs').button()
    +
    $('.nav-tabs').button()

    Markup

    Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
    index bb25f0957..3792279ef 100644
    --- a/docs/templates/pages/javascript.mustache
    +++ b/docs/templates/pages/javascript.mustache
    @@ -1011,7 +1011,7 @@ $('#my-alert').bind('closed', function () {
               

    {{_i}}Using bootstrap-button.js{{/i}}

    {{_i}}Enable buttons via javascript:{{/i}}

    -
    $('.tabs').button()
    +
    $('.nav-tabs').button()

    {{_i}}Markup{{/i}}

    {{_i}}Data attributes are integral to the button plugin. Check out the example code below for the various markup types.{{/i}}

    -- 
    cgit v1.2.3
    
    
    From 0b2d23d4439429cdbd0758d01f4602e6b2afde6d Mon Sep 17 00:00:00 2001
    From: Mark Otto 
    Date: Sat, 7 Apr 2012 23:41:09 -0700
    Subject: add larger .input-* to block reset for responsive <767
    
    ---
     docs/assets/bootstrap.zip                | Bin 57396 -> 57423 bytes
     docs/assets/css/bootstrap-responsive.css |   3 +++
     2 files changed, 3 insertions(+)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index e40a00a77..fc922efd2 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
    index f730fb20c..374c77414 100644
    --- a/docs/assets/css/bootstrap-responsive.css
    +++ b/docs/assets/css/bootstrap-responsive.css
    @@ -165,6 +165,9 @@
         width: auto;
         margin-left: 0;
       }
    +  .input-large,
    +  .input-xlarge,
    +  .input-xxlarge,
       input[class*="span"],
       select[class*="span"],
       textarea[class*="span"],
    -- 
    cgit v1.2.3
    
    
    From 5b85ed181a75b286ac4e898173da7b65e20e6d8a Mon Sep 17 00:00:00 2001
    From: Bryan Petty 
    Date: Tue, 10 Apr 2012 15:19:10 -0600
    Subject: Fixed extra margin on Navbar buttons.
    
    ---
     docs/assets/bootstrap.zip     | Bin 57172 -> 57176 bytes
     docs/assets/css/bootstrap.css |   2 +-
     2 files changed, 1 insertion(+), 1 deletion(-)
    
    (limited to 'docs')
    
    diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
    index d301c2fe8..29867c1bb 100644
    Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
    diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
    index 16bd705fb..40edbacf3 100644
    --- a/docs/assets/css/bootstrap.css
    +++ b/docs/assets/css/bootstrap.css
    @@ -2926,7 +2926,7 @@ input[type="submit"].btn.btn-mini {
       margin-top: 5px;
     }
     .navbar .btn-group .btn {
    -  margin-top: 0;
    +  margin: 0;
     }
     .navbar-form {
       margin-bottom: 0;
    -- 
    cgit v1.2.3
    
    
    From 0e6f12af861745961a90aef58d8d783bebd0b58e Mon Sep 17 00:00:00 2001
    From: ctalkington 
    Date: Thu, 12 Apr 2012 15:14:54 -0500
    Subject: add 's' to 'classe' in components docs. thanks mishmosh.
    
    ---
     docs/components.html                     | 2 +-
     docs/templates/pages/components.mustache | 2 +-
     2 files changed, 2 insertions(+), 2 deletions(-)
    
    (limited to 'docs')
    
    diff --git a/docs/components.html b/docs/components.html
    index 66f62329a..7cd17b8b1 100644
    --- a/docs/components.html
    +++ b/docs/components.html
    @@ -422,7 +422,7 @@
             
           
           

    Sizes

    -

    Utilize the extra button classe .btn-mini, .btn-small, or .btn-large for sizing.

    +

    Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.

    diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index aff449c73..ac6ce243b 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -345,7 +345,7 @@

    {{_i}}Sizes{{/i}}

    -

    {{_i}}Utilize the extra button classe .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    +

    {{_i}}Utilize the extra button classes .btn-mini, .btn-small, or .btn-large for sizing.{{/i}}

    -- cgit v1.2.3 From a7d8145a321036e39a91fc9648710e62f7f164ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 13:18:37 -0700 Subject: fix #3036: add bg color to inputs --- docs/assets/bootstrap.zip | Bin 57451 -> 57461 bytes docs/assets/css/bootstrap.css | 1 + 2 files changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index cb1e91545..f5b933c9c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dd141c599..7134c6e71 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -641,6 +641,7 @@ select, font-size: 13px; line-height: 18px; color: #555555; + background-color: #ffffff; border: 1px solid #cccccc; -webkit-border-radius: 3px; -moz-border-radius: 3px; -- cgit v1.2.3 From 8575a452942001bce522e8e258d9e192d24cb6ec Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 13:31:48 -0700 Subject: alt fix to #3029: change to single border-radii properties --- docs/assets/bootstrap.zip | Bin 57461 -> 57441 bytes docs/assets/css/bootstrap.css | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f5b933c9c..671d7c68c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 7134c6e71..c0623f766 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1286,27 +1286,30 @@ table { } .table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; - border-radius: 4px 0 0 0; + -webkit-border-top-left-radius: 4px; + -moz-border-radius-topleft: 4px; + border-top-left-radius: 4px; } .table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; - border-radius: 0 4px 0 0; + -webkit-border-top-right-radius: 4px; + -moz-border-radius-topright: 4px; + border-top-right-radius: 4px; } .table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { -webkit-border-radius: 0 0 0 4px; -moz-border-radius: 0 0 0 4px; border-radius: 0 0 0 4px; + -webkit-border-bottom-left-radius: 4px; + -moz-border-radius-bottomleft: 4px; + border-bottom-left-radius: 4px; } .table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; + -webkit-border-bottom-right-radius: 4px; + -moz-border-radius-bottomright: 4px; + border-bottom-right-radius: 4px; } .table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { -- cgit v1.2.3 From 575f18aaf49abb0289185f6409bee031947ccf69 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 16:29:53 -0700 Subject: add jshint support + a few minor stylistic changes --- docs/assets/bootstrap.zip | Bin 57441 -> 57461 bytes docs/assets/js/bootstrap-alert.js | 55 ++++++++++++++---------------- docs/assets/js/bootstrap-button.js | 59 +++++++++++++++------------------ docs/assets/js/bootstrap-carousel.js | 9 ++--- docs/assets/js/bootstrap-collapse.js | 34 ++++++++++--------- docs/assets/js/bootstrap-dropdown.js | 16 +++++---- docs/assets/js/bootstrap-modal.js | 21 +++++++----- docs/assets/js/bootstrap-popover.js | 15 ++++++--- docs/assets/js/bootstrap-scrollspy.js | 7 ++-- docs/assets/js/bootstrap-tab.js | 7 ++-- docs/assets/js/bootstrap-tooltip.js | 25 +++++++------- docs/assets/js/bootstrap-transition.js | 7 ++-- docs/assets/js/bootstrap-typeahead.js | 16 +++++---- 13 files changed, 142 insertions(+), 129 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 671d7c68c..0d3af08d2 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index c7171855d..167a57f84 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -18,9 +18,10 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* ALERT CLASS DEFINITION * ====================== */ @@ -30,43 +31,37 @@ $(el).on('click', dismiss, this.close) } - Alert.prototype = { - - constructor: Alert - - , close: function ( e ) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent - $parent = $(selector) + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } - e && e.preventDefault() + $parent = $(selector) - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + e && e.preventDefault() - $parent.trigger(e = $.Event('close')) + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - if (e.isDefaultPrevented()) return + $parent.trigger(e = $.Event('close')) - $parent.removeClass('in') + if (e.isDefaultPrevented()) return - function removeElement() { - $parent - .trigger('closed') - .remove() - } + $parent.removeClass('in') - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() + function removeElement() { + $parent + .trigger('closed') + .remove() } + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() } @@ -92,4 +87,4 @@ $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-button.js b/docs/assets/js/bootstrap-button.js index 77af03760..49e88e49a 100644 --- a/docs/assets/js/bootstrap-button.js +++ b/docs/assets/js/bootstrap-button.js @@ -18,58 +18,53 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* BUTTON PUBLIC CLASS DEFINITION * ============================== */ - var Button = function ( element, options ) { + var Button = function (element, options) { this.$element = $(element) this.options = $.extend({}, $.fn.button.defaults, options) } - Button.prototype = { - - constructor: Button - - , setState: function ( state ) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' + Button.prototype.setState = function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) - $el[val](data[state] || this.options[state]) + $el[val](data[state] || this.options[state]) - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - , toggle: function () { - var $parent = this.$element.parent('[data-toggle="buttons-radio"]') + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } - $parent && $parent - .find('.active') - .removeClass('active') + Button.prototype.toggle = function () { + var $parent = this.$element.parent('[data-toggle="buttons-radio"]') - this.$element.toggleClass('active') - } + $parent && $parent + .find('.active') + .removeClass('active') + this.$element.toggleClass('active') } /* BUTTON PLUGIN DEFINITION * ======================== */ - $.fn.button = function ( option ) { + $.fn.button = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('button') @@ -98,4 +93,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index 0c8c5a202..d1c3079e4 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -18,9 +18,10 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* CAROUSEL CLASS DEFINITION * ========================= */ @@ -129,7 +130,7 @@ /* CAROUSEL PLUGIN DEFINITION * ========================== */ - $.fn.carousel = function ( option ) { + $.fn.carousel = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('carousel') @@ -162,4 +163,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 9f462e6bc..30e139cf8 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -18,16 +18,20 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { - "use strict" + "use strict"; // jshint ;_; - var Collapse = function ( element, options ) { - this.$element = $(element) + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) this.options = $.extend({}, $.fn.collapse.defaults, options) - if (this.options["parent"]) { - this.$parent = $(this.options["parent"]) + if (this.options.parent) { + this.$parent = $(this.options.parent) } this.options.toggle && this.toggle() @@ -53,7 +57,6 @@ dimension = this.dimension() scroll = $.camelCase(['scroll', dimension].join('-')) actives = this.$parent && this.$parent.find('> .accordion-group > .in') - hasData if (actives && actives.length) { hasData = actives.data('collapse') @@ -75,7 +78,7 @@ this.$element[dimension](0) } - , reset: function ( size ) { + , reset: function (size) { var dimension = this.dimension() this.$element @@ -83,12 +86,12 @@ [dimension](size || 'auto') [0].offsetWidth - this.$element[size != null ? 'addClass' : 'removeClass']('collapse') + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') return this } - , transition: function ( method, startEvent, completeEvent ) { + , transition: function (method, startEvent, completeEvent) { var that = this , complete = function () { if (startEvent == 'show') that.reset() @@ -107,18 +110,19 @@ $.support.transition && this.$element.hasClass('collapse') ? this.$element.one($.support.transition.end, complete) : complete() - } + } , toggle: function () { this[this.$element.hasClass('in') ? 'hide' : 'show']() - } + } } - /* COLLAPSIBLE PLUGIN DEFINITION + + /* COLLAPSIBLE PLUGIN DEFINITION * ============================== */ - $.fn.collapse = function ( option ) { + $.fn.collapse = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('collapse') @@ -149,4 +153,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 661b22713..f27f4d2f4 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -18,15 +18,16 @@ * ============================================================ */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* DROPDOWN CLASS DEFINITION * ========================= */ var toggle = '[data-toggle="dropdown"]' - , Dropdown = function ( element ) { + , Dropdown = function (element) { var $el = $(element).on('click.dropdown.data-api', this.toggle) $('html').on('click.dropdown.data-api', function () { $el.parent().removeClass('open') @@ -37,7 +38,7 @@ constructor: Dropdown - , toggle: function ( e ) { + , toggle: function (e) { var $this = $(this) , selector = $this.attr('data-target') , $parent @@ -54,7 +55,8 @@ isActive = $parent.hasClass('open') clearMenus() - !isActive && $parent.toggleClass('open') + + if (!isActive) $parent.toggleClass('open') return false } @@ -69,7 +71,7 @@ /* DROPDOWN PLUGIN DEFINITION * ========================== */ - $.fn.dropdown = function ( option ) { + $.fn.dropdown = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('dropdown') @@ -91,4 +93,4 @@ .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-modal.js b/docs/assets/js/bootstrap-modal.js index f16b56500..959433f2a 100644 --- a/docs/assets/js/bootstrap-modal.js +++ b/docs/assets/js/bootstrap-modal.js @@ -18,14 +18,15 @@ * ========================================================= */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* MODAL CLASS DEFINITION * ====================== */ - var Modal = function ( content, options ) { + var Modal = function (content, options) { this.options = options this.$element = $(content) .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) @@ -55,7 +56,9 @@ backdrop.call(this, function () { var transition = $.support.transition && that.$element.hasClass('fade') - !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } that.$element .show() @@ -73,7 +76,7 @@ }) } - , hide: function ( e ) { + , hide: function (e) { e && e.preventDefault() var that = this @@ -116,7 +119,7 @@ }) } - function hideModal( that ) { + function hideModal(that) { this.$element .hide() .trigger('hidden') @@ -124,7 +127,7 @@ backdrop.call(this) } - function backdrop( callback ) { + function backdrop(callback) { var that = this , animate = this.$element.hasClass('fade') ? 'fade' : '' @@ -178,7 +181,7 @@ /* MODAL PLUGIN DEFINITION * ======================= */ - $.fn.modal = function ( option ) { + $.fn.modal = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('modal') @@ -212,4 +215,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-popover.js b/docs/assets/js/bootstrap-popover.js index df6ef3dff..51820979a 100644 --- a/docs/assets/js/bootstrap-popover.js +++ b/docs/assets/js/bootstrap-popover.js @@ -18,14 +18,19 @@ * =========================================================== */ -!function ( $ ) { +!function ($) { - "use strict" + "use strict"; // jshint ;_; + + + /* POPOVER PUBLIC CLASS DEFINITION + * =============================== */ var Popover = function ( element, options ) { this.init('popover', element, options) } + /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js ========================================== */ @@ -59,7 +64,7 @@ return content } - , tip: function() { + , tip: function () { if (!this.$tip) { this.$tip = $(this.options.template) } @@ -72,7 +77,7 @@ /* POPOVER PLUGIN DEFINITION * ======================= */ - $.fn.popover = function ( option ) { + $.fn.popover = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('popover') @@ -90,4 +95,4 @@ , template: '

    ' }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index 518ccafb2..3dee609c7 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -18,9 +18,10 @@ * ============================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* SCROLLSPY CLASS DEFINITION * ========================== */ @@ -142,4 +143,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tab.js b/docs/assets/js/bootstrap-tab.js index d46ef790a..6255d53ef 100644 --- a/docs/assets/js/bootstrap-tab.js +++ b/docs/assets/js/bootstrap-tab.js @@ -18,9 +18,10 @@ * ======================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* TAB CLASS DEFINITION * ==================== */ @@ -131,4 +132,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 2f9254ed2..454e7a448 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -19,14 +19,15 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { + + "use strict"; // jshint ;_; - "use strict" /* TOOLTIP PUBLIC CLASS DEFINITION * =============================== */ - var Tooltip = function ( element, options ) { + var Tooltip = function (element, options) { this.init('tooltip', element, options) } @@ -34,7 +35,7 @@ constructor: Tooltip - , init: function ( type, element, options ) { + , init: function (type, element, options) { var eventIn , eventOut @@ -55,7 +56,7 @@ this.fixTitle() } - , getOptions: function ( options ) { + , getOptions: function (options) { options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data()) if (options.delay && typeof options.delay == 'number') { @@ -68,7 +69,7 @@ return options } - , enter: function ( e ) { + , enter: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) if (!self.options.delay || !self.options.delay.show) { @@ -84,7 +85,7 @@ } } - , leave: function ( e ) { + , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) if (!self.options.delay || !self.options.delay.hide) { @@ -155,7 +156,7 @@ } } - , isHTML: function( text ) { + , isHTML: function(text) { // html string detection logic adapted from jQuery return typeof text != 'string' || ( text.charAt(0) === "<" @@ -271,12 +272,12 @@ $.fn.tooltip.defaults = { animation: true - , delay: 0 - , selector: false , placement: 'top' + , selector: false + , template: '
    ' , trigger: 'hover' , title: '' - , template: '
    ' + , delay: 0 } -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-transition.js b/docs/assets/js/bootstrap-transition.js index 8ff3c9002..d34caa1b9 100644 --- a/docs/assets/js/bootstrap-transition.js +++ b/docs/assets/js/bootstrap-transition.js @@ -18,11 +18,12 @@ * ========================================================== */ -!function ( $ ) { +!function ($) { $(function () { - "use strict" + "use strict"; // jshint ;_; + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) * ======================================================= */ @@ -57,4 +58,4 @@ }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 3876e6307..526cf320c 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -18,11 +18,15 @@ * ============================================================ */ -!function( $ ){ +!function($){ - "use strict" + "use strict"; // jshint ;_; - var Typeahead = function ( element, options ) { + + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Typeahead = function (element, options) { this.$element = $(element) this.options = $.extend({}, $.fn.typeahead.defaults, options) this.matcher = this.options.matcher || this.matcher @@ -111,7 +115,7 @@ } , highlighter: function (item) { - var query = this.query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&') + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { return '' + match + '' }) @@ -241,7 +245,7 @@ /* TYPEAHEAD PLUGIN DEFINITION * =========================== */ - $.fn.typeahead = function ( option ) { + $.fn.typeahead = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('typeahead') @@ -273,4 +277,4 @@ }) }) -}( window.jQuery ); \ No newline at end of file +}(window.jQuery); \ No newline at end of file -- cgit v1.2.3 From d5063e5dc8e62ecb23dd85d9dc3177b81852d1cf Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 16:59:49 -0700 Subject: fix #3032: update glyphicons sprite to 1.6 release --- docs/assets/bootstrap.zip | Bin 57441 -> 70894 bytes docs/assets/img/glyphicons-halflings-white.png | Bin 4352 -> 8777 bytes docs/assets/img/glyphicons-halflings.png | Bin 4352 -> 13826 bytes 3 files changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 671d7c68c..f6bd60437 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/img/glyphicons-halflings-white.png b/docs/assets/img/glyphicons-halflings-white.png index a20760bfd..3bf6484a2 100644 Binary files a/docs/assets/img/glyphicons-halflings-white.png and b/docs/assets/img/glyphicons-halflings-white.png differ diff --git a/docs/assets/img/glyphicons-halflings.png b/docs/assets/img/glyphicons-halflings.png index 92d4445df..79bc568c2 100644 Binary files a/docs/assets/img/glyphicons-halflings.png and b/docs/assets/img/glyphicons-halflings.png differ -- cgit v1.2.3 From 3408064d00bc1e4322c3ea1575bc2cab5aaa2be2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 17:15:03 -0700 Subject: hack for subnav --- docs/assets/js/application.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs') diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 732bed458..f1b7c090a 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -51,6 +51,11 @@ processScroll() + // hack sad times - holdover until rewrite for 2.1 + $nav.on('click', function () { + if (!isFixed) setTimeout(function () { $win.scrollTop($win.scrollTop() - 47) }, 10) + }) + $win.on('scroll', processScroll) function processScroll() { -- cgit v1.2.3 From dbde2dc9e40f077af4fcaa1714ade7bc94398da9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 17:15:16 -0700 Subject: adding icon classes to finish off glyphicons 1.6 update --- docs/assets/bootstrap.zip | Bin 70894 -> 71254 bytes docs/assets/css/bootstrap.css | 60 +++++++++++++++++++++++++++++++++ docs/base-css.html | 44 +++++++++++++++++------- docs/templates/pages/base-css.mustache | 44 +++++++++++++++++------- 4 files changed, 124 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f6bd60437..7c38e2e7c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c0623f766..c593d5669 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1818,6 +1818,66 @@ table .span24 { .icon-resize-horizontal { background-position: -456px -118px; } +.icon-hdd { + background-position: 0 -144px; +} +.icon-bullhorn { + background-position: -24px -144px; +} +.icon-bell { + background-position: -48px -144px; +} +.icon-certificate { + background-position: -72px -144px; +} +.icon-thumbs-up { + background-position: -96px -144px; +} +.icon-thumbs-down { + background-position: -120px -144px; +} +.icon-hand-right { + background-position: -144px -144px; +} +.icon-hand-left { + background-position: -168px -144px; +} +.icon-hand-up { + background-position: -192px -144px; +} +.icon-hand-down { + background-position: -216px -144px; +} +.icon-circle-arrow-right { + background-position: -240px -144px; +} +.icon-circle-arrow-left { + background-position: -264px -144px; +} +.icon-circle-arrow-up { + background-position: -288px -144px; +} +.icon-circle-arrow-down { + background-position: -312px -144px; +} +.icon-globe { + background-position: -336px -144px; +} +.icon-wrench { + background-position: -360px -144px; +} +.icon-tasks { + background-position: -384px -144px; +} +.icon-filter { + background-position: -408px -144px; +} +.icon-briefcase { + background-position: -432px -144px; +} +.icon-fullscreen { + background-position: -456px -144px; +} .dropup, .dropdown { position: relative; diff --git a/docs/base-css.html b/docs/base-css.html index 578b9ff27..8e6eea746 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1445,15 +1445,15 @@ For example, <code>section</code> should be wrapped as inline.
  • icon-inbox
  • icon-play-circle
  • icon-repeat
  • - -
    -
    -
    • icon-refresh
    • icon-list-alt
    • icon-lock
    • icon-flag
    • icon-headphones
    • +
    +
    +
    +
    • icon-volume-off
    • icon-volume-down
    • icon-volume-up
    • @@ -1479,10 +1479,6 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-indent-right
    • icon-facetime-video
    • icon-picture
    • -
    -
    -
    -
    • icon-pencil
    • icon-map-marker
    • icon-adjust
    • @@ -1493,6 +1489,10 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-move
    • icon-step-backward
    • icon-fast-backward
    • +
    +
    +
    +
    • icon-backward
    • icon-play
    • icon-pause
    • @@ -1513,10 +1513,6 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-remove-circle
    • icon-ok-circle
    • icon-ban-circle
    • -
    -
    -
    -
    • icon-arrow-left
    • icon-arrow-right
    • icon-arrow-up
    • @@ -1532,6 +1528,10 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-leaf
    • icon-fire
    • icon-eye-open
    • +
    +
    +
    +
    • icon-eye-close
    • icon-warning-sign
    • icon-plane
    • @@ -1547,6 +1547,26 @@ For example, <code>section</code> should be wrapped as inline.
    • icon-folder-open
    • icon-resize-vertical
    • icon-resize-horizontal
    • +
    • icon-hdd
    • +
    • icon-bullhorn
    • +
    • icon-bell
    • +
    • icon-certificate
    • +
    • icon-thumbs-up
    • +
    • icon-thumbs-down
    • +
    • icon-hand-right
    • +
    • icon-hand-left
    • +
    • icon-hand-up
    • +
    • icon-hand-down
    • +
    • icon-circle-arrow-right
    • +
    • icon-circle-arrow-left
    • +
    • icon-circle-arrow-up
    • +
    • icon-circle-arrow-down
    • +
    • icon-globe
    • +
    • icon-wrench
    • +
    • icon-tasks
    • +
    • icon-filter
    • +
    • icon-briefcase
    • +
    • icon-fullscreen
    diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index b61e77ac5..200cd41c4 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1368,15 +1368,15 @@
  • icon-inbox
  • icon-play-circle
  • icon-repeat
  • - - -
    -
    • icon-refresh
    • icon-list-alt
    • icon-lock
    • icon-flag
    • icon-headphones
    • +
    +
    +
    +
    • icon-volume-off
    • icon-volume-down
    • icon-volume-up
    • @@ -1402,10 +1402,6 @@
    • icon-indent-right
    • icon-facetime-video
    • icon-picture
    • -
    -
    -
    -
    • icon-pencil
    • icon-map-marker
    • icon-adjust
    • @@ -1416,6 +1412,10 @@
    • icon-move
    • icon-step-backward
    • icon-fast-backward
    • +
    +
    +
    +
    • icon-backward
    • icon-play
    • icon-pause
    • @@ -1436,10 +1436,6 @@
    • icon-remove-circle
    • icon-ok-circle
    • icon-ban-circle
    • -
    -
    -
    -
    • icon-arrow-left
    • icon-arrow-right
    • icon-arrow-up
    • @@ -1455,6 +1451,10 @@
    • icon-leaf
    • icon-fire
    • icon-eye-open
    • +
    +
    +
    +
    • icon-eye-close
    • icon-warning-sign
    • icon-plane
    • @@ -1470,6 +1470,26 @@
    • icon-folder-open
    • icon-resize-vertical
    • icon-resize-horizontal
    • +
    • icon-hdd
    • +
    • icon-bullhorn
    • +
    • icon-bell
    • +
    • icon-certificate
    • +
    • icon-thumbs-up
    • +
    • icon-thumbs-down
    • +
    • icon-hand-right
    • +
    • icon-hand-left
    • +
    • icon-hand-up
    • +
    • icon-hand-down
    • +
    • icon-circle-arrow-right
    • +
    • icon-circle-arrow-left
    • +
    • icon-circle-arrow-up
    • +
    • icon-circle-arrow-down
    • +
    • icon-globe
    • +
    • icon-wrench
    • +
    • icon-tasks
    • +
    • icon-filter
    • +
    • icon-briefcase
    • +
    • icon-fullscreen
    -- cgit v1.2.3 From 34132f0e890cacc8eb2dc0cf2ce3132986f14adf Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 17:19:00 -0700 Subject: rebuild --- docs/assets/bootstrap.zip | Bin 71274 -> 71274 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index b58dcf28c..267b9eab6 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From 82267d48ffb522ed4c9cb491660f7d1c8a9e0236 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 17:49:51 -0700 Subject: calling pause on a slide should actually pause it - even when hovering --- docs/assets/bootstrap.zip | Bin 71274 -> 71315 bytes docs/assets/js/bootstrap-carousel.js | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 267b9eab6..6e1a6f41c 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-carousel.js b/docs/assets/js/bootstrap-carousel.js index d1c3079e4..90f43a3eb 100644 --- a/docs/assets/js/bootstrap-carousel.js +++ b/docs/assets/js/bootstrap-carousel.js @@ -37,8 +37,10 @@ Carousel.prototype = { - cycle: function () { + cycle: function (e) { + if (!e) this.paused = false this.options.interval + && !this.paused && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) return this } @@ -64,7 +66,8 @@ return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) } - , pause: function () { + , pause: function (e) { + if (!e) this.paused = true clearInterval(this.interval) this.interval = null return this -- cgit v1.2.3 From 4bcb89946bf556ff524a67c82e079f43b045e747 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:18:11 -0700 Subject: merge in #2684, offset on the .makeColumn mixin --- docs/assets/bootstrap.zip | Bin 71315 -> 71315 bytes docs/less.html | 10 ++++++++++ docs/templates/pages/less.mustache | 10 ++++++++++ 3 files changed, 20 insertions(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 6e1a6f41c..8c0bb2cd8 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/less.html b/docs/less.html index 4fe26af56..3fecd1ade 100644 --- a/docs/less.html +++ b/docs/less.html @@ -812,6 +812,16 @@ @fluidGridColumnWidth, @fluidGridGutterWidth Generate a precent grid system with n columns and x % wide gutter + + #grid > .input() + @gridColumnWidth, @gridGutterWidth + Generate the pixel grid system for input elements, accounting for padding and borders + + + .makeColumn + @columns: 1, @offset: 0 + Turn any div into a grid column without the .span* classes +

    CSS3 properties

    diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache index 5345cbf97..7698dd290 100644 --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@ -735,6 +735,16 @@ @fluidGridColumnWidth, @fluidGridGutterWidth {{_i}}Generate a precent grid system with n columns and x % wide gutter{{/i}} + + #grid > .input() + @gridColumnWidth, @gridGutterWidth + {{_i}}Generate the pixel grid system for input elements, accounting for padding and borders{{/i}} + + + .makeColumn + @columns: 1, @offset: 0 + {{_i}}Turn any div into a grid column without the .span* classes{{/i}} +

    {{_i}}CSS3 properties{{/i}}

    -- cgit v1.2.3 From def7ae7798916f105ba489b617cfa2b4af16afa4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:30:43 -0700 Subject: bump version on docs homepage to 2.0.3 --- docs/assets/bootstrap.zip | Bin 71315 -> 71315 bytes docs/index.html | 2 +- docs/templates/pages/index.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 8c0bb2cd8..14b37054f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/index.html b/docs/index.html index 1f526fcdb..19e6a676a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -83,7 +83,7 @@

    Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.

    View project on GitHub - Download Bootstrap (v2.0.2) + Download Bootstrap (v2.0.3)

    diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index bef11b810..41a89e07a 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -6,7 +6,7 @@

    {{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}

    {{_i}}View project on GitHub{{/i}} - {{_i}}Download Bootstrap (v2.0.2){{/i}} + {{_i}}Download Bootstrap (v2.0.3){{/i}}

    -- cgit v1.2.3 From fc7ae48c95af554cb36e4b52482c262ac34aa47f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 18:47:27 -0700 Subject: fix #1823: styles of tabs within other tabs resolved --- docs/assets/bootstrap.zip | Bin 71315 -> 71319 bytes docs/assets/css/bootstrap.css | 46 +++++++++++++++++++++--------------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 14b37054f..2be92692f 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c593d5669..b5ff8ee41 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2856,9 +2856,9 @@ input[type="submit"].btn.btn-mini { .tab-content { overflow: auto; } -.tabs-below .nav-tabs, -.tabs-right .nav-tabs, -.tabs-left .nav-tabs { +.tabs-below > .nav-tabs, +.tabs-right > .nav-tabs, +.tabs-left > .nav-tabs { border-bottom: 0; } .tab-content > .tab-pane, @@ -2869,71 +2869,71 @@ input[type="submit"].btn.btn-mini { .pill-content > .active { display: block; } -.tabs-below .nav-tabs { +.tabs-below > .nav-tabs { border-top: 1px solid #ddd; } -.tabs-below .nav-tabs > li { +.tabs-below > .nav-tabs > li { margin-top: -1px; margin-bottom: 0; } -.tabs-below .nav-tabs > li > a { +.tabs-below > .nav-tabs > li > a { -webkit-border-radius: 0 0 4px 4px; -moz-border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px; } -.tabs-below .nav-tabs > li > a:hover { +.tabs-below > .nav-tabs > li > a:hover { border-bottom-color: transparent; border-top-color: #ddd; } -.tabs-below .nav-tabs .active > a, -.tabs-below .nav-tabs .active > a:hover { +.tabs-below > .nav-tabs > .active > a, +.tabs-below > .nav-tabs > .active > a:hover { border-color: transparent #ddd #ddd #ddd; } -.tabs-left .nav-tabs > li, -.tabs-right .nav-tabs > li { +.tabs-left > .nav-tabs > li, +.tabs-right > .nav-tabs > li { float: none; } -.tabs-left .nav-tabs > li > a, -.tabs-right .nav-tabs > li > a { +.tabs-left > .nav-tabs > li > a, +.tabs-right > .nav-tabs > li > a { min-width: 74px; margin-right: 0; margin-bottom: 3px; } -.tabs-left .nav-tabs { +.tabs-left > .nav-tabs { float: left; margin-right: 19px; border-right: 1px solid #ddd; } -.tabs-left .nav-tabs > li > a { +.tabs-left > .nav-tabs > li > a { margin-right: -1px; -webkit-border-radius: 4px 0 0 4px; -moz-border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px; } -.tabs-left .nav-tabs > li > a:hover { +.tabs-left > .nav-tabs > li > a:hover { border-color: #eeeeee #dddddd #eeeeee #eeeeee; } -.tabs-left .nav-tabs .active > a, -.tabs-left .nav-tabs .active > a:hover { +.tabs-left > .nav-tabs .active > a, +.tabs-left > .nav-tabs .active > a:hover { border-color: #ddd transparent #ddd #ddd; *border-right-color: #ffffff; } -.tabs-right .nav-tabs { +.tabs-right > .nav-tabs { float: right; margin-left: 19px; border-left: 1px solid #ddd; } -.tabs-right .nav-tabs > li > a { +.tabs-right > .nav-tabs > li > a { margin-left: -1px; -webkit-border-radius: 0 4px 4px 0; -moz-border-radius: 0 4px 4px 0; border-radius: 0 4px 4px 0; } -.tabs-right .nav-tabs > li > a:hover { +.tabs-right > .nav-tabs > li > a:hover { border-color: #eeeeee #eeeeee #eeeeee #dddddd; } -.tabs-right .nav-tabs .active > a, -.tabs-right .nav-tabs .active > a:hover { +.tabs-right > .nav-tabs .active > a, +.tabs-right > .nav-tabs .active > a:hover { border-color: #ddd #ddd #ddd transparent; *border-left-color: #ffffff; } -- cgit v1.2.3 From 490eb1bd16177f951b7c66c364d2eee6a6288a5d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 20:56:50 -0700 Subject: fix #3068: compile after changing comment --- docs/assets/bootstrap.zip | Bin 71319 -> 71251 bytes docs/assets/css/bootstrap.css | 2 -- 2 files changed, 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 2be92692f..0fd350f5b 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b5ff8ee41..131e6671e 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1205,8 +1205,6 @@ legend + .control-group { } .form-horizontal .controls { margin-left: 160px; - /* Super jank IE7 fix to ensure the inputs in .input-append and input-prepend don't inherit the margin of the parent, in this case .controls */ - *display: inline-block; *margin-left: 0; *padding-left: 20px; -- cgit v1.2.3 From c7dc4cc573c61306ae849d316f432160b16a2099 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 22:43:36 -0700 Subject: change position of var in dropdown + cleanup makefile vars --- docs/assets/bootstrap.zip | Bin 71251 -> 71289 bytes docs/assets/js/bootstrap-dropdown.js | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 0fd350f5b..58fe79b25 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index f27f4d2f4..d856ba6ec 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -40,10 +40,14 @@ , toggle: function (e) { var $this = $(this) - , selector = $this.attr('data-target') , $parent + , selector , isActive + if ($this.is('.disabled, :disabled')) return + + selector = $this.attr('data-target') + if (!selector) { selector = $this.attr('href') selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 -- cgit v1.2.3 From a6f27ebed440919aac6f62e73e6748bfecd00ab9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 23:06:00 -0700 Subject: ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous --- docs/assets/bootstrap.zip | Bin 71456 -> 71446 bytes docs/assets/css/bootstrap-responsive.css | 48 +++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 47b4749c9..4aae825c5 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index eb85ca6c0..57e32da35 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -622,28 +622,28 @@ padding-right: 10px; margin: 0 0 0 -5px; } - .navbar .nav-collapse { + .nav-collapse { clear: both; } - .navbar .nav-collapse .nav { + .nav-collapse .nav { float: none; margin: 0 0 9px; } - .navbar .nav-collapse .nav > li { + .nav-collapse .nav > li { float: none; } - .navbar .nav-collapse .nav > li > a { + .nav-collapse .nav > li > a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > .divider-vertical { + .nav-collapse .nav > .divider-vertical { display: none; } - .navbar .nav-collapse .nav .nav-header { + .nav-collapse .nav .nav-header { color: #999999; text-shadow: none; } - .navbar .nav-collapse .nav > li > a, - .navbar .nav-collapse .dropdown-menu a { + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { padding: 6px 15px; font-weight: bold; color: #999999; @@ -651,25 +651,25 @@ -moz-border-radius: 3px; border-radius: 3px; } - .navbar .nav-collapse .btn { + .nav-collapse .btn { padding: 4px 10px 4px; font-weight: normal; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; } - .navbar .nav-collapse .dropdown-menu li + li a { + .nav-collapse .dropdown-menu li + li a { margin-bottom: 2px; } - .navbar .nav-collapse .nav > li > a:hover, - .navbar .nav-collapse .dropdown-menu a:hover { + .nav-collapse .nav > li > a:hover, + .nav-collapse .dropdown-menu a:hover { background-color: #222222; } - .navbar .nav-collapse.in .btn-group { + .nav-collapse.in .btn-group { margin-top: 5px; padding: 0; } - .navbar .nav-collapse .dropdown-menu { + .nav-collapse .dropdown-menu { position: static; top: auto; left: auto; @@ -687,11 +687,11 @@ -moz-box-shadow: none; box-shadow: none; } - .navbar .nav-collapse .dropdown-menu:before, - .navbar .nav-collapse .dropdown-menu:after { + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { display: none; } - .navbar .nav-collapse .dropdown-menu .divider { + .nav-collapse .dropdown-menu .divider { display: none; } .nav-collapse .navbar-form, @@ -709,18 +709,18 @@ float: none; margin-left: 0; } - .navbar-static .navbar-inner { - padding-left: 10px; - padding-right: 10px; - } - .navbar .btn-navbar { - display: block; - } .nav-collapse, .nav-collapse.collapse { overflow: hidden; height: 0; } + .navbar .btn-navbar { + display: block; + } + .navbar-static .navbar-inner { + padding-left: 10px; + padding-right: 10px; + } } @media (min-width: 980px) { .nav-collapse.collapse { -- cgit v1.2.3 From cf4924764c94cc7c5f05cef60cc8a68199faf3f2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:11:19 -0700 Subject: rebuild with tooltip formatting change --- docs/assets/bootstrap.zip | Bin 71484 -> 71463 bytes docs/assets/js/bootstrap-tooltip.js | 36 ++++++++++++++---------------------- 2 files changed, 14 insertions(+), 22 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4e3217a76..976986b06 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-tooltip.js b/docs/assets/js/bootstrap-tooltip.js index 454e7a448..af2e58968 100644 --- a/docs/assets/js/bootstrap-tooltip.js +++ b/docs/assets/js/bootstrap-tooltip.js @@ -72,33 +72,25 @@ , enter: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (!self.options.delay || !self.options.delay.show) { - self.show() - } else { - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') { - self.show() - } - }, self.options.delay.show) - } + if (!self.options.delay || !self.options.delay.show) return self.show() + + clearTimeout(this.timeout) + self.hoverState = 'in' + this.timeout = setTimeout(function() { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) } , leave: function (e) { var self = $(e.currentTarget)[this.type](this._options).data(this.type) - if (!self.options.delay || !self.options.delay.hide) { - self.hide() - } else { - clearTimeout(this.timeout) - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') { - self.hide() - } - }, self.options.delay.hide) - } + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + clearTimeout(this.timeout) + self.hoverState = 'out' + this.timeout = setTimeout(function() { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) } , show: function () { -- cgit v1.2.3 From 9e9be2dc0db5148e14a9fe2164dafd79c7dd71cd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Apr 2012 23:19:42 -0700 Subject: fix #2989: clear .checkbox/.radio floats --- docs/assets/bootstrap.zip | Bin 71484 -> 71497 bytes docs/assets/css/bootstrap.css | 1 + 2 files changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 4e3217a76..e04b76cb5 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index dc14159fb..0218e595b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -729,6 +729,7 @@ input[type="hidden"] { } .radio, .checkbox { + overflow: auto; padding-left: 18px; } .radio input[type="radio"], -- cgit v1.2.3 From 1ca1ef94ee80b8c5fa5f2a1e908a8d00fdfdf268 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:24:19 -0700 Subject: fix opera bug \o/ !!!! #1776 --- docs/assets/bootstrap.zip | Bin 71463 -> 71466 bytes docs/assets/js/bootstrap-scrollspy.js | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 976986b06..f099f408a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index 3dee609c7..f0400813f 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -94,12 +94,11 @@ this.activeTarget = target - this.$body - .find(this.selector).parent('.active') + $(this.selector) + .parent('.active') .removeClass('active') - active = this.$body - .find(this.selector + '[href="' + target + '"]') + active = $(this.selector + '[href="' + target + '"]') .parent('li') .addClass('active') -- cgit v1.2.3 From be0efcfcfca603bc65484464e0aeaf7b2fc145c2 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:38:11 -0700 Subject: whitespace --- docs/assets/bootstrap.zip | Bin 71466 -> 71464 bytes docs/assets/js/bootstrap-scrollspy.js | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index f099f408a..930dd4633 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/js/bootstrap-scrollspy.js b/docs/assets/js/bootstrap-scrollspy.js index f0400813f..c67f1c8aa 100644 --- a/docs/assets/js/bootstrap-scrollspy.js +++ b/docs/assets/js/bootstrap-scrollspy.js @@ -102,7 +102,7 @@ .parent('li') .addClass('active') - if ( active.parent('.dropdown-menu') ) { + if (active.parent('.dropdown-menu')) { active = active.closest('li.dropdown').addClass('active') } -- cgit v1.2.3 From c262ead6ed63408bbe062187fd4aa8aeb5da2e70 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sat, 14 Apr 2012 23:51:08 -0700 Subject: change comments to preserve for yui --- docs/assets/bootstrap.zip | Bin 71464 -> 71464 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 930dd4633..fd0862399 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ -- cgit v1.2.3 From a4c2332eb1b5b4baf4309463ab88141d82c88c04 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Apr 2012 00:06:11 -0700 Subject: move js tooltip link --- docs/assets/bootstrap.zip | Bin 71497 -> 71497 bytes docs/javascript.html | 2 +- docs/templates/pages/javascript.mustache | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index e04b76cb5..b56fe6e2a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/javascript.html b/docs/javascript.html index ce495414f..6f3cd9153 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -767,7 +767,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    Example use of Tooltips

    Hover over the links below to see tooltips:

    -

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral. +

    Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.


    diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 3792279ef..e0f3822e0 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -690,7 +690,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {

    {{_i}}Example use of Tooltips{{/i}}

    {{_i}}Hover over the links below to see tooltips:{{/i}}

    -

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}} +

    {{_i}}Tight pants next level keffiyeh you probably haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel have a terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A really ironic artisan whatever keytar, scenester farm-to-table banksy Austin twitter handle freegan cred raw denim single-origin coffee viral.{{/i}}


    -- cgit v1.2.3 From 2a6894d834c0866e2bbd3d7aa7d824b4355e61f7 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 00:16:09 -0700 Subject: simplify make - move zipping to gh-pages only --- docs/assets/bootstrap.zip | Bin 71464 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 docs/assets/bootstrap.zip (limited to 'docs') diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip deleted file mode 100644 index fd0862399..000000000 Binary files a/docs/assets/bootstrap.zip and /dev/null differ -- cgit v1.2.3 From 13e4d1d5ac90484c09ecb1a98e540309d043a6f7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Apr 2012 00:35:30 -0700 Subject: fix #2990: text wrapping in .uneditable-input --- docs/assets/css/bootstrap.css | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 0218e595b..e51c74e07 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -977,6 +977,8 @@ select:focus:required:invalid:focus { -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); cursor: not-allowed; + overflow: hidden; + white-space: nowrap; } :-moz-placeholder { color: #999999; -- cgit v1.2.3 From 0b8042656fc52600e18fb1c7f54dbbe8a284e737 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 16:15:32 -0700 Subject: fixes #2941 + whitespace in collapse --- docs/assets/js/bootstrap-alert.js | 4 ++-- docs/assets/js/bootstrap-collapse.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/bootstrap-alert.js b/docs/assets/js/bootstrap-alert.js index 167a57f84..56174955b 100644 --- a/docs/assets/js/bootstrap-alert.js +++ b/docs/assets/js/bootstrap-alert.js @@ -27,7 +27,7 @@ * ====================== */ var dismiss = '[data-dismiss="alert"]' - , Alert = function ( el ) { + , Alert = function (el) { $(el).on('click', dismiss, this.close) } @@ -68,7 +68,7 @@ /* ALERT PLUGIN DEFINITION * ======================= */ - $.fn.alert = function ( option ) { + $.fn.alert = function (option) { return this.each(function () { var $this = $(this) , data = $this.data('alert') diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js index 30e139cf8..41e097df3 100644 --- a/docs/assets/js/bootstrap-collapse.js +++ b/docs/assets/js/bootstrap-collapse.js @@ -60,6 +60,7 @@ if (actives && actives.length) { hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return actives.collapse('hide') hasData || actives.data('collapse', null) } -- cgit v1.2.3 From 6cf9906a60faa17c0463932c761b8280e9dce63c Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Sun, 15 Apr 2012 17:03:33 -0700 Subject: build bootstrap.js and bootstrap.min.js into docs --- docs/assets/js/bootstrap.js | 1813 +++++++++++++++++++++++++++++++++++++++ docs/assets/js/bootstrap.min.js | 6 + 2 files changed, 1819 insertions(+) create mode 100644 docs/assets/js/bootstrap.js create mode 100644 docs/assets/js/bootstrap.min.js (limited to 'docs') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js new file mode 100644 index 000000000..448d97731 --- /dev/null +++ b/docs/assets/js/bootstrap.js @@ -0,0 +1,1813 @@ +/* =================================================== + * bootstrap-transition.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#transitions + * =================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + $(function () { + + "use strict"; // jshint ;_; + + + /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) + * ======================================================= */ + + $.support.transition = (function () { + + var transitionEnd = (function () { + + var el = document.createElement('bootstrap') + , transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd' + , 'msTransition' : 'MSTransitionEnd' + , 'transition' : 'transitionend' + } + , name + + for (name in transEndEventNames){ + if (el.style[name] !== undefined) { + return transEndEventNames[name] + } + } + + }()) + + return transitionEnd && { + end: transitionEnd + } + + })() + + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-alert.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* ALERT CLASS DEFINITION + * ====================== */ + + var dismiss = '[data-dismiss="alert"]' + , Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + , selector = $this.attr('data-target') + , $parent + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + + e && e.preventDefault() + + $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) + + $parent.trigger(e = $.Event('close')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent + .trigger('closed') + .remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } + + + /* ALERT PLUGIN DEFINITION + * ======================= */ + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('alert') + if (!data) $this.data('alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + /* ALERT DATA-API + * ============== */ + + $(function () { + $('body').on('click.alert.data-api', dismiss, Alert.prototype.close) + }) + +}(window.jQuery);/* ============================================================ + * bootstrap-button.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#buttons + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* BUTTON PUBLIC CLASS DEFINITION + * ============================== */ + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.button.defaults, options) + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + , $el = this.$element + , data = $el.data() + , val = $el.is('input') ? 'val' : 'html' + + state = state + 'Text' + data.resetText || $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d) + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.parent('[data-toggle="buttons-radio"]') + + $parent && $parent + .find('.active') + .removeClass('active') + + this.$element.toggleClass('active') + } + + + /* BUTTON PLUGIN DEFINITION + * ======================== */ + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('button') + , options = typeof option == 'object' && option + if (!data) $this.data('button', (data = new Button(this, options))) + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.defaults = { + loadingText: 'loading...' + } + + $.fn.button.Constructor = Button + + + /* BUTTON DATA-API + * =============== */ + + $(function () { + $('body').on('click.button.data-api', '[data-toggle^=button]', function ( e ) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + }) + }) + +}(window.jQuery);/* ========================================================== + * bootstrap-carousel.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#carousel + * ========================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================== */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* CAROUSEL CLASS DEFINITION + * ========================= */ + + var Carousel = function (element, options) { + this.$element = $(element) + this.options = options + this.options.slide && this.slide(this.options.slide) + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.prototype = { + + cycle: function (e) { + if (!e) this.paused = false + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + return this + } + + , to: function (pos) { + var $active = this.$element.find('.active') + , children = $active.parent().children() + , activePos = children.index($active) + , that = this + + if (pos > (children.length - 1) || pos < 0) return + + if (this.sliding) { + return this.$element.one('slid', function () { + that.to(pos) + }) + } + + if (activePos == pos) { + return this.pause().cycle() + } + + return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos])) + } + + , pause: function (e) { + if (!e) this.paused = true + clearInterval(this.interval) + this.interval = null + return this + } + + , next: function () { + if (this.sliding) return + return this.slide('next') + } + + , prev: function () { + if (this.sliding) return + return this.slide('prev') + } + + , slide: function (type, next) { + var $active = this.$element.find('.active') + , $next = next || $active[type]() + , isCycling = this.interval + , direction = type == 'next' ? 'left' : 'right' + , fallback = type == 'next' ? 'first' : 'last' + , that = this + , e = $.Event('slide') + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + if ($next.hasClass('active')) return + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + } + + + /* CAROUSEL PLUGIN DEFINITION + * ========================== */ + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('carousel') + , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) + if (!data) $this.data('carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (typeof option == 'string' || (option = options.slide)) data[option]() + else if (options.interval) data.cycle() + }) + } + + $.fn.carousel.defaults = { + interval: 5000 + , pause: 'hover' + } + + $.fn.carousel.Constructor = Carousel + + + /* CAROUSEL DATA-API + * ================= */ + + $(function () { + $('body').on('click.carousel.data-api', '[data-slide]', function ( e ) { + var $this = $(this), href + , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + , options = !$target.data('modal') && $.extend({}, $target.data(), $this.data()) + $target.carousel(options) + e.preventDefault() + }) + }) + +}(window.jQuery);/* ============================================================= + * bootstrap-collapse.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* COLLAPSE PUBLIC CLASS DEFINITION + * ================================ */ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.collapse.defaults, options) + + if (this.options.parent) { + this.$parent = $(this.options.parent) + } + + this.options.toggle && this.toggle() + } + + Collapse.prototype = { + + constructor: Collapse + + , dimension: function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + , show: function () { + var dimension + , scroll + , actives + , hasData + + if (this.transitioning) return + + dimension = this.dimension() + scroll = $.camelCase(['scroll', dimension].join('-')) + actives = this.$parent && this.$parent.find('> .accordion-group > .in') + + if (actives && actives.length) { + hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', $.Event('show'), 'shown') + this.$element[dimension](this.$element[0][scroll]) + } + + , hide: function () { + var dimension + if (this.transitioning) return + dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide'), 'hidden') + this.$element[dimension](0) + } + + , reset: function (size) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + + return this + } + + , transition: function (method, startEvent, completeEvent) { + var that = this + , complete = function () { + if (startEvent == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } + + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + + this.transitioning = 1 + + this.$element[method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + , toggle: function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + } + + + /* COLLAPSIBLE PLUGIN DEFINITION + * ============================== */ + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('collapse') + , options = typeof option == 'object' && option + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.defaults = { + toggle: true + } + + $.fn.collapse.Constructor = Collapse + + + /* COLLAPSIBLE DATA-API + * ==================== */ + + $(function () { + $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) { + var $this = $(this), href + , target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + , option = $(target).data('collapse') ? 'toggle' : $this.data() + $(target).collapse(option) + }) + }) + +}(window.jQuery);/* ============================================================ + * bootstrap-dropdown.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ============================================================ + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* DROPDOWN CLASS DEFINITION + * ========================= */ + + var toggle = '[data-toggle="dropdown"]' + , Dropdown = function (element) { + var $el = $(element).on('click.dropdown.data-api', this.toggle) + $('html').on('click.dropdown.data-api', function () { + $el.parent().removeClass('open') + }) + } + + Dropdown.prototype = { + + constructor: Dropdown + + , toggle: function (e) { + var $this = $(this) + , $parent + , selector + , isActive + + if ($this.is('.disabled, :disabled')) return + + selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + $parent = $(selector) + $parent.length || ($parent = $this.parent()) + + isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) $parent.toggleClass('open') + + return false + } + + } + + function clearMenus() { + $(toggle).parent().removeClass('open') + } + + + /* DROPDOWN PLUGIN DEFINITION + * ========================== */ + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('dropdown') + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + /* APPLY TO STANDARD DROPDOWN ELEMENTS + * =================================== */ + + $(function () { + $('html').on('click.dropdown.data-api', clearMenus) + $('body') + .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) + }) + +}(window.jQuery);/* ========================================================= + * bootstrap-modal.js v2.0.2 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ========================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================= */ + + +!function ($) { + + "use strict"; // jshint ;_; + + + /* MODAL CLASS DEFINITION + * ====================== */ + + var Modal = function (content, options) { + this.options = options + this.$element = $(content) + .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + } + + Modal.prototype = { + + constructor: Modal + + , toggle: function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + , show: function () { + var that = this + , e = $.Event('show') + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + $('body').addClass('modal-open') + + this.isShown = true + + escape.call(this) + backdrop.call(this, function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) //don't move modals dom position + } + + that.$element + .show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element.addClass('in') + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) : + that.$element.trigger('shown') + + }) + } + + , hide: function (e) { + e && e.preventDefault() + + var that = this + + e = $.Event('hide') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + $('body').removeClass('modal-open') + + escape.call(this) + + this.$element.removeClass('in') + + $.support.transition && this.$element.hasClass('fade') ? + hideWithTransition.call(this) : + hideModal.call(this) + } + + } + + + /* MODAL PRIVATE METHODS + * ===================== */ + + function hideWithTransition() { + var that = this + , timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + hideModal.call(that) + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + hideModal.call(that) + }) + } + + function hideModal(that) { + this.$element + .hide() + .trigger('hidden') + + backdrop.call(this) + } + + function backdrop(callback) { + var that = this + , animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
    diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 40b264d03..13c777a26 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -456,13 +456,13 @@ @media (max-width: 480px) { ... } // {{_i}}Landscape phone to portrait tablet{{/i}} - @media (max-width: 768px) { ... } + @media (max-width: 767px) { ... } // {{_i}}Portrait tablet to landscape and desktop{{/i}} - @media (min-width: 768px) and (max-width: 980px) { ... } + @media (min-width: 768px) and (max-width: 979px) { ... } // {{_i}}Large desktop{{/i}} - @media (min-width: 1200px) { .. } + @media (min-width: 1200px) { ... }
    -- cgit v1.2.3 From 47b6e6bd80040cdaa50c27cb7eb11881df679eee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Apr 2012 09:47:30 -0700 Subject: fix #3111, badge and label alignment with surrounding text --- docs/assets/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 00485499f..43bba2bee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3740,7 +3740,7 @@ a.thumbnail:hover { font-weight: bold; line-height: 14px; color: #ffffff; - vertical-align: middle; + vertical-align: baseline; white-space: nowrap; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; -- cgit v1.2.3 From 8f98c4fbf6085e613314892de5da871dce862b34 Mon Sep 17 00:00:00 2001 From: Jacob Thornton Date: Wed, 18 Apr 2012 13:15:13 -0700 Subject: offset -> position #3088 --- docs/assets/js/bootstrap-typeahead.js | 2 +- docs/assets/js/bootstrap.js | 2 +- docs/assets/js/bootstrap.min.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docs') diff --git a/docs/assets/js/bootstrap-typeahead.js b/docs/assets/js/bootstrap-typeahead.js index 4c562f753..429ea989b 100644 --- a/docs/assets/js/bootstrap-typeahead.js +++ b/docs/assets/js/bootstrap-typeahead.js @@ -56,7 +56,7 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index abcdbb1e4..c2cc64889 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1589,7 +1589,7 @@ } , show: function () { - var pos = $.extend({}, this.$element.offset(), { + var pos = $.extend({}, this.$element.position(), { height: this.$element[0].offsetHeight }) diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index 3677f8570..310995eca 100644 --- a/docs/assets/js/bootstrap.min.js +++ b/docs/assets/js/bootstrap.min.js @@ -3,4 +3,4 @@ * Copyright 2012 Twitter, Inc. * http://www.apache.org/licenses/LICENSE-2.0.txt */ -!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('