From b0d202455d9d604050768b512ff96d3b65329867 Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Mon, 17 Jun 2013 18:56:17 +0200 Subject: [PATCH 01/51] Fixes broken layout for .input-group-addons within .input-large. Follows 6ce154c7ed64f3821cc7d6cbb0bfcf65b25f1b49 --- less/forms.less | 1 + less/variables.less | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/less/forms.less b/less/forms.less index 10a315da6..fd44308b9 100644 --- a/less/forms.less +++ b/less/forms.less @@ -227,6 +227,7 @@ input[type="search"], input[type="tel"], input[type="color"] { &.input-large { + min-height: @input-height-large; padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; border-radius: @border-radius-large; diff --git a/less/variables.less b/less/variables.less index 765dff6a0..ab0136d21 100644 --- a/less/variables.less +++ b/less/variables.less @@ -128,7 +128,7 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2); +@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 8); @input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); From 6a79f53899b0d1e02d41252d0753116b3a121cd0 Mon Sep 17 00:00:00 2001 From: Edgar Schnueriger Date: Tue, 18 Jun 2013 21:43:34 +0200 Subject: [PATCH 02/51] Use correct font-size to calculate input-heights --- less/variables.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/variables.less b/less/variables.less index ab0136d21..21f283711 100644 --- a/less/variables.less +++ b/less/variables.less @@ -128,8 +128,8 @@ @input-color-placeholder: @gray-light; @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); -@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 8); -@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); +@input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2); +@input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2); // Dropdowns From cd09f3213ba2e07b988708dec6b888f95660b0f9 Mon Sep 17 00:00:00 2001 From: Luis Hdez Date: Thu, 20 Jun 2013 12:50:30 +0200 Subject: [PATCH 03/51] Add heading font family variable --- less/type.less | 1 + less/variables.less | 1 + 2 files changed, 2 insertions(+) diff --git a/less/type.less b/less/type.less index 9a6811e3d..852f7f32f 100644 --- a/less/type.less +++ b/less/type.less @@ -54,6 +54,7 @@ a.text-success:focus { color: darken(@state-success-text, 10%); } h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + font-family: @headings-font-family; font-weight: @headings-font-weight; line-height: @headings-line-height; small { diff --git a/less/variables.less b/less/variables.less index 13ba8885c..4a573a283 100644 --- a/less/variables.less +++ b/less/variables.less @@ -53,6 +53,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px +@headings-font-family: @font-family-sans-serif; @headings-font-weight: 500; @headings-line-height: 1.1; From 1b89a63a48f0bfd6ba024f1cf573c03a42aa5ef2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 15:38:18 -0700 Subject: [PATCH 04/51] Use `@font-family-base` for headings font-family variable --- less/variables.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/variables.less b/less/variables.less index 4a573a283..e71dd03e1 100644 --- a/less/variables.less +++ b/less/variables.less @@ -53,7 +53,7 @@ @line-height-base: 1.428571429; // 20/14 @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px -@headings-font-family: @font-family-sans-serif; +@headings-font-family: @font-family-base; @headings-font-weight: 500; @headings-line-height: 1.1; From 2fccf927c5320a4dfe3ad58b0a2752ed8f15354e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:00:38 -0700 Subject: [PATCH 05/51] Run make on last commit --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) 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; } From 2aec6dae597b69502d09aec983598e5f955ca558 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:01:59 -0700 Subject: [PATCH 06/51] 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 +- js/popover.js | 2 ++ less/popovers.less | 4 ---- 5 files changed, 5 insertions(+), 9 deletions(-) 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('
').insertBefore(e(this)).on("click",i),r.trigger(t=e.Event("show.bs.dropdown"));if(t.isDefaultPrevented())return;r.toggleClass("open").trigger("shown.bs.dropdown")}return n.focus(),!1},r.prototype.keydown=function(t){if(!/(38|40|27)/.test(t.keyCode))return;var r=e(this);t.preventDefault(),t.stopPropagation();if(r.is(".disabled, :disabled"))return;var i=s(r),o=i.hasClass("open");if(!o||o&&t.keyCode==27)return t.which==27&&i.find(n).focus(),r.click();var u=e("[role=menu] li:not(.divider):visible a",i);if(!u.length)return;var a=u.index(u.filter(":focus"));t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("bs.modal"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})});var r=e(document.body).on("bs.modal.shown",".modal",function(){r.addClass("modal-open")}).on("bs.modal.hidden",".modal",function(){r.removeClass("modal-open")})}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",e,t)};t.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},t.prototype.init=function(t,n,r){this.enabled=!0,this.type=t,this.$element=e(n),this.options=this.getOptions(r);var i=this.options.trigger.split(" ");for(var s=i.length;s--;){var o=i[s];if(o=="click")this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this));else if(o!="manual"){var u=o=="hover"?"mouseenter":"focus",a=o=="hover"?"mouseleave":"blur";this.$element.on(u+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(a+"."+this.type,this.options.selector,e.proxy(this.leave,this))}}this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.getOptions=function(t){return t=e.extend({},this.getDefaults(),this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},t.prototype.enter=function(t){var n=this.getDefaults(),r={};this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)});var i=t instanceof this.constructor?t:e(t.currentTarget)[this.type](r).data("bs."+this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},t.prototype.leave=function(t){var n=t instanceof this.constructor?t:e(t.currentTarget)[this.type](this._options).data("bs."+this.type);clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},t.prototype.show=function(){var t=e.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.tip();this.setContent(),this.options.animation&&n.addClass("fade");var r=typeof this.options.placement=="function"?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement;n.detach().css({top:0,left:0,display:"block"}),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var i,s=this.getPosition(),o=n[0].offsetWidth,u=n[0].offsetHeight;switch(r){case"bottom":i={top:s.top+s.height,left:s.left+s.width/2-o/2};break;case"top":i={top:s.top-u,left:s.left+s.width/2-o/2};break;case"left":i={top:s.top+s.height/2-u/2,left:s.left-o};break;case"right":i={top:s.top+s.height/2-u/2,left:s.left+s.width}}this.applyPlacement(i,r),this.$element.trigger("shown.bs."+this.type)}},t.prototype.applyPlacement=function(e,t){var n,r=this.tip(),i=r[0].offsetWidth,s=r[0].offsetHeight;r.offset(e).addClass(t).addClass("in");var o=r[0].offsetWidth,u=r[0].offsetHeight;t=="top"&&u!=s&&(n=!0,e.top=e.top+s-u);if(t=="bottom"||t=="top"){var a=0;e.left<0&&(a=e.left*-2,e.left=0,r.offset(e),o=r[0].offsetWidth,u=r[0].offsetHeight),this.replaceArrow(a-i+o,o,"left")}else this.replaceArrow(u-s,u,"top");n&&r.offset(e)},t.prototype.replaceArrow=function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},t.prototype.hide=function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide.bs."+this.type);this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden.bs."+this.type),this},t.prototype.fixTitle=function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},t.prototype.hasContent=function(){return this.getTitle()},t.prototype.getPosition=function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},t.prototype.getTitle=function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},t.prototype.tip=function(){return this.$tip=this.$tip||e(this.options.template)},t.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},t.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},t.prototype.enable=function(){this.enabled=!0},t.prototype.disable=function(){this.enabled=!1},t.prototype.toggleEnabled=function(){this.enabled=!this.enabled},t.prototype.toggle=function(t){var n=t?e(t.currentTarget)[this.type](this._options).data("bs."+this.type):this;n.tip().hasClass("in")?n.leave(n):n.enter(n)},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tooltip"),s=typeof n=="object"&&n;i||r.data("bs.tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.DEFAULTS=e.extend({},e.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'

