From f64fe29003159669404f8f5a7a20551fec263904 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 15:40:37 -0700 Subject: Move Glyphicons into their own repo Removes the icon fonts and associated docs and LESS code from the core repo and into twbs/bootstrap-glyphicons. --- docs/components.html | 314 --------------------------------------------------- 1 file changed, 314 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index b18fd2b64..e2a883705 100644 --- a/docs/components.html +++ b/docs/components.html @@ -6,320 +6,6 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na --- - -
- - -

Included glyphs

-

Bootstrap comes with all 160 of Glyphicons Halflings set, all available in font formats for easy coloring, sizing, and placement.

- - - -

Glyphicons attribution

-

Glyphicons Halflings are normally not available for free, but an arrangement between Bootstrap and the Glyphicons creator have made this possible at no cost to you as developers. As a thank you, we ask you to include an optional link back to Glyphicons whenever practical.

- - -

How to use

-

Add the appropriate class to any inline element. All icon classes are prefixed with glyphicon- for easy styling. To use, place the following code just about anywhere:

-{% highlight html %} - -{% endhighlight %} -

Want to change the icon color? Just change the color of the parent element.

-

When using beside strings of text, as in buttons or nav links, be sure to leave a space after the icon for proper spacing.

- - -

Icon examples

-

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

- -

Buttons

- -
Button group in a button toolbar
-
-
-
- - - - -
-
-
-{% highlight html %} -
-
- - - - -
-
-{% endhighlight %} - -
-

Accessibility

-

Keep in mind that using icons without any additional content means the icons are not represented to screen reader users.

-
- -
Dropdown in a button group
-
-
- User - - -
-
-{% highlight html %} - -{% endhighlight %} - -
Large button
-
- Star -
-{% highlight html %} - Star -{% endhighlight %} - -
Small button
-
- -
-{% highlight html %} - -{% endhighlight %} - - -

Navigation

- -{% highlight html %} - -{% endhighlight %} - -

Form fields

