From 24356ebde8ac4b2ed9ee4ad585251cd54e9c2828 Mon Sep 17 00:00:00 2001 From: davegandy Date: Mon, 2 Dec 2013 12:54:14 -0500 Subject: [PATCH] upgrading docs to bootstrap 3.0.2 --- _config.yml | 2 +- src/Makefile | 4 +- src/assets/js/bootstrap-222.min.js | 6 - src/assets/js/bootstrap-3.0.0.min.js | 6 - src/assets/js/bootstrap-3.0.2.min.js | 9 + src/assets/less/bootstrap-3.0.0/grid.less | 346 ------------------ .../less/bootstrap-3.0.0/thumbnails.less | 31 -- .../alerts.less | 2 +- .../badges.less | 0 .../bootstrap.less | 10 - .../breadcrumbs.less | 4 +- .../button-groups.less | 7 +- .../buttons.less | 6 +- .../carousel.less | 42 ++- .../close.less | 0 .../code.less | 13 +- .../component-animations.less | 0 .../dropdowns.less | 3 +- .../forms.less | 31 +- .../glyphicons.less | 27 +- src/assets/less/bootstrap-3.0.2/grid.less | 93 +++++ .../input-groups.less | 9 + .../jumbotron.less | 4 +- .../labels.less | 0 .../list-group.less | 24 +- .../media.less | 0 .../mixins.less | 193 ++++++++-- .../modals.less | 13 +- .../navbar.less | 17 +- .../navs.less | 73 +++- .../normalize.less | 22 +- .../pager.less | 0 .../pagination.less | 2 + .../panels.less | 38 +- .../popovers.less | 0 .../print.less | 7 +- .../progress-bars.less | 11 +- .../responsive-utilities.less | 125 +++---- .../scaffolding.less | 13 +- .../tables.less | 80 ++-- .../theme.less | 49 ++- .../less/bootstrap-3.0.2/thumbnails.less | 30 ++ .../tooltip.less | 16 +- .../type.less | 101 +++-- .../utilities.less | 16 +- .../variables.less | 95 +++-- .../wells.less | 0 47 files changed, 812 insertions(+), 768 deletions(-) delete mode 100644 src/assets/js/bootstrap-222.min.js delete mode 100755 src/assets/js/bootstrap-3.0.0.min.js create mode 100755 src/assets/js/bootstrap-3.0.2.min.js delete mode 100755 src/assets/less/bootstrap-3.0.0/grid.less delete mode 100755 src/assets/less/bootstrap-3.0.0/thumbnails.less rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/alerts.less (99%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/badges.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/bootstrap.less (82%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/breadcrumbs.less (74%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/button-groups.less (97%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/buttons.less (92%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/carousel.less (79%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/close.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/code.less (85%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/component-animations.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/dropdowns.less (98%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/forms.less (93%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/glyphicons.less (94%) create mode 100755 src/assets/less/bootstrap-3.0.2/grid.less rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/input-groups.less (94%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/jumbotron.less (90%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/labels.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/list-group.less (85%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/media.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/mixins.less (79%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/modals.less (93%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/navbar.less (98%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/navs.less (72%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/normalize.less (94%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/pager.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/pagination.less (98%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/panels.less (85%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/popovers.less (100%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/print.less (89%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/progress-bars.less (82%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/responsive-utilities.less (53%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/scaffolding.less (89%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/tables.less (78%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/theme.less (79%) create mode 100755 src/assets/less/bootstrap-3.0.2/thumbnails.less rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/tooltip.less (84%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/type.less (73%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/utilities.less (63%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/variables.less (89%) rename src/assets/less/{bootstrap-3.0.0 => bootstrap-3.0.2}/wells.less (100%) diff --git a/_config.yml b/_config.yml index 2a09e3363..377d0d746 100644 --- a/_config.yml +++ b/_config.yml @@ -51,7 +51,7 @@ fontawesome: url: http://creativecommons.org/licenses/by/3.0/ bootstrap: - version: 3.0.0 + version: 3.0.2 url: http://getbootstrap.com jquery: diff --git a/src/Makefile b/src/Makefile index 4cdb734c6..4f76e2ccd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -17,7 +17,7 @@ SITE_LESS_DIRECTORY = assets/less SITE_CSS_DIRECTORY = assets/css SITE_LESS = ${SITE_LESS_DIRECTORY}/site.less -SITE_CSS_MIN = ${SITE_CSS_DIRECTORY}/site.css +SITE_CSS = ${SITE_CSS_DIRECTORY}/site.css build: @echo "Compiling Less files" @@ -27,7 +27,7 @@ build: lessc --yui-compress ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN} # sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN} - lessc --compress ${SITE_LESS} > ${SITE_CSS_MIN} + lessc --yui-compress ${SITE_LESS} > ${SITE_CSS} cp -r ${FA_ROOT_DIRECTORY}/* ../ cd assets && mv font-awesome font-awesome-{{ site.fontawesome.version }} && zip -r9 font-awesome-{{ site.fontawesome.version }}.zip font-awesome-{{ site.fontawesome.version }} && mv font-awesome-{{ site.fontawesome.version }} font-awesome diff --git a/src/assets/js/bootstrap-222.min.js b/src/assets/js/bootstrap-222.min.js deleted file mode 100644 index 6eeb15ce3..000000000 --- a/src/assets/js/bootstrap-222.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function($){"use strict";$(function(){$.support.transition=function(){var transitionEnd=function(){var name,el=document.createElement("bootstrap"),transEndEventNames={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(name in transEndEventNames)if(void 0!==el.style[name])return transEndEventNames[name]}();return transitionEnd&&{end:transitionEnd}}()})}(window.jQuery),!function($){"use strict";var dismiss='[data-dismiss="alert"]',Alert=function(el){$(el).on("click",dismiss,this.close)};Alert.prototype.close=function(e){function removeElement(){$parent.trigger("closed").remove()}var $parent,$this=$(this),selector=$this.attr("data-target");selector||(selector=$this.attr("href"),selector=selector&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),e&&e.preventDefault(),$parent.length||($parent=$this.hasClass("alert")?$this:$this.parent()),$parent.trigger(e=$.Event("close")),e.isDefaultPrevented()||($parent.removeClass("in"),$.support.transition&&$parent.hasClass("fade")?$parent.on($.support.transition.end,removeElement):removeElement())};var old=$.fn.alert;$.fn.alert=function(option){return this.each(function(){var $this=$(this),data=$this.data("alert");data||$this.data("alert",data=new Alert(this)),"string"==typeof option&&data[option].call($this)})},$.fn.alert.Constructor=Alert,$.fn.alert.noConflict=function(){return $.fn.alert=old,this},$(document).on("click.alert.data-api",dismiss,Alert.prototype.close)}(window.jQuery),!function($){"use strict";var Button=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.button.defaults,options)};Button.prototype.setState=function(state){var d="disabled",$el=this.$element,data=$el.data(),val=$el.is("input")?"val":"html";state+="Text",data.resetText||$el.data("resetText",$el[val]()),$el[val](data[state]||this.options[state]),setTimeout(function(){"loadingText"==state?$el.addClass(d).attr(d,d):$el.removeClass(d).removeAttr(d)},0)},Button.prototype.toggle=function(){var $parent=this.$element.closest('[data-toggle="buttons-radio"]');$parent&&$parent.find(".active").removeClass("active"),this.$element.toggleClass("active")};var old=$.fn.button;$.fn.button=function(option){return this.each(function(){var $this=$(this),data=$this.data("button"),options="object"==typeof option&&option;data||$this.data("button",data=new Button(this,options)),"toggle"==option?data.toggle():option&&data.setState(option)})},$.fn.button.defaults={loadingText:"loading..."},$.fn.button.Constructor=Button,$.fn.button.noConflict=function(){return $.fn.button=old,this},$(document).on("click.button.data-api","[data-toggle^=button]",function(e){var $btn=$(e.target);$btn.hasClass("btn")||($btn=$btn.closest(".btn")),$btn.button("toggle")})}(window.jQuery),!function($){"use strict";var Carousel=function(element,options){this.$element=$(element),this.options=options,"hover"==this.options.pause&&this.$element.on("mouseenter",$.proxy(this.pause,this)).on("mouseleave",$.proxy(this.cycle,this))};Carousel.prototype={cycle:function(e){return e||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval($.proxy(this.next,this),this.options.interval)),this},to:function(pos){var $active=this.$element.find(".item.active"),children=$active.parent().children(),activePos=children.index($active),that=this;if(!(pos>children.length-1||0>pos))return this.sliding?this.$element.one("slid",function(){that.to(pos)}):activePos==pos?this.pause().cycle():this.slide(pos>activePos?"next":"prev",$(children[pos]))},pause:function(e){return e||(this.paused=!0),this.$element.find(".next, .prev").length&&$.support.transition.end&&(this.$element.trigger($.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){return this.sliding?void 0:this.slide("next")},prev:function(){return this.sliding?void 0:this.slide("prev")},slide:function(type,next){var e,$active=this.$element.find(".item.active"),$next=next||$active[type](),isCycling=this.interval,direction="next"==type?"left":"right",fallback="next"==type?"first":"last",that=this;if(this.sliding=!0,isCycling&&this.pause(),$next=$next.length?$next:this.$element.find(".item")[fallback](),e=$.Event("slide",{relatedTarget:$next[0]}),!$next.hasClass("active")){if($.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(e),e.isDefaultPrevented())return;$next.addClass(type),$next[0].offsetWidth,$active.addClass(direction),$next.addClass(direction),this.$element.one($.support.transition.end,function(){$next.removeClass([type,direction].join(" ")).addClass("active"),$active.removeClass(["active",direction].join(" ")),that.sliding=!1,setTimeout(function(){that.$element.trigger("slid")},0)})}else{if(this.$element.trigger(e),e.isDefaultPrevented())return;$active.removeClass("active"),$next.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return isCycling&&this.cycle(),this}}};var old=$.fn.carousel;$.fn.carousel=function(option){return this.each(function(){var $this=$(this),data=$this.data("carousel"),options=$.extend({},$.fn.carousel.defaults,"object"==typeof option&&option),action="string"==typeof option?option:options.slide;data||$this.data("carousel",data=new Carousel(this,options)),"number"==typeof option?data.to(option):action?data[action]():options.interval&&data.cycle()})},$.fn.carousel.defaults={interval:5e3,pause:"hover"},$.fn.carousel.Constructor=Carousel,$.fn.carousel.noConflict=function(){return $.fn.carousel=old,this},$(document).on("click.carousel.data-api","[data-slide]",function(e){var href,$this=$(this),$target=$($this.attr("data-target")||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,"")),options=$.extend({},$target.data(),$this.data());$target.carousel(options),e.preventDefault()})}(window.jQuery),!function($){"use strict";var Collapse=function(element,options){this.$element=$(element),this.options=$.extend({},$.fn.collapse.defaults,options),this.options.parent&&(this.$parent=$(this.options.parent)),this.options.toggle&&this.toggle()};Collapse.prototype={constructor:Collapse,dimension:function(){var hasWidth=this.$element.hasClass("width");return hasWidth?"width":"height"},show:function(){var dimension,scroll,actives,hasData;if(!this.transitioning){if(dimension=this.dimension(),scroll=$.camelCase(["scroll",dimension].join("-")),actives=this.$parent&&this.$parent.find("> .accordion-group > .in"),actives&&actives.length){if(hasData=actives.data("collapse"),hasData&&hasData.transitioning)return;actives.collapse("hide"),hasData||actives.data("collapse",null)}this.$element[dimension](0),this.transition("addClass",$.Event("show"),"shown"),$.support.transition&&this.$element[dimension](this.$element[0][scroll])}},hide:function(){var dimension;this.transitioning||(dimension=this.dimension(),this.reset(this.$element[dimension]()),this.transition("removeClass",$.Event("hide"),"hidden"),this.$element[dimension](0))},reset:function(size){var dimension=this.dimension();return this.$element.removeClass("collapse")[dimension](size||"auto")[0].offsetWidth,this.$element[null!==size?"addClass":"removeClass"]("collapse"),this},transition:function(method,startEvent,completeEvent){var that=this,complete=function(){"show"==startEvent.type&&that.reset(),that.transitioning=0,that.$element.trigger(completeEvent)};this.$element.trigger(startEvent),startEvent.isDefaultPrevented()||(this.transitioning=1,this.$element[method]("in"),$.support.transition&&this.$element.hasClass("collapse")?this.$element.one($.support.transition.end,complete):complete())},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var old=$.fn.collapse;$.fn.collapse=function(option){return this.each(function(){var $this=$(this),data=$this.data("collapse"),options="object"==typeof option&&option;data||$this.data("collapse",data=new Collapse(this,options)),"string"==typeof option&&data[option]()})},$.fn.collapse.defaults={toggle:!0},$.fn.collapse.Constructor=Collapse,$.fn.collapse.noConflict=function(){return $.fn.collapse=old,this},$(document).on("click.collapse.data-api","[data-toggle=collapse]",function(e){var href,$this=$(this),target=$this.attr("data-target")||e.preventDefault()||(href=$this.attr("href"))&&href.replace(/.*(?=#[^\s]+$)/,""),option=$(target).data("collapse")?"toggle":$this.data();$this[$(target).hasClass("in")?"addClass":"removeClass"]("collapsed"),$(target).collapse(option)})}(window.jQuery),!function($){"use strict";function clearMenus(){$(toggle).each(function(){getParent($(this)).removeClass("open")})}function getParent($this){var $parent,selector=$this.attr("data-target");return selector||(selector=$this.attr("href"),selector=selector&&/#/.test(selector)&&selector.replace(/.*(?=#[^\s]*$)/,"")),$parent=$(selector),$parent.length||($parent=$this.parent()),$parent}var toggle="[data-toggle=dropdown]",Dropdown=function(element){var $el=$(element).on("click.dropdown.data-api",this.toggle);$("html").on("click.dropdown.data-api",function(){$el.parent().removeClass("open")})};Dropdown.prototype={constructor:Dropdown,toggle:function(){var $parent,isActive,$this=$(this);if(!$this.is(".disabled, :disabled"))return $parent=getParent($this),isActive=$parent.hasClass("open"),clearMenus(),isActive||$parent.toggleClass("open"),$this.focus(),!1},keydown:function(e){var $this,$items,$parent,isActive,index;if(/(38|40|27)/.test(e.keyCode)&&($this=$(this),e.preventDefault(),e.stopPropagation(),!$this.is(".disabled, :disabled"))){if($parent=getParent($this),isActive=$parent.hasClass("open"),!isActive||isActive&&27==e.keyCode)return $this.click();$items=$("[role=menu] li:not(.divider):visible a",$parent),$items.length&&(index=$items.index($items.filter(":focus")),38==e.keyCode&&index>0&&index--,40==e.keyCode&&$items.length-1>index&&index++,~index||(index=0),$items.eq(index).focus())}}};var old=$.fn.dropdown;$.fn.dropdown=function(option){return this.each(function(){var $this=$(this),data=$this.data("dropdown");data||$this.data("dropdown",data=new Dropdown(this)),"string"==typeof option&&data[option].call($this)})},$.fn.dropdown.Constructor=Dropdown,$.fn.dropdown.noConflict=function(){return $.fn.dropdown=old,this},$(document).on("click.dropdown.data-api touchstart.dropdown.data-api",clearMenus).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("touchstart.dropdown.data-api",".dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",toggle,Dropdown.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",toggle+", [role=menu]",Dropdown.prototype.keydown)}(window.jQuery),!function($){"use strict";var Modal=function(element,options){this.options=options,this.$element=$(element).delegate('[data-dismiss="modal"]',"click.dismiss.modal",$.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};Modal.prototype={constructor:Modal,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var that=this,e=$.Event("show");this.$element.trigger(e),this.isShown||e.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.backdrop(function(){var transition=$.support.transition&&that.$element.hasClass("fade");that.$element.parent().length||that.$element.appendTo(document.body),that.$element.show(),transition&&that.$element[0].offsetWidth,that.$element.addClass("in").attr("aria-hidden",!1),that.enforceFocus(),transition?that.$element.one($.support.transition.end,function(){that.$element.focus().trigger("shown")}):that.$element.focus().trigger("shown")}))},hide:function(e){e&&e.preventDefault(),e=$.Event("hide"),this.$element.trigger(e),this.isShown&&!e.isDefaultPrevented()&&(this.isShown=!1,this.escape(),$(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),$.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal())},enforceFocus:function(){var that=this;$(document).on("focusin.modal",function(e){that.$element[0]===e.target||that.$element.has(e.target).length||that.$element.focus()})},escape:function(){var that=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(e){27==e.which&&that.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var that=this,timeout=setTimeout(function(){that.$element.off($.support.transition.end),that.hideModal()},500);this.$element.one($.support.transition.end,function(){clearTimeout(timeout),that.hideModal()})},hideModal:function(){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(callback){var animate=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var doAnimate=$.support.transition&&animate;this.$backdrop=$('