'}),t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),t.prototype.constructor=t,t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},t.prototype.hasContent=function(){return this.getTitle()||this.getContent()},t.prototype.getContent=function(){var e=typeof this.options.content=="function"?this.options.content.call(this.$element[0]):this.options.content;return e||this.$element.attr("data-content")},t.prototype.tip=function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("bs.popover"),s=typeof n=="object"&&n;i||r.data("bs.popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),+function(e){"use strict";function t(n,r){var i,s=e.proxy(this.process,this),o=e(n).is("body")?e(window):e(n);this.$body=e("body"),this.$scrollElement=o.on("scroll.bs.scroll-spy.data-api",s),this.options=e.extend({},t.DEFAULTS,r),this.selector=(this.options.target||(i=e(n).attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=e([]),this.targets=e([]),this.activeTarget=null,this.refresh(),this.process()}t.DEFAULTS={offset:10},t.prototype.refresh=function(){this.offsets=e([]),this.targets=e([]);var t=this,n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},t.prototype.activate=function(t){this.activeTarget=t,e(this.selector).parents(".active").removeClass("active");var n=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',r=e(n).parents("li").addClass("active");r.parent(".dropdown-menu").length&&(r=r.closest("li.dropdown").addClass("active")),r.trigger("activate")};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("bs.scrollspy"),s=typeof n=="object"&&n;i||r.data("bs.scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype.show=function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target");r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;var i=n.find(".active:last a")[0],s=e.Event("show.bs.tab",{relatedTarget:i});t.trigger(s);if(s.isDefaultPrevented())return;var o=e(r);this.activate(t.parent("li"),n),this.activate(o,o.parent(),function(){t.trigger({type:"shown.bs.tab",relatedTarget:i})})},t.prototype.activate=function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tab");i||r.data("bs.tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.options=e.extend({},t.DEFAULTS,r),this.$window=e(window).on("scroll.bs.affix.data-api",e.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",e.proxy(this.checkPositionWithEventLoop,this)),this.$element=e(n),this.affixed=this.unpin=null,this.checkPosition()};t.DEFAULTS={offset:0},t.prototype.checkPositionWithEventLoop=function(){setTimeout(e.proxy(this.checkPosition,this),1)},t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.top,o=i.bottom,u="affix affix-top affix-bottom";typeof i!="object"&&(o=s=i),typeof s=="function"&&(s=i.top()),typeof o=="function"&&(o=i.bottom());var a=this.unpin!=null&&n+this.unpin<=r.top?!1:o!=null&&r.top+this.$element.height()>=t-o?"bottom":s!=null&&n<=s?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("bs.affix"),s=typeof n=="object"&&n;i||r.data("bs.affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file ++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('
').insertBefore(e(this)).on("click",i),r.trigger(t=e.Event("show.bs.dropdown"));if(t.isDefaultPrevented())return;r.toggleClass("open").trigger("shown.bs.dropdown")}return n.focus(),!1},r.prototype.keydown=function(t){if(!/(38|40|27)/.test(t.keyCode))return;var r=e(this);t.preventDefault(),t.stopPropagation();if(r.is(".disabled, :disabled"))return;var i=s(r),o=i.hasClass("open");if(!o||o&&t.keyCode==27)return t.which==27&&i.find(n).focus(),r.click();var u=e("[role=menu] li:not(.divider):visible a",i);if(!u.length)return;var a=u.index(u.filter(":focus"));t.keyCode==38&&a>0&&a--,t.keyCode==40&&a').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("bs.modal"),s=e.extend({},t.DEFAULTS,r.data(),typeof n=="object"&&n);i||r.data("bs.modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})});var r=e(document.body).on("bs.modal.shown",".modal",function(){r.addClass("modal-open")}).on("bs.modal.hidden",".modal",function(){r.removeClass("modal-open")})}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",e,t)};t.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},t.prototype.init=function(t,n,r){this.enabled=!0,this.type=t,this.$element=e(n),this.options=this.getOptions(r);var i=this.options.trigger.split(" ");for(var s=i.length;s--;){var o=i[s];if(o=="click")this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this));else if(o!="manual"){var u=o=="hover"?"mouseenter":"focus",a=o=="hover"?"mouseleave":"blur";this.$element.on(u+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(a+"."+this.type,this.options.selector,e.proxy(this.leave,this))}}this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.getOptions=function(t){return t=e.extend({},this.getDefaults(),this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},t.prototype.enter=function(t){var n=this.getDefaults(),r={};this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)});var i=t instanceof this.constructor?t:e(t.currentTarget)[this.type](r).data("bs."+this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},t.prototype.leave=function(t){var n=t instanceof this.constructor?t:e(t.currentTarget)[this.type](this._options).data("bs."+this.type);clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},t.prototype.show=function(){var t=e.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){this.$element.trigger(t);if(t.isDefaultPrevented())return;var n=this.tip();this.setContent(),this.options.animation&&n.addClass("fade");var r=typeof this.options.placement=="function"?this.options.placement.call(this,n[0],this.$element[0]):this.options.placement;n.detach().css({top:0,left:0,display:"block"}),this.options.container?n.appendTo(this.options.container):n.insertAfter(this.$element);var i,s=this.getPosition(),o=n[0].offsetWidth,u=n[0].offsetHeight;switch(r){case"bottom":i={top:s.top+s.height,left:s.left+s.width/2-o/2};break;case"top":i={top:s.top-u,left:s.left+s.width/2-o/2};break;case"left":i={top:s.top+s.height/2-u/2,left:s.left-o};break;case"right":i={top:s.top+s.height/2-u/2,left:s.left+s.width}}this.applyPlacement(i,r),this.$element.trigger("shown.bs."+this.type)}},t.prototype.applyPlacement=function(e,t){var n,r=this.tip(),i=r[0].offsetWidth,s=r[0].offsetHeight;r.offset(e).addClass(t).addClass("in");var o=r[0].offsetWidth,u=r[0].offsetHeight;t=="top"&&u!=s&&(n=!0,e.top=e.top+s-u);if(t=="bottom"||t=="top"){var a=0;e.left<0&&(a=e.left*-2,e.left=0,r.offset(e),o=r[0].offsetWidth,u=r[0].offsetHeight),this.replaceArrow(a-i+o,o,"left")}else this.replaceArrow(u-s,u,"top");n&&r.offset(e)},t.prototype.replaceArrow=function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},t.prototype.hide=function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide.bs."+this.type);this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden.bs."+this.type),this},t.prototype.fixTitle=function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},t.prototype.hasContent=function(){return this.getTitle()},t.prototype.getPosition=function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},t.prototype.getTitle=function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},t.prototype.tip=function(){return this.$tip=this.$tip||e(this.options.template)},t.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},t.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},t.prototype.enable=function(){this.enabled=!0},t.prototype.disable=function(){this.enabled=!1},t.prototype.toggleEnabled=function(){this.enabled=!this.enabled},t.prototype.toggle=function(t){var n=t?e(t.currentTarget)[this.type](this._options).data("bs."+this.type):this;n.tip().hasClass("in")?n.leave(n):n.enter(n)},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tooltip"),s=typeof n=="object"&&n;i||r.data("bs.tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),+function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.DEFAULTS=e.extend({},e.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'

'}),t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype),t.prototype.constructor=t,t.prototype.getDefaults=function(){return t.DEFAULTS},t.prototype.setContent=function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in"),e.find(".popover-title:empty").hide()},t.prototype.hasContent=function(){return this.getTitle()||this.getContent()},t.prototype.getContent=function(){var e=typeof this.options.content=="function"?this.options.content.call(this.$element[0]):this.options.content;return e||this.$element.attr("data-content")},t.prototype.tip=function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},t.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData(this.type)};var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("bs.popover"),s=typeof n=="object"&&n;i||r.data("bs.popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),+function(e){"use strict";function t(n,r){var i,s=e.proxy(this.process,this),o=e(n).is("body")?e(window):e(n);this.$body=e("body"),this.$scrollElement=o.on("scroll.bs.scroll-spy.data-api",s),this.options=e.extend({},t.DEFAULTS,r),this.selector=(this.options.target||(i=e(n).attr("href"))&&i.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=e([]),this.targets=e([]),this.activeTarget=null,this.refresh(),this.process()}t.DEFAULTS={offset:10},t.prototype.refresh=function(){this.offsets=e([]),this.targets=e([]);var t=this,n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},t.prototype.process=function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},t.prototype.activate=function(t){this.activeTarget=t,e(this.selector).parents(".active").removeClass("active");var n=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',r=e(n).parents("li").addClass("active");r.parent(".dropdown-menu").length&&(r=r.closest("li.dropdown").addClass("active")),r.trigger("activate")};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("bs.scrollspy"),s=typeof n=="object"&&n;i||r.data("bs.scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),+function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype.show=function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target");r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;var i=n.find(".active:last a")[0],s=e.Event("show.bs.tab",{relatedTarget:i});t.trigger(s);if(s.isDefaultPrevented())return;var o=e(r);this.activate(t.parent("li"),n),this.activate(o,o.parent(),function(){t.trigger({type:"shown.bs.tab",relatedTarget:i})})},t.prototype.activate=function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("bs.tab");i||r.data("bs.tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),+function(e){"use strict";var t=function(n,r){this.options=e.extend({},t.DEFAULTS,r),this.$window=e(window).on("scroll.bs.affix.data-api",e.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",e.proxy(this.checkPositionWithEventLoop,this)),this.$element=e(n),this.affixed=this.unpin=null,this.checkPosition()};t.DEFAULTS={offset:0},t.prototype.checkPositionWithEventLoop=function(){setTimeout(e.proxy(this.checkPosition,this),1)},t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.top,o=i.bottom,u="affix affix-top affix-bottom";typeof i!="object"&&(o=s=i),typeof s=="function"&&(s=i.top()),typeof o=="function"&&(o=i.bottom());var a=this.unpin!=null&&n+this.unpin<=r.top?!1:o!=null&&r.top+this.$element.height()>=t-o?"bottom":s!=null&&n<=s?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("bs.affix"),s=typeof n=="object"&&n;i||r.data("bs.affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/js/popover.js b/js/popover.js index 33edadf7f..e58e24908 100644 --- a/js/popover.js +++ b/js/popover.js @@ -55,6 +55,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/less/popovers.less b/less/popovers.less index b3399fa34..bcd30e919 100644 --- a/less/popovers.less +++ b/less/popovers.less @@ -40,10 +40,6 @@ background-color: @popover-title-bg; border-bottom: 1px solid darken(@popover-title-bg, 5%); border-radius: 5px 5px 0 0; - - &:empty { - display: none; - } } .popover-content { From 4db90244c41c26492b4efa5d3a8694fc61cd1f9b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:27:39 -0700 Subject: [PATCH 07/51] run make on previous commit --- docs/assets/css/bootstrap.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3eb92c2b1..574ba1662 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1491,6 +1491,7 @@ input[type="url"].input-large, input[type="search"].input-large, input[type="tel"].input-large, input[type="color"].input-large { + min-height: 56px; padding: 14px 16px; font-size: 18px; border-radius: 6px; @@ -1512,7 +1513,7 @@ input[type="url"].input-small, input[type="search"].input-small, input[type="tel"].input-small, input[type="color"].input-small { - min-height: 32px; + min-height: 30px; padding: 5px 10px; font-size: 12px; border-radius: 3px; From 90d4343f66d1cdafe24b6de0dbb6ae64312df323 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 16:42:05 -0700 Subject: [PATCH 08/51] Fixes #8093: Removes invalid focus styles on inputs --- docs/assets/css/bootstrap.css | 15 --------------- less/forms.less | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 574ba1662..21439fdde 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1610,21 +1610,6 @@ fieldset[disabled] input[type="checkbox"] { border-color: #468847; } -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; -} - -input:focus:invalid:focus, -textarea:focus:invalid:focus, -select:focus:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} - .help-block { display: block; margin-top: 5px; diff --git a/less/forms.less b/less/forms.less index fd44308b9..0d55cd148 100644 --- a/less/forms.less +++ b/less/forms.less @@ -287,20 +287,6 @@ input[type="checkbox"] { .form-field-validation(@state-success-text, @state-success-text, @state-success-bg); } -// HTML5 invalid states -// Shares styles with the .control-group.error above -input:focus:invalid, -textarea:focus:invalid, -select:focus:invalid { - color: #b94a48; - border-color: #ee5f5b; - &:focus { - border-color: darken(#ee5f5b, 10%); - @shadow: 0 0 6px lighten(#ee5f5b, 20%); - .box-shadow(@shadow); - } -} - From 82f9de94593ea5dd8a8efd6a317a6c8b319cfff2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 17:02:10 -0700 Subject: [PATCH 09/51] Fixes #8159: Be more specific about disabled inputs to avoid iOS bug Attached disabled styles to the exact input types rather than all inputs and reseting the checkbox/radios. If setting `background-color: transparent;`, iOS renders no background on the disabled control. --- docs/assets/css/bootstrap.css | 74 ++++++++++++++++++++++++----------- less/forms.less | 40 ++++++------------- 2 files changed, 63 insertions(+), 51 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 21439fdde..9379177da 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1338,6 +1338,58 @@ input[type="color"]:focus { box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); } +select[disabled], +textarea[disabled], +input[type="text"][disabled], +input[type="password"][disabled], +input[type="datetime"][disabled], +input[type="datetime-local"][disabled], +input[type="date"][disabled], +input[type="month"][disabled], +input[type="time"][disabled], +input[type="week"][disabled], +input[type="number"][disabled], +input[type="email"][disabled], +input[type="url"][disabled], +input[type="search"][disabled], +input[type="tel"][disabled], +input[type="color"][disabled], +select[readonly], +textarea[readonly], +input[type="text"][readonly], +input[type="password"][readonly], +input[type="datetime"][readonly], +input[type="datetime-local"][readonly], +input[type="date"][readonly], +input[type="month"][readonly], +input[type="time"][readonly], +input[type="week"][readonly], +input[type="number"][readonly], +input[type="email"][readonly], +input[type="url"][readonly], +input[type="search"][readonly], +input[type="tel"][readonly], +input[type="color"][readonly], +fieldset[disabled] select, +fieldset[disabled] textarea, +fieldset[disabled] input[type="text"], +fieldset[disabled] input[type="password"], +fieldset[disabled] input[type="datetime"], +fieldset[disabled] input[type="datetime-local"], +fieldset[disabled] input[type="date"], +fieldset[disabled] input[type="month"], +fieldset[disabled] input[type="time"], +fieldset[disabled] input[type="week"], +fieldset[disabled] input[type="number"], +fieldset[disabled] input[type="email"], +fieldset[disabled] input[type="url"], +fieldset[disabled] input[type="search"], +fieldset[disabled] input[type="tel"], +fieldset[disabled] input[type="color"] { + cursor: not-allowed; + background-color: #eeeeee; +} + input, select, textarea { @@ -1519,28 +1571,6 @@ input[type="color"].input-small { border-radius: 3px; } -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly], -fieldset[disabled] input, -fieldset[disabled] select, -fieldset[disabled] textarea { - cursor: not-allowed; - background-color: #eeeeee; -} - -input[type="radio"][disabled], -input[type="checkbox"][disabled], -input[type="radio"][readonly], -input[type="checkbox"][readonly], -fieldset[disabled] input[type="radio"], -fieldset[disabled] input[type="checkbox"] { - background-color: transparent; -} - .has-warning .control-label { color: #c09853; } diff --git a/less/forms.less b/less/forms.less index 0d55cd148..609580928 100644 --- a/less/forms.less +++ b/less/forms.less @@ -72,6 +72,17 @@ input[type="color"] { outline: 0; .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); } + + // Disabled and read-only inputs + // Note: HTML5 says that inputs under a fieldset > legend:first-child won't be + // disabled if the fieldset is disabled. Due to implementation difficulty, + // we don't honor that edge case; we style them as disabled anyway. + &[disabled], + &[readonly], + fieldset[disabled] & { + cursor: not-allowed; + background-color: @input-bg-disabled; + } } // Reset appearance properties for textual inputs and textarea @@ -241,35 +252,6 @@ input[type="color"] { } -// DISABLED STATE -// -------------- - -// Disabled and read-only inputs -// Note: HTML5 says that inputs under a fieldset > legend:first-child won't be -// disabled if the fieldset is disabled. Due to implementation difficulty, -// we don't honor that edge case; we style them as disabled anyway. -input, -select, -textarea { - &[disabled], - &[readonly], - fieldset[disabled] & { - cursor: not-allowed; - background-color: @input-bg-disabled; - } -} -// Explicitly reset the colors here -input[type="radio"], -input[type="checkbox"] { - &[disabled], - &[readonly], - fieldset[disabled] & { - background-color: transparent; - } -} - - - // FORM FIELD FEEDBACK STATES // -------------------------- From ef8e5853cbfc4f4babacd3527ab3eb0e4b741acc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Jun 2013 17:15:09 -0700 Subject: [PATCH 10/51] Fixes #8154: enforce full width `.navbar-nav.pull-right` in mobile Prevents an odd alignment issue in mobile views by forcing the nav links to be full width without undoing the float. --- docs/assets/css/bootstrap.css | 5 +++++ less/navbar.less | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 9379177da..685e2e984 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3481,6 +3481,10 @@ button.close { background-color: transparent; } +.navbar-nav.pull-right { + width: 100%; +} + .navbar-static-top { border-radius: 0; } @@ -3709,6 +3713,7 @@ button.close { } .navbar-nav.pull-right { float: right; + width: auto; } .navbar-toggle { position: relative; diff --git a/less/navbar.less b/less/navbar.less index 59ea92dbd..54f4b75ab 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -48,6 +48,12 @@ color: @navbar-link-disabled-color; background-color: @navbar-link-disabled-bg; } + + // Right aligned contents + // Make them full width first so that they align properly on mobile + &.pull-right { + width: 100%; + } } @@ -296,6 +302,7 @@ &.pull-right { float: right; + width: auto; } } From ac1058e4355b9492dc78e2aa6add08f0435fbbac Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Thu, 20 Jun 2013 18:44:19 -0700 Subject: [PATCH 11/51] Rename class name in placeholder --- docs/docs.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/docs.html b/docs/docs.html index d0cd3b670..2690a5f5f 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -1942,26 +1942,26 @@ For example, <section> should be wrapped as inline.
- +
- +
- +
{% highlight html %}
- +
- +
- +
{% endhighlight %} From 8ef3df418f5f9a9b9a8dc2d0f41a3cf16447c8af Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Fri, 21 Jun 2013 09:59:34 -0400 Subject: [PATCH 12/51] Rename class name in placeholder applies 2535e060a48393143e7a6c2eb93a0a5d06663801 to css.html. Wasn't docs.html removed a while ago? --- docs/css.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/css.html b/docs/css.html index d4e7f77d2..86b9f4d65 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1757,26 +1757,26 @@ For example, <section> should be wrapped as inline.
- +
- +
- +
{% highlight html %}
- +
- +
- +
{% endhighlight %} From 9d43fbb57eb3ca0b1e7797365f548556600addc3 Mon Sep 17 00:00:00 2001 From: Tom Pietschker Date: Fri, 21 Jun 2013 10:03:28 -0400 Subject: [PATCH 13/51] Remove the offcanvas js from the footer This was moved inline in 65ad52060e1f9b5928ac0d5a0bfead0cdf1b26f4 --- docs/_includes/footer.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 19a9af636..fcfc7c482 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -4,10 +4,6 @@ - - - From eba9b4de6c5d2dfe49ba6d2484307b1d6542620a Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Jun 2013 11:56:47 -0700 Subject: [PATCH 14/51] Reset padding on homepage links --- docs/assets/css/docs.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e47805d37..defa02fb0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -81,7 +81,9 @@ body { /* Textual links */ .bs-masthead-links { - margin: 20px 0; + margin-top: 20px; + margin-bottom: 20px; + padding-left: 0; list-style: none; } .bs-masthead-links li { From b0e943399df374b03f9ed5f676f33e42f5e53a74 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 21 Jun 2013 17:21:44 -0700 Subject: [PATCH 15/51] Improve alignment of navbar brand and fix up left padding on list groups --- docs/assets/css/bootstrap.css | 5 +++-- less/list-group.less | 3 ++- less/navbar.less | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 685e2e984..68b40ca7c 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -2956,7 +2956,8 @@ input[type="button"].btn-block { } .list-group { - margin: 0 0 20px; + padding-left: 0; + margin-bottom: 20px; background-color: #ffffff; } @@ -3698,7 +3699,7 @@ button.close { .navbar-brand { float: left; margin-right: 5px; - margin-left: -5px; + margin-left: -15px; } .navbar-nav { float: left; diff --git a/less/list-group.less b/less/list-group.less index d812cc5f9..f9d9f612c 100644 --- a/less/list-group.less +++ b/less/list-group.less @@ -7,7 +7,8 @@ // Easily usable on
    ,
      , or
      . .list-group { // No need to set list-style: none; since .list-group-item is block level - margin: 0 0 20px; // reset all margins because ul and ol + margin-bottom: 20px; + padding-left: 0; // reset padding because ul and ol background-color: @list-group-bg; } diff --git a/less/navbar.less b/less/navbar.less index 54f4b75ab..6246bd62c 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -284,7 +284,7 @@ .navbar-brand { float: left; - margin-left: -5px; + margin-left: -15px; margin-right: 5px; } .navbar-nav { From 2ba3b47dc697bdcb69b2100d664c51d69c453010 Mon Sep 17 00:00:00 2001 From: Aristeides Stathopoulos Date: Sat, 22 Jun 2013 14:34:17 +0300 Subject: [PATCH 16/51] Update navbar.less navbar padding-left and padding-right should be calculated from the grid-gutter-width variable. --- less/navbar.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/less/navbar.less b/less/navbar.less index 6246bd62c..b744f5f70 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -6,8 +6,8 @@ .navbar { position: relative; margin-bottom: 20px; - padding-left: 15px; - padding-right: 15px; + padding-left: floor(@grid-gutter-width / 2); // ~15px + padding-right: floor(@grid-gutter-width / 2); // ~15px background-color: @navbar-bg; border-radius: @border-radius-base; @@ -284,7 +284,7 @@ .navbar-brand { float: left; - margin-left: -15px; + margin-left: -5px; margin-right: 5px; } .navbar-nav { From b51e1e0d8c632d391058f5094295d9c4124c3f28 Mon Sep 17 00:00:00 2001 From: Aristeides Stathopoulos Date: Sat, 22 Jun 2013 14:41:31 +0300 Subject: [PATCH 17/51] Update navbar.less --- less/navbar.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/navbar.less b/less/navbar.less index b744f5f70..444281289 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -96,7 +96,7 @@ max-width: 200px; margin-left: auto; margin-right: auto; - padding: 15px; + padding: floor(@grid-gutter-width / 2); // ~15px font-size: @font-size-large; font-weight: 500; line-height: @line-height-computed; @@ -284,7 +284,7 @@ .navbar-brand { float: left; - margin-left: -5px; + margin-left: -(floor(@grid-gutter-width / 2)); // ~15px margin-right: 5px; } .navbar-nav { From aad76f21f6eefb3afc19c7cefeb97f00df058a9f Mon Sep 17 00:00:00 2001 From: Aristeides Stathopoulos Date: Sat, 22 Jun 2013 18:44:04 +0300 Subject: [PATCH 18/51] Update navbar.less --- less/navbar.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/less/navbar.less b/less/navbar.less index 444281289..b8283601d 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -6,8 +6,8 @@ .navbar { position: relative; margin-bottom: 20px; - padding-left: floor(@grid-gutter-width / 2); // ~15px - padding-right: floor(@grid-gutter-width / 2); // ~15px + padding-left: @navbar-padding; + padding-right: @navbar-padding; background-color: @navbar-bg; border-radius: @border-radius-base; @@ -96,7 +96,7 @@ max-width: 200px; margin-left: auto; margin-right: auto; - padding: floor(@grid-gutter-width / 2); // ~15px + padding: @navbar-padding; font-size: @font-size-large; font-weight: 500; line-height: @line-height-computed; @@ -284,7 +284,7 @@ .navbar-brand { float: left; - margin-left: -(floor(@grid-gutter-width / 2)); // ~15px + margin-left: -(@navbar-padding); margin-right: 5px; } .navbar-nav { From 72183d9a452fa43ac8d994374713c7a585d1744c Mon Sep 17 00:00:00 2001 From: Aristeides Stathopoulos Date: Sat, 22 Jun 2013 18:45:25 +0300 Subject: [PATCH 19/51] Update variables.less --- less/variables.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/variables.less b/less/variables.less index f91846126..4fd0d492c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -178,6 +178,7 @@ @navbar-height: 50px; @navbar-color: #777; @navbar-bg: #eee; +@navbar-padding: floor(@grid-gutter-width / 2); // ~15px // Navbar links @navbar-link-color: #777; From 7fd121fecb0e5b2774a2c1486d61f95b298035aa Mon Sep 17 00:00:00 2001 From: Francis Brunelle Date: Sat, 22 Jun 2013 21:38:02 -0300 Subject: [PATCH 20/51] Reset left padding for .carousel-indicators --- less/carousel.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/carousel.less b/less/carousel.less index 31f9b8aff..a7a4672c1 100644 --- a/less/carousel.less +++ b/less/carousel.less @@ -131,6 +131,7 @@ z-index: 15; width: 100px; margin: 0 0 0 -50px; + padding-left: 0; list-style: none; text-align: center; From 976322b2a682c1faf141f7f2241069defee790c6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 22 Jun 2013 18:56:55 -0700 Subject: [PATCH 21/51] run make on previous merge --- docs/assets/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 68b40ca7c..de5494c57 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5043,6 +5043,7 @@ a.list-group-item.active > .badge, left: 50%; z-index: 15; width: 100px; + padding-left: 0; margin: 0 0 0 -50px; text-align: center; list-style: none; From 2a47037ab0d4aa644f04499bd704a85561b58e73 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 10:24:50 -0700 Subject: [PATCH 22/51] Fixes #8266: remove unnecessary `strong` and `em` styles --- less/type.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/less/type.less b/less/type.less index 852f7f32f..9892d5589 100644 --- a/less/type.less +++ b/less/type.less @@ -23,8 +23,6 @@ p { // Ex: 14px base font * 85% = about 12px small { font-size: 85%; } -strong { font-weight: bold; } -em { font-style: italic; } cite { font-style: normal; } // Utility classes From 5af22ab89ff5997ef03366d332b91bddea710323 Mon Sep 17 00:00:00 2001 From: Luis Hdez Date: Sun, 23 Jun 2013 23:15:32 +0200 Subject: [PATCH 23/51] Fix overlap sidebar for Tablets and up in docs --- docs/assets/css/docs.css | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index defa02fb0..cef5f3334 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -713,13 +713,6 @@ input.focused { /* Tablets and up */ @media screen and (min-width: 768px) { - /* Reaffix the fixed sidebar */ - .bs-sidebar.affix { - position: fixed; /* Undo the static from mobile-first approach */ - top: 50px; - width: 160px; - } - /* Back to top link */ .bs-top { display: block; /* Unhide */ @@ -781,6 +774,8 @@ input.focused { /* Widen the fixed sidebar */ .bs-sidebar.affix { + position: fixed; /* Undo the static from mobile-first approach */ + top: 50px; width: 213px; } From b76d98eee3fa4a1a8d7fb281a31a7d20982459d3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 15:05:50 -0700 Subject: [PATCH 24/51] Fixes #8211: restore proper table grid class behavior MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needs work though—we shouldn't be setting this stuff with the attribute selectors, but it's the easiest solution for now. --- less/grid.less | 46 ++++++++++++++++++++++++++++++++++++++++++---- less/tables.less | 8 +++++--- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/less/grid.less b/less/grid.less index b97d1d5c4..e8082d369 100644 --- a/less/grid.less +++ b/less/grid.less @@ -2,7 +2,6 @@ // Grid system // -------------------------------------------------- - // Set the container width, and override it for fixed navbars in media queries .container { .container-fixed(); @@ -51,9 +50,6 @@ .col-lg-11, .col-lg-12 { position: relative; - // Float and set width: 100%; for easy stacking on mobile devices - float: left; - width: 100%; // Prevent columns from collapsing when empty min-height: 1px; // Inner gutter via padding @@ -68,6 +64,20 @@ // // Tiny device columns (smartphones) +.col-1, +.col-2, +.col-3, +.col-4, +.col-5, +.col-6, +.col-7, +.col-8, +.col-9, +.col-10, +.col-11, +.col-12 { + float: left; +} .col-1 { width: percentage((1 / @grid-columns)); } .col-2 { width: percentage((2 / @grid-columns)); } .col-3 { width: percentage((3 / @grid-columns)); } @@ -87,6 +97,20 @@ max-width: @container-tablet; } + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11, + .col-sm-12 { + float: left; + } .col-sm-1 { width: percentage((1 / @grid-columns)); } .col-sm-2 { width: percentage((2 / @grid-columns)); } .col-sm-3 { width: percentage((3 / @grid-columns)); } @@ -144,6 +168,20 @@ .container { max-width: @container-desktop; } + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11, + .col-lg-12 { + float: left; + } .col-lg-1 { width: percentage((1 / @grid-columns)); } .col-lg-2 { width: percentage((2 / @grid-columns)); } .col-lg-3 { width: percentage((3 / @grid-columns)); } diff --git a/less/tables.less b/less/tables.less index fa5fd554b..88481a944 100644 --- a/less/tables.less +++ b/less/tables.less @@ -184,16 +184,18 @@ th { // ----------------- // Reset default table behavior -table col[class*="col-span-"] { +table col[class^="col-"] { float: none; display: table-column; } -table td[class*="col-span-"], -table th[class*="col-span-"] { +table td[class^="col-"], +table th[class^="col-"] { float: none; display: table-cell; } + + // TABLE BACKGROUNDS // ----------------- // Exact selectors below required to override .table-striped From 164e88781bc4437d654ab458e6393a8d15807d37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 15:05:58 -0700 Subject: [PATCH 25/51] Make on previous commits --- docs/assets/css/bootstrap.css | 59 +++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index de5494c57..48d6815b2 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -353,14 +353,6 @@ small { font-size: 85%; } -strong { - font-weight: bold; -} - -em { - font-style: italic; -} - cite { font-style: normal; } @@ -819,13 +811,26 @@ pre code { .col-lg-11, .col-lg-12 { position: relative; - float: left; - width: 100%; min-height: 1px; padding-right: 15px; padding-left: 15px; } +.col-1, +.col-2, +.col-3, +.col-4, +.col-5, +.col-6, +.col-7, +.col-8, +.col-9, +.col-10, +.col-11, +.col-12 { + float: left; +} + .col-1 { width: 8.333333333333332%; } @@ -878,6 +883,20 @@ pre code { .container { max-width: 728px; } + .col-sm-1, + .col-sm-2, + .col-sm-3, + .col-sm-4, + .col-sm-5, + .col-sm-6, + .col-sm-7, + .col-sm-8, + .col-sm-9, + .col-sm-10, + .col-sm-11, + .col-sm-12 { + float: left; + } .col-sm-1 { width: 8.333333333333332%; } @@ -1019,6 +1038,20 @@ pre code { .container { max-width: 940px; } + .col-lg-1, + .col-lg-2, + .col-lg-3, + .col-lg-4, + .col-lg-5, + .col-lg-6, + .col-lg-7, + .col-lg-8, + .col-lg-9, + .col-lg-10, + .col-lg-11, + .col-lg-12 { + float: left; + } .col-lg-1 { width: 8.333333333333332%; } @@ -1201,13 +1234,13 @@ th { background-color: #f5f5f5; } -table col[class*="col-span-"] { +table col[class^="col-"] { display: table-column; float: none; } -table td[class*="col-span-"], -table th[class*="col-span-"] { +table td[class^="col-"], +table th[class^="col-"] { display: table-cell; float: none; } From 573a19741770338b9e08838d908f51b7a82cddd3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Jun 2013 15:15:42 -0700 Subject: [PATCH 26/51] Move grid offsets to desktop only (fixes #8229) --- docs/assets/css/bootstrap.css | 66 +++++++++++++++++------------------ less/grid.less | 26 +++++++------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 48d6815b2..b7e026dbb 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -933,39 +933,6 @@ pre code { .col-sm-12 { width: 100%; } - .col-offset-1 { - margin-left: 8.333333333333332%; - } - .col-offset-2 { - margin-left: 16.666666666666664%; - } - .col-offset-3 { - margin-left: 25%; - } - .col-offset-4 { - margin-left: 33.33333333333333%; - } - .col-offset-5 { - margin-left: 41.66666666666667%; - } - .col-offset-6 { - margin-left: 50%; - } - .col-offset-7 { - margin-left: 58.333333333333336%; - } - .col-offset-8 { - margin-left: 66.66666666666666%; - } - .col-offset-9 { - margin-left: 75%; - } - .col-offset-10 { - margin-left: 83.33333333333334%; - } - .col-offset-11 { - margin-left: 91.66666666666666%; - } .col-push-1 { left: 8.333333333333332%; } @@ -1088,6 +1055,39 @@ pre code { .col-lg-12 { width: 100%; } + .col-offset-1 { + margin-left: 8.333333333333332%; + } + .col-offset-2 { + margin-left: 16.666666666666664%; + } + .col-offset-3 { + margin-left: 25%; + } + .col-offset-4 { + margin-left: 33.33333333333333%; + } + .col-offset-5 { + margin-left: 41.66666666666667%; + } + .col-offset-6 { + margin-left: 50%; + } + .col-offset-7 { + margin-left: 58.333333333333336%; + } + .col-offset-8 { + margin-left: 66.66666666666666%; + } + .col-offset-9 { + margin-left: 75%; + } + .col-offset-10 { + margin-left: 83.33333333333334%; + } + .col-offset-11 { + margin-left: 91.66666666666666%; + } } @media (min-width: 1200px) { diff --git a/less/grid.less b/less/grid.less index e8082d369..12803f39a 100644 --- a/less/grid.less +++ b/less/grid.less @@ -124,19 +124,6 @@ .col-sm-11 { width: percentage((11/ @grid-columns)); } .col-sm-12 { width: 100%; } - // Offsets - .col-offset-1 { margin-left: percentage((1 / @grid-columns)); } - .col-offset-2 { margin-left: percentage((2 / @grid-columns)); } - .col-offset-3 { margin-left: percentage((3 / @grid-columns)); } - .col-offset-4 { margin-left: percentage((4 / @grid-columns)); } - .col-offset-5 { margin-left: percentage((5 / @grid-columns)); } - .col-offset-6 { margin-left: percentage((6 / @grid-columns)); } - .col-offset-7 { margin-left: percentage((7 / @grid-columns)); } - .col-offset-8 { margin-left: percentage((8 / @grid-columns)); } - .col-offset-9 { margin-left: percentage((9 / @grid-columns)); } - .col-offset-10 { margin-left: percentage((10/ @grid-columns)); } - .col-offset-11 { margin-left: percentage((11/ @grid-columns)); } - // Push and pull columns for source order changes .col-push-1 { left: percentage((1 / @grid-columns)); } .col-push-2 { left: percentage((2 / @grid-columns)); } @@ -194,6 +181,19 @@ .col-lg-10 { width: percentage((10/ @grid-columns)); } .col-lg-11 { width: percentage((11/ @grid-columns)); } .col-lg-12 { width: 100%; } + + // Offsets + .col-offset-1 { margin-left: percentage((1 / @grid-columns)); } + .col-offset-2 { margin-left: percentage((2 / @grid-columns)); } + .col-offset-3 { margin-left: percentage((3 / @grid-columns)); } + .col-offset-4 { margin-left: percentage((4 / @grid-columns)); } + .col-offset-5 { margin-left: percentage((5 / @grid-columns)); } + .col-offset-6 { margin-left: percentage((6 / @grid-columns)); } + .col-offset-7 { margin-left: percentage((7 / @grid-columns)); } + .col-offset-8 { margin-left: percentage((8 / @grid-columns)); } + .col-offset-9 { margin-left: percentage((9 / @grid-columns)); } + .col-offset-10 { margin-left: percentage((10/ @grid-columns)); } + .col-offset-11 { margin-left: percentage((11/ @grid-columns)); } } // Large desktops and up From c455d92f9e27b5845538e64ac354e544699ff82e Mon Sep 17 00:00:00 2001 From: Kyle Date: Mon, 24 Jun 2013 11:27:05 +0800 Subject: [PATCH 27/51] Replaced with for glyphicon --- docs/components.html | 320 +++++++++++++++++++++---------------------- 1 file changed, 160 insertions(+), 160 deletions(-) diff --git a/docs/components.html b/docs/components.html index b18fd2b64..55f27cbc3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -17,171 +17,171 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na

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

        -
      • glyphicon-glass
        • -
      • glyphicon-music
        • -
      • glyphicon-search
        • -
      • glyphicon-envelope
        • -
      • glyphicon-heart
        • -
      • glyphicon-star
        • -
      • glyphicon-star-empty
        • -
      • glyphicon-user
        • -
      • glyphicon-film
        • -
      • glyphicon-th-large
        • -
      • glyphicon-th
        • -
      • glyphicon-th-list
        • -
      • glyphicon-ok
        • -
      • glyphicon-remove
        • -
      • glyphicon-zoom-in
        • -
      • glyphicon-zoom-out
        • -
      • glyphicon-off
        • -
      • glyphicon-signal
        • -
      • glyphicon-cog
        • -
      • glyphicon-trash
        • -
      • glyphicon-home
        • -
      • glyphicon-file
        • -
      • glyphicon-time
        • -
      • glyphicon-road
        • -
      • glyphicon-download-alt
        • -
      • glyphicon-download
        • -
      • glyphicon-upload
        • -
      • glyphicon-inbox
        • +
      • glyphicon-glass
        • +
      • glyphicon-music
        • +
      • glyphicon-search
        • +
      • glyphicon-envelope
        • +
      • glyphicon-heart
        • +
      • glyphicon-star
        • +
      • glyphicon-star-empty
        • +
      • glyphicon-user
        • +
      • glyphicon-film
        • +
      • glyphicon-th-large
        • +
      • glyphicon-th
        • +
      • glyphicon-th-list
        • +
      • glyphicon-ok
        • +
      • glyphicon-remove
        • +
      • glyphicon-zoom-in
        • +
      • glyphicon-zoom-out
        • +
      • glyphicon-off
        • +
      • glyphicon-signal
        • +
      • glyphicon-cog
        • +
      • glyphicon-trash
        • +
      • glyphicon-home
        • +
      • glyphicon-file
        • +
      • glyphicon-time
        • +
      • glyphicon-road
        • +
      • glyphicon-download-alt
        • +
      • glyphicon-download
        • +
      • glyphicon-upload
        • +
      • glyphicon-inbox
        • -
      • glyphicon-play-circle
        • -
      • glyphicon-repeat
        • -
      • glyphicon-refresh
        • -
      • glyphicon-list-alt
        • -
      • glyphicon-lock
        • -
      • glyphicon-flag
        • -
      • glyphicon-headphones
        • -
      • glyphicon-volume-off
        • -
      • glyphicon-volume-down
        • -
      • glyphicon-volume-up
        • -
      • glyphicon-qrcode
        • -
      • glyphicon-barcode
        • -
      • glyphicon-tag
        • -
      • glyphicon-tags
        • -
      • glyphicon-book
        • -
      • glyphicon-bookmark
        • -
      • glyphicon-print
        • -
      • glyphicon-camera
        • -
      • glyphicon-font
        • -
      • glyphicon-bold
        • -
      • glyphicon-italic
        • -
      • glyphicon-text-height
        • -
      • glyphicon-text-width
        • -
      • glyphicon-align-left
        • -
      • glyphicon-align-center
        • -
      • glyphicon-align-right
        • -
      • glyphicon-align-justify
        • -
      • glyphicon-list
        • +
      • glyphicon-play-circle
        • +
      • glyphicon-repeat
        • +
      • glyphicon-refresh
        • +
      • glyphicon-list-alt
        • +
      • glyphicon-lock
        • +
      • glyphicon-flag
        • +
      • glyphicon-headphones
        • +
      • glyphicon-volume-off
        • +
      • glyphicon-volume-down
        • +
      • glyphicon-volume-up
        • +
      • glyphicon-qrcode
        • +
      • glyphicon-barcode
        • +
      • glyphicon-tag
        • +
      • glyphicon-tags
        • +
      • glyphicon-book
        • +
      • glyphicon-bookmark
        • +
      • glyphicon-print
        • +
      • glyphicon-camera
        • +
      • glyphicon-font
        • +
      • glyphicon-bold
        • +
      • glyphicon-italic
        • +
      • glyphicon-text-height
        • +
      • glyphicon-text-width
        • +
      • glyphicon-align-left
        • +
      • glyphicon-align-center
        • +
      • glyphicon-align-right
        • +
      • glyphicon-align-justify
        • +
      • glyphicon-list
        • -
      • glyphicon-indent-left
        • -
      • glyphicon-indent-right
        • -
      • glyphicon-facetime-video
        • -
      • glyphicon-picture
        • -
      • glyphicon-pencil
        • -
      • glyphicon-map-marker
        • -
      • glyphicon-adjust
        • -
      • glyphicon-tint
        • -
      • glyphicon-edit
        • -
      • glyphicon-share
        • -
      • glyphicon-check
        • -
      • glyphicon-move
        • -
      • glyphicon-step-backward
        • -
      • glyphicon-fast-backward
        • -
      • glyphicon-backward
        • -
      • glyphicon-play
        • -
      • glyphicon-pause
        • -
      • glyphicon-stop
        • -
      • glyphicon-forward
        • -
      • glyphicon-fast-forward
        • -
      • glyphicon-step-forward
        • -
      • glyphicon-eject
        • -
      • glyphicon-chevron-left
        • -
      • glyphicon-chevron-right
        • -
      • glyphicon-plus-sign
        • -
      • glyphicon-minus-sign
        • -
      • glyphicon-remove-sign
        • -
      • glyphicon-ok-sign
        • +
      • glyphicon-indent-left
        • +
      • glyphicon-indent-right
        • +
      • glyphicon-facetime-video
        • +
      • glyphicon-picture
        • +
      • glyphicon-pencil
        • +
      • glyphicon-map-marker
        • +
      • glyphicon-adjust
        • +
      • glyphicon-tint
        • +
      • glyphicon-edit
        • +
      • glyphicon-share
        • +
      • glyphicon-check
        • +
      • glyphicon-move
        • +
      • glyphicon-step-backward
        • +
      • glyphicon-fast-backward
        • +
      • glyphicon-backward
        • +
      • glyphicon-play
        • +
      • glyphicon-pause
        • +
      • glyphicon-stop
        • +
      • glyphicon-forward
        • +
      • glyphicon-fast-forward
        • +
      • glyphicon-step-forward
        • +
      • glyphicon-eject
        • +
      • glyphicon-chevron-left
        • +
      • glyphicon-chevron-right
        • +
      • glyphicon-plus-sign
        • +
      • glyphicon-minus-sign
        • +
      • glyphicon-remove-sign
        • +
      • glyphicon-ok-sign
        • -
      • glyphicon-question-sign
        • -
      • glyphicon-info-sign
        • -
      • glyphicon-screenshot
        • -
      • glyphicon-remove-circle
        • -
      • glyphicon-ok-circle
        • -
      • glyphicon-ban-circle
        • -
      • glyphicon-arrow-left
        • -
      • glyphicon-arrow-right
        • -
      • glyphicon-arrow-up
        • -
      • glyphicon-arrow-down
        • -
      • glyphicon-share-alt
        • -
      • glyphicon-resize-full
        • -
      • glyphicon-resize-small
        • -
      • glyphicon-plus
        • -
      • glyphicon-minus
        • -
      • glyphicon-asterisk
        • -
      • glyphicon-exclamation-sign
        • -
      • glyphicon-gift
        • -
      • glyphicon-leaf
        • -
      • glyphicon-fire
        • -
      • glyphicon-eye-open
        • -
      • glyphicon-eye-close
        • -
      • glyphicon-warning-sign
        • -
      • glyphicon-plane
        • -
      • glyphicon-calendar
        • -
      • glyphicon-random
        • -
      • glyphicon-comment
        • -
      • glyphicon-magnet
        • +
      • glyphicon-question-sign
        • +
      • glyphicon-info-sign
        • +
      • glyphicon-screenshot
        • +
      • glyphicon-remove-circle
        • +
      • glyphicon-ok-circle
        • +
      • glyphicon-ban-circle
        • +
      • glyphicon-arrow-left
        • +
      • glyphicon-arrow-right
        • +
      • glyphicon-arrow-up
        • +
      • glyphicon-arrow-down
        • +
      • glyphicon-share-alt
        • +
      • glyphicon-resize-full
        • +
      • glyphicon-resize-small
        • +
      • glyphicon-plus
        • +
      • glyphicon-minus
        • +
      • glyphicon-asterisk
        • +
      • glyphicon-exclamation-sign
        • +
      • glyphicon-gift
        • +
      • glyphicon-leaf
        • +
      • glyphicon-fire
        • +
      • glyphicon-eye-open
        • +
      • glyphicon-eye-close
        • +
      • glyphicon-warning-sign
        • +
      • glyphicon-plane
        • +
      • glyphicon-calendar
        • +
      • glyphicon-random
        • +
      • glyphicon-comment
        • +
      • glyphicon-magnet
        • -
      • glyphicon-chevron-up
        • -
      • glyphicon-chevron-down
        • -
      • glyphicon-retweet
        • -
      • glyphicon-shopping-cart
        • -
      • glyphicon-folder-close
        • -
      • glyphicon-folder-open
        • -
      • glyphicon-resize-vertical
        • -
      • glyphicon-resize-horizontal
        • -
      • glyphicon-hdd
        • -
      • glyphicon-bullhorn
        • -
      • glyphicon-bell
        • -
      • glyphicon-certificate
        • -
      • glyphicon-thumbs-up
        • -
      • glyphicon-thumbs-down
        • -
      • glyphicon-hand-right
        • -
      • glyphicon-hand-left
        • -
      • glyphicon-hand-up
        • -
      • glyphicon-hand-down
        • -
      • glyphicon-circle-arrow-right
        • -
      • glyphicon-circle-arrow-left
        • -
      • glyphicon-circle-arrow-up
        • -
      • glyphicon-circle-arrow-down
        • -
      • glyphicon-globe
        • -
      • glyphicon-wrench
        • -
      • glyphicon-tasks
        • -
      • glyphicon-filter
        • -
      • glyphicon-briefcase
        • -
      • glyphicon-fullscreen
        • +
      • glyphicon-chevron-up
        • +
      • glyphicon-chevron-down
        • +
      • glyphicon-retweet
        • +
      • glyphicon-shopping-cart
        • +
      • glyphicon-folder-close
        • +
      • glyphicon-folder-open
        • +
      • glyphicon-resize-vertical
        • +
      • glyphicon-resize-horizontal
        • +
      • glyphicon-hdd
        • +
      • glyphicon-bullhorn
        • +
      • glyphicon-bell
        • +
      • glyphicon-certificate
        • +
      • glyphicon-thumbs-up
        • +
      • glyphicon-thumbs-down
        • +
      • glyphicon-hand-right
        • +
      • glyphicon-hand-left
        • +
      • glyphicon-hand-up
        • +
      • glyphicon-hand-down
        • +
      • glyphicon-circle-arrow-right
        • +
      • glyphicon-circle-arrow-left
        • +
      • glyphicon-circle-arrow-up
        • +
      • glyphicon-circle-arrow-down
        • +
      • glyphicon-globe
        • +
      • glyphicon-wrench
        • +
      • glyphicon-tasks
        • +
      • glyphicon-filter
        • +
      • glyphicon-briefcase
        • +
      • glyphicon-fullscreen
        • -
      • glyphicon-dashboard
        • -
      • glyphicon-paperclip
        • -
      • glyphicon-heart-empty
        • -
      • glyphicon-link
        • -
      • glyphicon-phone
        • -
      • glyphicon-pushpin
        • -
      • glyphicon-euro
        • -
      • glyphicon-usd
        • -
      • glyphicon-gbp
        • -
      • glyphicon-sort
        • -
      • glyphicon-sort-by-alphabet
        • -
      • glyphicon-sort-by-alphabet-alt
        • -
      • glyphicon-sort-by-order
        • -
      • glyphicon-sort-by-order-alt
        • -
      • glyphicon-sort-by-attributes
        • -
      • glyphicon-sort-by-attributes-alt
        • -
      • glyphicon-unchecked
        • -
      • glyphicon-expand
        • -
      • glyphicon-collapse
        • -
      • glyphicon-collapse-top
        • +
      • glyphicon-dashboard
        • +
      • glyphicon-paperclip
        • +
      • glyphicon-heart-empty
        • +
      • glyphicon-link
        • +
      • glyphicon-phone
        • +
      • glyphicon-pushpin
        • +
      • glyphicon-euro
        • +
      • glyphicon-usd
        • +
      • glyphicon-gbp
        • +
      • glyphicon-sort
        • +
      • glyphicon-sort-by-alphabet
        • +
      • glyphicon-sort-by-alphabet-alt
        • +
      • glyphicon-sort-by-order
        • +
      • glyphicon-sort-by-order-alt
        • +
      • glyphicon-sort-by-attributes
        • +
      • glyphicon-sort-by-attributes-alt
        • +
      • glyphicon-unchecked
        • +
      • glyphicon-expand
        • +
      • glyphicon-collapse
        • +
      • glyphicon-collapse-top
      From 9ed5b5e6534b45f29f318d983a7e09be1f7ac946 Mon Sep 17 00:00:00 2001 From: Luis Hdez Date: Tue, 25 Jun 2013 14:34:57 +0200 Subject: [PATCH 28/51] Fix line breaks on add-ons with spaces --- docs/assets/css/bootstrap.css | 1 + less/forms.less | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b7e026dbb..487d7eb2f 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1711,6 +1711,7 @@ input[type="color"].input-small { .input-group-addon, .input-group-btn { width: 1%; + white-space: nowrap; vertical-align: middle; } diff --git a/less/forms.less b/less/forms.less index 609580928..912487610 100644 --- a/less/forms.less +++ b/less/forms.less @@ -321,6 +321,7 @@ input[type="color"] { .input-group-addon, .input-group-btn { width: 1%; + white-space: nowrap; vertical-align: middle; // Match the inputs } From abb112173e26c6785ee472ee3fa41bd06e16e1cc Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 25 Jun 2013 20:52:49 +0200 Subject: [PATCH 29/51] Add callout to docs: 3rd-party libs not supported --- docs/javascript.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/javascript.html b/docs/javascript.html index 955ad31f8..d8ddfa98c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -64,6 +64,11 @@ $('#myModal').on('show.bs.modal', function (e) { if (!data) return e.preventDefault() // stops modal from being shown }) {% endhighlight %} + +
      +

      Third-party libraries

      +

      Bootstrap does not 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.

      +
      From 30e5e89fac222d8e662b998134198dc8fb880411 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 25 Jun 2013 21:01:13 +0200 Subject: [PATCH 30/51] Add callout to docs: LESS compiler support --- docs/getting-started.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/getting-started.html b/docs/getting-started.html index 018c8ed0a..0e8b94bf7 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -48,6 +48,11 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex {% endhighlight %} + +
      +

      LESS compilation

      +

      If you download the original source files, you need to compile Bootstrap's LESS files into usable CSS. While there are various LESS compilers available, Bootstrap only supports the latest stable version of less.js.

      +
-
+ {% 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). From 274a3426576d7aef40bb2b760a3fc7a9bce95521 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 19:50:37 -0700 Subject: [PATCH 46/51] Docs: fix 1 typo; use in 1 place --- docs/css.html | 2 +- docs/customize.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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.

From 242d92e09c60396bad0837581a9692bf7abe8aea Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 20:18:30 -0700 Subject: [PATCH 47/51] Fix #8287 --- docs/components.html | 5 +++++ docs/css.html | 6 +++++- docs/javascript.html | 13 +++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) 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'

From 2471b9d725d2452a10f802af5667509af7b7eb2e Mon Sep 17 00:00:00 2001 From: James Holland Date: Wed, 26 Jun 2013 08:27:12 -0400 Subject: [PATCH 48/51] typo: match doc text and example --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %} -
    +
      ...
    • Disabled link
      • ... From 5e29c42211538e1e3885dc8c70779a17221c9569 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:38:00 -0700 Subject: [PATCH 49/51] remove custom url in jekyll --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index d99935872..ddef7b2b9 100644 --- a/_config.yml +++ b/_config.yml @@ -9,4 +9,3 @@ permalink: pretty source: ./docs destination: ./_gh_pages port: 9001 -url: http://getbootstrap.dev:9001 From c9ccbd2cf0b5b37fe67e55a93223d4836f22da44 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:43:29 -0700 Subject: [PATCH 50/51] Fixes #8329: add `!important` to `.hidden` --- less/responsive-utilities.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index 65fdc3d13..ef80be7a9 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -29,8 +29,8 @@ // Hide from screenreaders and browsers // Credit: HTML5 Boilerplate .hidden { - display: none; - visibility: hidden; + display: none !important; + visibility: hidden !important; } // Visibility utilities From cb483b67589df7ac3ece33303b8ce944b3ac4b0e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 27 Jun 2013 18:45:08 -0700 Subject: [PATCH 51/51] Add parens so sublime picks up on syntax highlighting --- less/responsive-utilities.less | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index ef80be7a9..21e5d7556 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -37,17 +37,17 @@ // For Phones .visible-sm { - .responsive-visibility; + .responsive-visibility(); } .visible-md { display: none !important; } .visible-lg { display: none !important; } .hidden-sm { display: none !important; } .hidden-md { - .responsive-visibility; + .responsive-visibility(); } .hidden-lg { - .responsive-visibility; + .responsive-visibility(); } @@ -55,16 +55,16 @@ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { .visible-sm { display: none !important; } .visible-md { - .responsive-visibility; + .responsive-visibility(); } .visible-lg { display: none !important; } .hidden-sm { - .responsive-visibility; + .responsive-visibility(); } .hidden-md { display: none !important; } .hidden-lg { - .responsive-visibility; + .responsive-visibility(); } } @@ -73,14 +73,14 @@ .visible-sm { display: none !important; } .visible-md { display: none !important; } .visible-lg { - .responsive-visibility; + .responsive-visibility(); } .hidden-sm { - .responsive-visibility; + .responsive-visibility(); } .hidden-md { - .responsive-visibility; + .responsive-visibility(); } .hidden-lg { display: none !important; } } @@ -91,7 +91,7 @@ @media print { .visible-print { - .responsive-visibility; + .responsive-visibility(); } .hidden-print { display: none !important; } }