-
-
- -
-
- - -
-
-
-
-{% highlight html %} -
- -
-
- - -
-
-
-{% endhighlight %} - -
- - -- cgit v1.2.3 From 2fccf927c5320a4dfe3ad58b0a2752ed8f15354e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:00:38 -0700 Subject: Run make on last commit --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index e192672a0..012cf717b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -425,6 +425,7 @@ h6, .h4, .h5, .h6 { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-weight: 500; line-height: 1.1; } -- cgit v1.2.3 From 2aec6dae597b69502d09aec983598e5f955ca558 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:01:59 -0700 Subject: Fixes #7730: Better hiding of empty titles in popovers If the popover's title contains no text, hide it via JS. Previously was done via CSS's `:empty` property, but that doesn't work in IE8, so JS it is. /cc @fat becaue I probably did this wrong <3 --- docs/assets/css/bootstrap.css | 4 ---- docs/assets/js/bootstrap.js | 2 ++ docs/assets/js/bootstrap.min.js | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 012cf717b..3eb92c2b1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4376,10 +4376,6 @@ button.close { border-radius: 5px 5px 0 0; } -.popover-title:empty { - display: none; -} - .popover-content { padding: 9px 14px; } diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index 744b27676..2cbf1957c 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -1420,6 +1420,8 @@ $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.removeClass('fade top bottom left right in') + + $tip.find('.popover-title:empty').hide() } Popover.prototype.hasContent = function () { diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index 8703c8ae8..3117a381a 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(e){"use strict";function t(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var n in t)if(e.style[n]!==undefined)return{end:t[n]}}e(function(){e.support.transition=t()})}(window.jQuery),+function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed.bs.alert").remove()}var n=e(this),r=n.attr("data-target");r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));var i=e(r);t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close.bs.alert"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("bs.alert");i||r.data("bs.alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.bs.alert.data-api",t,n.prototype.close)}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r)};t.DEFAULTS={loadingText:"loading..."},t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.is("input")?"val":"html",i=n.data();e+="Text",i.resetText||n.data("resetText",n[r]()),n[r](i[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("bs.button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.bs.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),+function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.DEFAULTS={interval:5e3,pause:"hover"},t.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},t.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},t.prototype.to=function(t){var n=this,r=this.getActiveIndex();if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){n.to(t)}):r==t?this.pause().cycle():this.slide(t>r?"next":"prev",e(this.$items[t]))},t.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},t.prototype.next=function(){if(this.sliding)return;return this.slide("next")},t.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},t.prototype.slide=function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();var f=e.Event("slide.bs.carousel",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("bs.carousel"),s=e.extend({},t.DEFAULTS,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("bs.carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("bs.carousel").pause().to(o).cycle(),t.preventDefault()}),e(window).on("load",function(){e('[data-ride="carousel"]').each(function(){var t=e(this);t.carousel(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r),this.transitioning=null,this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.DEFAULTS={toggle:!0},t.prototype.dimension=function(){var e=this.$element.hasClass("width");return e?"width":"height"},t.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){var i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show.bs.collapse"),"shown.bs.collapse"),e.support.transition&&this.$element[t](this.$element[0][n])},t.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var t=this.dimension();this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide.bs.collapse"),"hidden"),this.$element[t](0)},t.prototype.reset=function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},t.prototype.transition=function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},t.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),+function(e){"use strict";function i(){e(t).remove(),e(n).each(function(t){var n=s(e(this));if(!n.hasClass("open"))return;n.trigger(t=e.Event("hide.bs.dropdown"));if(t.isDefaultPrevented())return;n.removeClass("open").trigger("hidden.bs.dropdown")})}function s(t){var n=t.attr("data-target");n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,""));var r=n&&e(n);return r&&r.length?r:t.parent()}var t=".dropdown-backdrop",n="[data-toggle=dropdown]",r=function(t){var n=e(t).on("click.bs.dropdown",this.toggle)};r.prototype.toggle=function(t){var n=e(this);if(n.is(".disabled, :disabled"))return;var r=s(n),o=r.hasClass("open");i();if(!o){"ontouchstart"in document.documentElement&&e(' - + {% highlight html %} @@ -142,7 +142,7 @@ $('#myModal').on('show.bs.modal', function (e) { - + {% endhighlight %} @@ -186,7 +186,7 @@ $('#myModal').on('show.bs.modal', function (e) { - +
@@ -212,7 +212,7 @@ $('#myModal').on('show.bs.modal', function (e) { Save changes
- + {% endhighlight %} @@ -264,7 +264,7 @@ $('#myModal').on('show.bs.modal', function (e) { remote path false -

If a remote url is provided, content will be loaded via jQuery's load method and injected into the .modal-body. If you're using the data api, you may alternatively use the href tag to specify the remote source. An example of this is shown below:

+

If a remote URL is provided, content will be loaded via jQuery's load method and injected into the .modal-body. If you're using the data api, you may alternatively use the href tag to specify the remote source. An example of this is shown below:

{% highlight html %} Click me {% endhighlight %} @@ -310,7 +310,7 @@ $('#myModal').modal({ shown - This event is fired when the modal has been made visible to the user (will wait for css transitions to complete). + This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete). hide @@ -318,7 +318,7 @@ $('#myModal').modal({ hidden - This event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete). + This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete). @@ -773,13 +773,13 @@ $('#example').tooltip(options) animation boolean true - apply a css fade transition to the tooltip + apply a CSS fade transition to the tooltip html boolean false - Insert html into the tooltip. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks. + Insert HTML into the tooltip. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks. placement @@ -803,7 +803,7 @@ $('#example').tooltip(options) trigger string 'hover focus' - how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space seperated, trigger types. + how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types. delay @@ -820,7 +820,7 @@ $('#example').tooltip(options) string | false false -

Appends the tooltip to a specific element container: 'body'

+

Appends the tooltip to a specific element. Example: container: 'body'

@@ -951,13 +951,13 @@ $('#example').tooltip(options) animation boolean true - apply a css fade transition to the tooltip + apply a CSS fade transition to the tooltip html boolean false - Insert html into the popover. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks. + Insert HTML into the popover. If false, jQuery's text method will be used to insert content into the DOM. Use text if you're worried about XSS attacks. placement @@ -1106,7 +1106,7 @@ $('#example').tooltip(options) closed - This event is fired when the alert has been closed (will wait for css transitions to complete). + This event is fired when the alert has been closed (will wait for CSS transitions to complete). @@ -1379,7 +1379,7 @@ $('.nav-tabs').button()

Usage

Via data attributes

-

Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

+

Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a CSS selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

To add accordion-like group management to a collapsible control, add the data attribute data-parent="#selector". Refer to the demo to see this in action.

Via JavaScript

@@ -1451,7 +1451,7 @@ $('#myCollapsible').collapse({ shown - This event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete). + This event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete). hide @@ -1461,7 +1461,7 @@ $('#myCollapsible').collapse({ hidden - This event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete). + This event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete). -- cgit v1.2.3 From 274a3426576d7aef40bb2b760a3fc7a9bce95521 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 19:50:37 -0700 Subject: Docs: fix 1 typo; use in 1 place --- docs/css.html | 2 +- docs/customize.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/css.html b/docs/css.html index 2f7d74708..f73be9ac8 100644 --- a/docs/css.html +++ b/docs/css.html @@ -247,7 +247,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."

Need more examples?

-

We dive into more grid layouts in a separte page, free of chrome and documentation to better show you the power of the grid.

+

We dive into more grid layouts in a separate page, free of chrome and documentation to better show you the power of the grid.

More grid examples

diff --git a/docs/customize.html b/docs/customize.html index 19957867f..ed3363289 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -357,7 +357,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge

Heads up!

-

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

+

All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of jQuery to be included.

-- cgit v1.2.3 From 242d92e09c60396bad0837581a9692bf7abe8aea Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 20:18:30 -0700 Subject: Fix #8287 --- docs/components.html | 5 +++++ docs/css.html | 6 +++++- docs/javascript.html | 13 +++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 55f27cbc3..bbb2c0f55 100644 --- a/docs/components.html +++ b/docs/components.html @@ -482,6 +482,11 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na

Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with our buttons plugin.

+
+

Tooltips & popovers in button groups require special setting

+

When using tooltips or popovers on elements within a .btn-group, you'll have to specify the option container: 'body' to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).

+
+

Basic button group

Wrap a series of buttons with .btn in .btn-group.

diff --git a/docs/css.html b/docs/css.html index 2f7d74708..8e7b57d37 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1494,12 +1494,16 @@ For example, <section> should be wrapped as inline.

Adding on top of existing browser controls, Bootstrap includes other useful form components.

Input groups

-

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with a .add-on to prepend or append elements to an <input>.

+

Add text or buttons before, after, or on both sides of any text-based input. Use .input-group with an .add-on to prepend or append elements to an <input>.

Cross-browser compatibility

Avoid using <select> elements here as they cannot be fully styled in WebKit browsers.

+
+

Tooltips & popovers in input groups require special setting

+

When using tooltips or popovers on elements within an .input-group, you'll have to specify the option container: 'body' to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).

+
diff --git a/docs/javascript.html b/docs/javascript.html index 9a5a5b6f0..2580d9a6e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -744,9 +744,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
- -

Tooltips in input groups

-

When using tooltips and popovers with the Bootstrap input groups, you'll have to set the container (documented below) option to avoid unwanted side effects.

+
+

Tooltips in button groups and input groups require special setting

+

When using tooltips on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).

+

@@ -873,6 +874,10 @@ $('#example').tooltip(options)

Plugin dependency

Popovers require the tooltip plugin to be included in your version of Bootstrap.

+
+

Popovers in button groups and input groups require special setting

+

When using popovers on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).

+

Static popover

Four options are available: top, right, bottom, and left aligned.

@@ -1004,7 +1009,7 @@ $('#example').tooltip(options) string | false false -

Appends the popover to a specific element container: 'body'

+

Appends the popover to a specific element. Example: container: 'body'

-- cgit v1.2.3 From 2471b9d725d2452a10f802af5667509af7b7eb2e Mon Sep 17 00:00:00 2001 From: James Holland Date: Wed, 26 Jun 2013 08:27:12 -0400 Subject: typo: match doc text and example --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/components.html b/docs/components.html index 55f27cbc3..48c7411d0 100644 --- a/docs/components.html +++ b/docs/components.html @@ -942,7 +942,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na {% highlight html %} -

Going beyond light customizations and into visual overhauls is just as straightforward as the above custom button. For a site like Karma, which uses Bootstrap as a CSS reset with heavy modifications, more extensive work is involved, but well worth it in the end.

-
+

Alternate customization methods

While not recommended for folks new to Bootstrap, you may use one of two alternate methods for customization. The first is modifying the source .less files (making upgrades super difficult), and the second is mapping source LESS code to your own classes via mixins. For the time being, neither options are documented here.

diff --git a/docs/javascript.html b/docs/javascript.html index 9a5a5b6f0..9d9ecd1f8 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -14,8 +14,14 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug

Individual or compiled

-

Plugins can be included individually, or all at once. Do not attempt to include both. Both bootstrap.js and bootstrap.min.js contain all plugins in a single file.

-
+

Plugins can be included individually (using bootstrap-*.js original files, or all at once (using bootstrap.js or the minified bootstrap.min.js.

+ +
+

Do not attempt to include both.

+

Both bootstrap.js and bootstrap.min.js contain all plugins in a single file.

+
+ +

Plugin dependencies

Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs.

@@ -65,7 +71,7 @@ $('#myModal').on('show.bs.modal', function (e) { }) {% endhighlight %} -
+

Third-party libraries

Bootstrap does not officially support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the mailing list if you need help.

@@ -532,7 +538,7 @@ $('.dropdown-toggle').dropdown() $('#navbar-example').scrollspy() {% endhighlight %} -
+

Resolvable ID targets required

Navbar links must have resolvable id targets. For example, a <a href="#home">home</a> must correspond to something in the DOM like <div id="home"></div>.

@@ -825,7 +831,7 @@ $('#example').tooltip(options) -
+

Data attributes for individual tooltips

Options for individual tooltips can alternatively be specified through the use of data attributes, as explained above.

@@ -869,7 +875,7 @@ $('#example').tooltip(options)

Examples

Add small overlays of content, like those on the iPad, to any element for housing secondary information. Hover over the button to trigger the popover.

-
+

Plugin dependency

Popovers require the tooltip plugin to be included in your version of Bootstrap.

@@ -1009,7 +1015,7 @@ $('#example').tooltip(options) -
+

Data attributes for individual popovers

Options for individual popovers can alternatively be specified through the use of data attributes, as explained above.

@@ -1229,7 +1235,7 @@ $('.nav-tabs').button()

$().button('toggle')

Toggles push state. Gives the button the appearance that it has been activated.

-
+

Auto toggling

You can enable auto toggling of a button by using the data-toggle attribute.

@@ -1244,7 +1250,7 @@ $('.nav-tabs').button() {% endhighlight %} -
+

Cross-browser compatibility

Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".

@@ -1274,7 +1280,7 @@ $('.nav-tabs').button()

About

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

-
+

Plugin dependency

Collapse requires the transitions plugin to be included in your version of Bootstrap.

@@ -1541,7 +1547,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {

Optional captions

Add captions to your slides easily with the .carousel-caption element within any .item. Place just about any optional HTML within there and it will be automatically aligned and formatted.

-
+

Responsive visibility

Captions are hidden by default and will show up only with viewports greater than 768px wide.

@@ -1712,7 +1718,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
...
{% endhighlight %} -
+

Requires positioning

You must manage the position of a pinned element and the behavior of its immediate parent. Position is controlled by affix, affix-top, and affix-bottom. Remember to check for a potentially collapsed parent when the affix kicks in as it's removing content from the normal flow of the page.

-- cgit v1.2.3 From 94761c221648c0968328bee1fc5970ad7b481bea Mon Sep 17 00:00:00 2001 From: fat Date: Thu, 27 Jun 2013 18:47:35 -0700 Subject: use collapse in dropdown js example --- docs/assets/css/bootstrap.css | 5 +-- docs/javascript.html | 73 ++++++++++++++++++++++++------------------- 2 files changed, 41 insertions(+), 37 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 487d7eb2f..f2aefb773 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -691,8 +691,6 @@ pre { line-height: 1.428571429; word-break: break-all; word-wrap: break-word; - white-space: pre; - white-space: pre-wrap; background-color: #f5f5f5; border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); @@ -706,7 +704,6 @@ pre.prettyprint { pre code { padding: 0; color: inherit; - white-space: pre; white-space: pre-wrap; background-color: transparent; border: 0; @@ -1540,7 +1537,7 @@ textarea::-webkit-input-placeholder { // Move the options list down to align with labels .controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; // has to be padding because margin collaspes + padding-top: 5px; // has to be padding because margin collapses } */ diff --git a/docs/javascript.html b/docs/javascript.html index d1c987904..587592600 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -348,39 +348,46 @@ $('#myModal').on('hidden.bs.modal', function () { -- cgit v1.2.3 From e5a9a1f5ff12bd0aa0159db4f12f46dcadf08456 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:49:37 -0700 Subject: remove icons from sidenav --- docs/_includes/nav-components.html | 8 -------- 1 file changed, 8 deletions(-) (limited to 'docs') diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index 4f49d68b2..dd56cf399 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -1,11 +1,3 @@ -
  • - Glyphicons - -
  • Dropdowns
  • +
  • + Glyphicons +
  • Grid system {% endhighlight %} - - -

    Add an extra level of dropdown menus, appearing on hover like those of OS X, with some simple markup additions. Add .dropdown-submenu to any li in an existing dropdown menu for automatic styling.

    - -{% highlight html %} - -{% endhighlight %} -
  • -- cgit v1.2.3 From 88ece4fc5902f7dd9582fb4e5956062fe97af84c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 20:50:00 -0700 Subject: fixes #7961 a bit: adds css for extra tooltip placement options. /cc @fat you just need dat js prolly --- docs/assets/css/bootstrap.css | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index ec8af9204..bffe638ee 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3668,6 +3668,20 @@ button.close { border-width: 5px 5px 0; } +.tooltip.top-left .tooltip-arrow { + bottom: 0; + left: 5px; + border-top-color: rgba(0, 0, 0, 0.9); + border-width: 5px 5px 0; +} + +.tooltip.top-right .tooltip-arrow { + right: 5px; + bottom: 0; + border-top-color: rgba(0, 0, 0, 0.9); + border-width: 5px 5px 0; +} + .tooltip.right .tooltip-arrow { top: 50%; left: 0; @@ -3692,6 +3706,20 @@ button.close { border-width: 0 5px 5px; } +.tooltip.bottom-left .tooltip-arrow { + top: 0; + left: 5px; + border-bottom-color: rgba(0, 0, 0, 0.9); + border-width: 0 5px 5px; +} + +.tooltip.bottom-right .tooltip-arrow { + top: 0; + right: 5px; + border-bottom-color: rgba(0, 0, 0, 0.9); + border-width: 0 5px 5px; +} + .popover { position: absolute; top: 0; -- cgit v1.2.3 From 8e6d5be8e495dfcf8e2f46d2f40e6ff82e0eb987 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 23:26:04 -0700 Subject: update close button example display --- docs/assets/css/docs.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 8eeaea3b7..f07654a98 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -312,7 +312,7 @@ body { .bs-example > .well:last-child { margin-bottom: 0; } -.bs-example > .close { +.bs-example > p > .close { float: none; } -- cgit v1.2.3 From 1a09eada35259de198ffad56a460c6ffafe890a4 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Jun 2013 00:08:19 -0700 Subject: Run make on JS --- docs/assets/js/bootstrap.js | 3 +++ docs/assets/js/bootstrap.min.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js index c73b8e187..03888ac5f 100644 --- a/docs/assets/js/bootstrap.js +++ b/docs/assets/js/bootstrap.js @@ -603,7 +603,10 @@ || e.preventDefault() || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 var option = $(target).data('collapse') ? 'toggle' : $this.data() + var parent = $this.attr('data-parent') + var $parent = parent && $(parent) + if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed') $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') $(target).collapse(option) }) diff --git a/docs/assets/js/bootstrap.min.js b/docs/assets/js/bootstrap.min.js index 9ca9b6165..e35afa960 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(e){"use strict";function t(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var n in t)if(e.style[n]!==undefined)return{end:t[n]}}e(function(){e.support.transition=t()})}(window.jQuery),+function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed.bs.alert").remove()}var n=e(this),r=n.attr("data-target");r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));var i=e(r);t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close.bs.alert"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("bs.alert");i||r.data("bs.alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.bs.alert.data-api",t,n.prototype.close)}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r)};t.DEFAULTS={loadingText:"loading..."},t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.is("input")?"val":"html",i=n.data();e+="Text",i.resetText||n.data("resetText",n[r]()),n[r](i[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("bs.button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.bs.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),+function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.paused=this.sliding=this.interval=this.$active=this.$items=null,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.DEFAULTS={interval:5e3,pause:"hover"},t.prototype.cycle=function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},t.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},t.prototype.to=function(t){var n=this,r=this.getActiveIndex();if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){n.to(t)}):r==t?this.pause().cycle():this.slide(t>r?"next":"prev",e(this.$items[t]))},t.prototype.pause=function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},t.prototype.next=function(){if(this.sliding)return;return this.slide("next")},t.prototype.prev=function(){if(this.sliding)return;return this.slide("prev")},t.prototype.slide=function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u]();var f=e.Event("slide.bs.carousel",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("bs.carousel"),s=e.extend({},t.DEFAULTS,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("bs.carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("bs.carousel").pause().to(o).cycle(),t.preventDefault()}),e(window).on("load",function(){e('[data-ride="carousel"]').each(function(){var t=e(this);t.carousel(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.$element=e(n),this.options=e.extend({},t.DEFAULTS,r),this.transitioning=null,this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.DEFAULTS={toggle:!0},t.prototype.dimension=function(){var e=this.$element.hasClass("width");return e?"width":"height"},t.prototype.show=function(){if(this.transitioning||this.$element.hasClass("in"))return;var t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){var i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show.bs.collapse"),"shown.bs.collapse"),e.support.transition&&this.$element[t](this.$element[0][n])},t.prototype.hide=function(){if(this.transitioning||!this.$element.hasClass("in"))return;var t=this.dimension();this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide.bs.collapse"),"hidden"),this.$element[t](0)},t.prototype.reset=function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!=null?"addClass":"removeClass"]("collapse"),this},t.prototype.transition=function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},t.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),+function(e){"use strict";function i(){e(t).remove(),e(n).each(function(t){var n=s(e(this));if(!n.hasClass("open"))return;n.trigger(t=e.Event("hide.bs.dropdown"));if(t.isDefaultPrevented())return;n.removeClass("open").trigger("hidden.bs.dropdown")})}function s(t){var n=t.attr("data-target");n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,""));var r=n&&e(n);return r&&r.length?r:t.parent()}var t=".dropdown-backdrop",n="[data-toggle=dropdown]",r=function(t){var n=e(t).on("click.bs.dropdown",this.toggle)};r.prototype.toggle=function(t){var n=e(this);if(n.is(".disabled, :disabled"))return;var r=s(n),o=r.hasClass("open");i();if(!o){"ontouchstart"in document.documentElement&&e(' diff --git a/docs/examples/navbar.html b/docs/examples/navbar.html index f8b25482e..09dba0f23 100644 --- a/docs/examples/navbar.html +++ b/docs/examples/navbar.html @@ -60,7 +60,7 @@ title: Navbar template

    Navbar example

    This example is a quick exercise to illustrate how the default, static navbar and fixed to top navbar work. It includes the responsive CSS and HTML, so it also adapts to your viewport and device.

    - View navbar docs » + View navbar docs »

    -- cgit v1.2.3 From 02351c0589be66edcc2dc10bd059aeac55eb6163 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 29 Jun 2013 07:37:53 -0700 Subject: Remove references to fonts --- docs/getting-started.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/getting-started.html b/docs/getting-started.html index 718e8ed79..56e6cbc32 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -15,7 +15,7 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex

    There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.

    Download compiled CSS and JS

    -

    The fastest way to get started is to get the compiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source files are included.

    +

    The fastest way to get started is to get the compiled and minified versions of our CSS and JavaScript. No documentation or original source files are included.

    Download Bootstrap


    @@ -72,12 +72,6 @@ bootstrap/ ├── js/ │ ├── bootstrap.js │ ├── bootstrap.min.js -└── fonts/ - ├── glyphiconshalflings-regular.eot - ├── glyphiconshalflings-regular.otf - ├── glyphiconshalflings-regular.svg - ├── glyphiconshalflings-regular.ttf - └── glyphiconshalflings-regular.woff {% endhighlight %}

    This is the most basic form of Bootstrap: compiled files for quick drop-in usage in nearly any web project. We provide compiled CSS and JS (bootstrap.*), as well as compiled and minified CSS and JS (bootstrap.min.*). The image files are compressed using ImageOptim, a Mac app for compressing PNGs.

    -- cgit v1.2.3 From 6a20810ca4970a681bd34274851365af011694e3 Mon Sep 17 00:00:00 2001 From: Francis Brunelle Date: Sat, 29 Jun 2013 16:06:14 -0400 Subject: reset left padding for .media-list, .pagination and .pager --- docs/assets/css/bootstrap.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c76723b99..28f561a32 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3303,6 +3303,7 @@ button.close { .pagination { display: inline-block; + padding-left: 0; margin: 20px 0; border-radius: 4px; } @@ -3394,6 +3395,7 @@ button.close { } .pager { + padding-left: 0; margin: 20px 0; text-align: center; list-style: none; @@ -4019,7 +4021,7 @@ a.thumbnail:focus { } .media-list { - margin-left: 0; + padding-left: 0; list-style: none; } -- cgit v1.2.3 From fea69df80c3d304868d816a85a8b027b40a13f3d Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 1 Jul 2013 21:13:57 +0200 Subject: Fix responsive utilities for table elements This change prevents situations where specificity causes some rules to be overridden by the ones intended for mobile. * Added mixin `responsive-invisibility()` * Swapped out `display: none !important;` for new mixin --- docs/assets/css/bootstrap.css | 76 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 28f561a32..708ea42ea 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4578,14 +4578,41 @@ td.visible-sm { display: none !important; } +tr.visible-md { + display: none !important; +} + +th.visible-md, +td.visible-md { + display: none !important; +} + .visible-lg { display: none !important; } +tr.visible-lg { + display: none !important; +} + +th.visible-lg, +td.visible-lg { + display: none !important; +} + .hidden-sm { display: none !important; } +tr.hidden-sm { + display: none !important; +} + +th.hidden-sm, +td.hidden-sm { + display: none !important; +} + .hidden-md { display: block !important; } @@ -4616,6 +4643,13 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: block !important; } @@ -4629,6 +4663,13 @@ td.hidden-lg { .visible-lg { display: none !important; } + tr.visible-lg { + display: none !important; + } + th.visible-lg, + td.visible-lg { + display: none !important; + } .hidden-sm { display: block !important; } @@ -4642,6 +4683,13 @@ td.hidden-lg { .hidden-md { display: none !important; } + tr.hidden-md { + display: none !important; + } + th.hidden-md, + td.hidden-md { + display: none !important; + } .hidden-lg { display: block !important; } @@ -4658,9 +4706,23 @@ td.hidden-lg { .visible-sm { display: none !important; } + tr.visible-sm { + display: none !important; + } + th.visible-sm, + td.visible-sm { + display: none !important; + } .visible-md { display: none !important; } + tr.visible-md { + display: none !important; + } + th.visible-md, + td.visible-md { + display: none !important; + } .visible-lg { display: block !important; } @@ -4694,11 +4756,25 @@ td.hidden-lg { .hidden-lg { display: none !important; } + tr.hidden-lg { + display: none !important; + } + th.hidden-lg, + td.hidden-lg { + display: none !important; + } } .visible-print { display: none !important; } +tr.visible-print { + display: none !important; +} +th.visible-print, +td.visible-print { + display: none !important; +} @media print { .visible-print { -- cgit v1.2.3 From a27ecfccf301f8996d7ddf6bd6f7f46f358a5a31 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 17:32:07 -0700 Subject: Make more components mixin-friendly --- docs/assets/css/bootstrap.css | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index c76723b99..e721aaa80 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2326,6 +2326,11 @@ input[type="button"].btn-block { border-bottom-left-radius: 4px; } +.list-group-item > .badge { + float: right; + margin-right: -15px; +} + .list-group-item-heading { margin-top: 0; margin-bottom: 5px; @@ -2365,16 +2370,6 @@ a.list-group-item.active .list-group-item-text { color: #e1edf7; } -.list-group-item > .badge, -.list-group-item > .glyphicon-chevron-right { - float: right; - margin-right: -15px; -} - -.list-group-item > .glyphicon + .badge { - margin-right: 5px; -} - .panel { padding: 15px; margin-bottom: 20px; @@ -4279,9 +4274,6 @@ a.list-group-item.active > .badge, .accordion-heading .accordion-toggle { display: block; padding: 8px 15px; -} - -.accordion-toggle { cursor: pointer; } -- cgit v1.2.3 From c9df1db50221fe033a0b7bc216fa2de5b6eea17a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 18:16:59 -0700 Subject: fixes #7367: slightly larger carousel indicators --- docs/assets/css/bootstrap.css | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 1ec4304d6..f09e4789c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4414,24 +4414,26 @@ a.list-group-item.active > .badge, z-index: 15; width: 100px; padding-left: 0; - margin: 0 0 0 -50px; + margin-left: -50px; text-align: center; list-style: none; } .carousel-indicators li { display: inline-block; - width: 8px; - height: 8px; - margin-right: 0; - margin-left: 0; + width: 10px; + height: 10px; + margin: 1px; text-indent: -999px; cursor: pointer; border: 1px solid #fff; - border-radius: 5px; + border-radius: 10px; } .carousel-indicators .active { + width: 12px; + height: 12px; + margin: 0; background-color: #fff; } -- cgit v1.2.3 From 9da90adb4ca09e4c3b5ec549211c07292ec38d71 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 18:21:19 -0700 Subject: fixes #8068: add .help-block to form field state mixin --- docs/assets/css/bootstrap.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f09e4789c..24d2b690c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1605,6 +1605,7 @@ input[type="color"].input-small { border-radius: 3px; } +.has-warning .help-block, .has-warning .control-label { color: #c09853; } @@ -1628,6 +1629,7 @@ input[type="color"].input-small { border-color: #c09853; } +.has-error .help-block, .has-error .control-label { color: #b94a48; } @@ -1651,6 +1653,7 @@ input[type="color"].input-small { border-color: #b94a48; } +.has-success .help-block, .has-success .control-label { color: #468847; } -- cgit v1.2.3 From 08b3515fd7dfa76cdbb92d52a15d6797f3a1c4ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 19:42:26 -0700 Subject: fixes #8345: use inline-block on .img-responsive --- docs/assets/css/bootstrap.css | 14 +++++--------- docs/assets/css/docs.css | 4 +++- 2 files changed, 8 insertions(+), 10 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 24d2b690c..cb80d5c36 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -329,7 +329,7 @@ img { } .img-responsive { - display: block; + display: inline-block; height: auto; max-width: 100%; } @@ -3957,19 +3957,15 @@ button.close { transition: all 0.2s ease-in-out; } -.thumbnail > img, -.img-thumbnail { - display: block; - height: auto; - max-width: 100%; -} - .thumbnail { display: block; } +.thumbnail > img, .img-thumbnail { display: inline-block; + height: auto; + max-width: 100%; } a.thumbnail:hover, @@ -4308,7 +4304,7 @@ a.list-group-item.active > .badge, .carousel-inner > .item > img, .carousel-inner > .item > a > img { - display: block; + display: inline-block; height: auto; max-width: 100%; line-height: 1; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index f07654a98..31047b5d7 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -602,6 +602,7 @@ body { } .footer-links { margin: 10px 0; + padding-left: 0; } .footer-links li { display: inline; @@ -617,7 +618,8 @@ body { } .bs-social-buttons { display: inline-block; - margin: 0; + margin-bottom: 0; + padding-left: 0; list-style: none; } .bs-social-buttons li { -- cgit v1.2.3 From 5b2d933524616c9948c9e5229c14e109aa83727a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 19:49:29 -0700 Subject: Fixes #8350: unfuck Chrome number input element cursor /cc @cvrebert @eintnohick --- docs/assets/css/bootstrap.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index cb80d5c36..6a426850a 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1486,6 +1486,10 @@ input[type="checkbox"]:focus { outline-offset: -2px; } +input[type="number"]::-webkit-outer-spin-button input[type="number"]::-webkit-inner-spin-button { + height: auto; +} + input:-moz-placeholder, textarea:-moz-placeholder { color: #999999; -- cgit v1.2.3 From 749dc35328862896d613bfe72fc961e490037fad Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Jul 2013 20:18:44 -0700 Subject: comma for the guardian angel /cc @cvrebert --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 90482621e..87b021ee7 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1486,7 +1486,8 @@ input[type="checkbox"]:focus { outline-offset: -2px; } -input[type="number"]::-webkit-outer-spin-button input[type="number"]::-webkit-inner-spin-button { +input[type="number"]::-webkit-outer-spin-button, +input[type="number"]::-webkit-inner-spin-button { height: auto; } -- cgit v1.2.3 From da072fff21f565521d3dbe1f5f4f42550ecc989e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 2 Jul 2013 11:25:57 -0700 Subject: refactor tables.less to use nesting more --- docs/assets/css/bootstrap.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87b021ee7..a28f94f06 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1126,10 +1126,10 @@ th { } .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, +.table caption + thead tr:first-child td, +.table colgroup + thead tr:first-child td, .table thead:first-child tr:first-child td { border-top: 0; } @@ -1212,15 +1212,15 @@ th { } .table-bordered > caption + thead > tr:first-child > th:first-child, -.table-bordered > caption + tbody > tr:first-child > td:first-child, .table-bordered > colgroup + thead > tr:first-child > th:first-child, +.table-bordered > caption + tbody > tr:first-child > td:first-child, .table-bordered > colgroup + tbody > tr:first-child > td:first-child { border-top-left-radius: 4px; } .table-bordered > caption + thead > tr:first-child > th:last-child, -.table-bordered > caption + tbody > tr:first-child > td:last-child, .table-bordered > colgroup + thead > tr:first-child > th:last-child, +.table-bordered > caption + tbody > tr:first-child > td:last-child, .table-bordered > colgroup + tbody > tr:first-child > td:last-child { border-top-right-radius: 4px; } -- cgit v1.2.3 From 5b69d3405301ebf9f7047a459f727cbe5f73aedd Mon Sep 17 00:00:00 2001 From: liuyl Date: Wed, 3 Jul 2013 20:37:36 +0800 Subject: use sibling selector instead of pseudo selector --- docs/assets/css/bootstrap.css | 8 ++------ docs/components.html | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 87b021ee7..dbe48cbaf 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3289,15 +3289,11 @@ button.close { text-shadow: 0 1px 0 #fff; } -.breadcrumb > li:after { +.breadcrumb > li + li:before { display: inline-block; padding: 0 5px; color: #ccc; - content: "\00a0 /"; -} - -.breadcrumb > li:last-child:after { - display: none; + content: "/\00a0"; } .breadcrumb > .active { diff --git a/docs/components.html b/docs/components.html index 79b00e991..4e763d6d4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1016,7 +1016,7 @@ body { padding-bottom: 70px; }

    Breadcrumbs

    Indicate the current page's location within a navigational hierarchy.

    -

    Separators are automatically added in CSS through :after and content.

    +

    Separators are automatically added in CSS through :before and content.

    -{% endhighlight %} - -

    With badges and chevrons

    -

    Why not both?

    -
    -
      -
    • - - 14 - Cras justo odio -
    • -
    • - - 2 - Dapibus ac facilisis in -
    • -
    • - - 1 - Morbi leo risus -
    • -
    -
    -{% highlight html %} -
      -
    • - - 14 - Cras justo odio -
    • -
    {% endhighlight %}

    Linked list group

    @@ -1906,19 +1848,14 @@ body { padding-bottom: 70px; }
    @@ -1926,19 +1863,14 @@ body { padding-bottom: 70px; } {% endhighlight %} -- cgit v1.2.3 From 6e03639af22e2c1c06c5e146192c79b41f1d7385 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 6 Jul 2013 22:13:37 -0700 Subject: more nesting in buttons.less --- docs/assets/css/bootstrap.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..cad42745c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2074,6 +2074,13 @@ fieldset[disabled] .btn-info.active { border-color: #5bc0de; } +.btn-link { + font-weight: normal; + color: #428bca; + cursor: pointer; + border-radius: 0; +} + .btn-link, .btn-link:active, .btn-link[disabled], @@ -2091,13 +2098,6 @@ fieldset[disabled] .btn-link { border-color: transparent; } -.btn-link { - font-weight: normal; - color: #428bca; - cursor: pointer; - border-radius: 0; -} - .btn-link:hover, .btn-link:focus { color: #2a6496; -- cgit v1.2.3 From d9cd5e4e0c252ca7db3bc8a217a576ad9e8e6257 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Jul 2013 14:40:18 -0700 Subject: more nesting in navbar.less --- docs/assets/css/bootstrap.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..076ead20f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2948,11 +2948,6 @@ button.close { background-color: #d5d5d5; } -.navbar-nav > .dropdown > a .caret { - border-top-color: #777777; - border-bottom-color: #777777; -} - .navbar-nav > .open > a .caret, .navbar-nav > .open > a:hover .caret, .navbar-nav > .open > a:focus .caret { @@ -2960,6 +2955,11 @@ button.close { border-bottom-color: #555555; } +.navbar-nav > .dropdown > a .caret { + border-top-color: #777777; + border-bottom-color: #777777; +} + .navbar-nav.pull-right > li > .dropdown-menu, .navbar-nav > li > .dropdown-menu.pull-right { right: 0; -- cgit v1.2.3 From 6bda16f6beb9db168d52b5e1f291328d8fd5d7c9 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 7 Jul 2013 14:52:00 -0700 Subject: use nesting more in pagination.less --- docs/assets/css/bootstrap.css | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..88eaf2cfa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3323,6 +3323,19 @@ button.close { border-left-width: 0; } +.pagination > li:first-child > a, +.pagination > li:first-child > span { + border-left-width: 1px; + border-bottom-left-radius: 4px; + border-top-left-radius: 4px; +} + +.pagination > li:last-child > a, +.pagination > li:last-child > span { + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; +} + .pagination > li > a:hover, .pagination > li > a:focus, .pagination > .active > a, @@ -3345,19 +3358,6 @@ button.close { background-color: #ffffff; } -.pagination > li:first-child > a, -.pagination > li:first-child > span { - border-left-width: 1px; - border-bottom-left-radius: 4px; - border-top-left-radius: 4px; -} - -.pagination > li:last-child > a, -.pagination > li:last-child > span { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; -} - .pagination-large > li > a, .pagination-large > li > span { padding: 14px 16px; -- cgit v1.2.3 From e40aee9c9e3e80b03ebe00e812262da09c43bc11 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 6 Jul 2013 22:24:03 -0700 Subject: code.less: cleanup styles that get immediately overriden later in the file --- docs/assets/css/bootstrap.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3bea53f3..d59e30e9f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -671,11 +671,7 @@ address { code, pre { - padding: 0 3px 2px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; - font-size: 12px; - color: #333333; - border-radius: 4px; } code { @@ -684,6 +680,7 @@ code { color: #c7254e; white-space: nowrap; background-color: #f9f2f4; + border-radius: 4px; } pre { @@ -692,6 +689,7 @@ pre { margin: 0 0 10px; font-size: 13px; line-height: 1.428571429; + color: #333333; word-break: break-all; word-wrap: break-word; background-color: #f5f5f5; -- cgit v1.2.3 From 0d5c3c2ecf35d9bcbe4bd1ad67f3144f5341eb20 Mon Sep 17 00:00:00 2001 From: liuyl Date: Tue, 9 Jul 2013 09:22:36 +0800 Subject: simplify type.less --- docs/assets/css/bootstrap.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index d3d334a97..168d6c389 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -524,9 +524,9 @@ ol { } ul ul, +ol ul, ul ol, -ol ol, -ol ul { +ol ol { margin-bottom: 0; } -- cgit v1.2.3 From 88d76e386f566b0c49d85aa32d0c385870bbbfb3 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 9 Jul 2013 15:32:28 +0200 Subject: Dustin the docs again * Fix alllll the links! * Change all `*.js` in JS plugin docs (no mo `bootstrap-`) * Fully remove `tr.info` * Bring nav includes up to date --- docs/_includes/nav-components.html | 2 -- docs/_includes/nav-css.html | 1 - docs/_includes/nav-customize.html | 2 +- docs/components.html | 18 +++++++++--------- docs/css.html | 8 +------- docs/javascript.html | 22 +++++++++++----------- 6 files changed, 22 insertions(+), 31 deletions(-) (limited to 'docs') diff --git a/docs/_includes/nav-components.html b/docs/_includes/nav-components.html index a8dd8c64f..ed00b62fa 100644 --- a/docs/_includes/nav-components.html +++ b/docs/_includes/nav-components.html @@ -93,9 +93,7 @@ List group diff --git a/docs/_includes/nav-customize.html b/docs/_includes/nav-customize.html index 38c96d543..1539b0c25 100644 --- a/docs/_includes/nav-customize.html +++ b/docs/_includes/nav-customize.html @@ -5,7 +5,7 @@ jQuery plugins
  • - LESS variables + LESS variables