From 5525d66b518bebd4f2f0740c2e289099ce2a2487 Mon Sep 17 00:00:00 2001 From: gleb Date: Tue, 28 May 2013 17:49:54 +0200 Subject: [PATCH 1/6] update to the latest sass-twitter-bootstrap 3.0.0beta --- update-bootstrap.sh | 4 +- vendor/assets/javascripts/affix.js | 120 ++++++ vendor/assets/javascripts/alert.js | 96 +++++ vendor/assets/javascripts/button.js | 105 ++++++ vendor/assets/javascripts/carousel.js | 210 +++++++++++ vendor/assets/javascripts/collapse.js | 153 ++++++++ vendor/assets/javascripts/dropdown.js | 155 ++++++++ vendor/assets/javascripts/modal.js | 243 ++++++++++++ vendor/assets/javascripts/popover.js | 109 ++++++ vendor/assets/javascripts/scrollspy.js | 156 ++++++++ vendor/assets/javascripts/tab.js | 133 +++++++ vendor/assets/javascripts/tooltip.js | 353 ++++++++++++++++++ vendor/assets/javascripts/transition.js | 47 +++ .../assets/stylesheets/bootstrap/_alerts.scss | 31 +- .../assets/stylesheets/bootstrap/_badges.scss | 2 +- .../stylesheets/bootstrap/_breadcrumbs.scss | 2 +- .../stylesheets/bootstrap/_button-groups.scss | 7 +- .../stylesheets/bootstrap/_buttons.scss | 21 +- .../stylesheets/bootstrap/_carousel.scss | 7 +- .../assets/stylesheets/bootstrap/_close.scss | 3 +- .../bootstrap/_component-animations.scss | 17 +- .../stylesheets/bootstrap/_dropdowns.scss | 41 +- .../assets/stylesheets/bootstrap/_forms.scss | 110 +++--- .../stylesheets/bootstrap/_glyphicons.scss | 10 +- .../assets/stylesheets/bootstrap/_grid.scss | 4 - .../stylesheets/bootstrap/_jumbotron.scss | 2 +- .../assets/stylesheets/bootstrap/_labels.scss | 27 +- .../assets/stylesheets/bootstrap/_mixins.scss | 49 +-- .../assets/stylesheets/bootstrap/_modals.scss | 6 +- .../assets/stylesheets/bootstrap/_navbar.scss | 22 +- .../assets/stylesheets/bootstrap/_navs.scss | 29 +- .../assets/stylesheets/bootstrap/_pager.scss | 2 +- .../stylesheets/bootstrap/_pagination.scss | 27 +- .../assets/stylesheets/bootstrap/_panels.scss | 10 + .../assets/stylesheets/bootstrap/_print.scss | 2 +- .../bootstrap/_responsive-utilities.scss | 46 +-- .../stylesheets/bootstrap/_scaffolding.scss | 2 +- .../assets/stylesheets/bootstrap/_tables.scss | 9 +- .../assets/stylesheets/bootstrap/_type.scss | 15 +- .../stylesheets/bootstrap/_variables.scss | 81 ++-- .../stylesheets/bootstrap/bootstrap.scss | 2 +- 41 files changed, 2153 insertions(+), 317 deletions(-) create mode 100644 vendor/assets/javascripts/affix.js create mode 100644 vendor/assets/javascripts/alert.js create mode 100644 vendor/assets/javascripts/button.js create mode 100644 vendor/assets/javascripts/carousel.js create mode 100644 vendor/assets/javascripts/collapse.js create mode 100644 vendor/assets/javascripts/dropdown.js create mode 100644 vendor/assets/javascripts/modal.js create mode 100644 vendor/assets/javascripts/popover.js create mode 100644 vendor/assets/javascripts/scrollspy.js create mode 100644 vendor/assets/javascripts/tab.js create mode 100644 vendor/assets/javascripts/tooltip.js create mode 100644 vendor/assets/javascripts/transition.js diff --git a/update-bootstrap.sh b/update-bootstrap.sh index aec72943..fb730372 100755 --- a/update-bootstrap.sh +++ b/update-bootstrap.sh @@ -3,7 +3,7 @@ ROOT=`pwd`"/vendor/assets" TMP='tmp/sass-twitter-bootstrap' # Pull down sass-twitter-bootstrap sources -git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap +git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-bootstrap --branch '3.0.0-wip' # Copy lib/ to stylesheets/ mkdir -p $ROOT/stylesheets/bootstrap cp -r $TMP/lib/* $ROOT/stylesheets/bootstrap @@ -22,4 +22,4 @@ patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss rm $ROOT/stylesheets/bootstrap/*.bak -rm -rf $TMP \ No newline at end of file +rm -rf $TMP diff --git a/vendor/assets/javascripts/affix.js b/vendor/assets/javascripts/affix.js new file mode 100644 index 00000000..2400ba21 --- /dev/null +++ b/vendor/assets/javascripts/affix.js @@ -0,0 +1,120 @@ +/* ======================================================================== + * Bootstrap: affix.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#affix + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // AFFIX CLASS DEFINITION + // ====================== + + var Affix = function (element, options) { + this.options = $.extend({}, Affix.DEFAULTS, options) + this.$window = $(window) + .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this)) + .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) + + this.$element = $(element) + this.affixed = + this.unpin = null + + this.checkPosition() + } + + Affix.DEFAULTS = { + offset: 0 + } + + Affix.prototype.checkPositionWithEventLoop = function () { + setTimeout($.proxy(this.checkPosition, this), 1) + } + + Affix.prototype.checkPosition = function () { + if (!this.$element.is(':visible')) return + + var scrollHeight = $(document).height() + var scrollTop = this.$window.scrollTop() + var position = this.$element.offset() + var offset = this.options.offset + var offsetTop = offset.top + var offsetBottom = offset.bottom + var reset = 'affix affix-top affix-bottom' + + if (typeof offset != 'object') offsetBottom = offsetTop = offset + if (typeof offsetTop == 'function') offsetTop = offset.top() + if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() + + var affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? false : + offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' : + offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false + + if (this.affixed === affix) return + + this.affixed = affix + this.unpin = affix == 'bottom' ? position.top - scrollTop : null + + this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) + } + + + // AFFIX PLUGIN DEFINITION + // ======================= + + var old = $.fn.affix + + $.fn.affix = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.affix') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.affix', (data = new Affix(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.affix.Constructor = Affix + + + // AFFIX NO CONFLICT + // ================= + + $.fn.affix.noConflict = function () { + $.fn.affix = old + return this + } + + + // AFFIX DATA-API + // ============== + + $(window).on('load', function () { + $('[data-spy="affix"]').each(function () { + var $spy = $(this) + var data = $spy.data() + + data.offset = data.offset || {} + + if (data.offsetBottom) data.offset.bottom = data.offsetBottom + if (data.offsetTop) data.offset.top = data.offsetTop + + $spy.affix(data) + }) + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/alert.js b/vendor/assets/javascripts/alert.js new file mode 100644 index 00000000..d9f64767 --- /dev/null +++ b/vendor/assets/javascripts/alert.js @@ -0,0 +1,96 @@ +/* ======================================================================== + * Bootstrap: alert.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#alerts + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // ALERT CLASS DEFINITION + // ====================== + + var dismiss = '[data-dismiss="alert"]' + var Alert = function (el) { + $(el).on('click', dismiss, this.close) + } + + Alert.prototype.close = function (e) { + var $this = $(this) + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7 + } + + var $parent = $(selector) + + if (e) e.preventDefault() + + if (!$parent.length) { + $parent = $this.hasClass('alert') ? $this : $this.parent() + } + + $parent.trigger(e = $.Event('close.bs.alert')) + + if (e.isDefaultPrevented()) return + + $parent.removeClass('in') + + function removeElement() { + $parent.trigger('closed.bs.alert').remove() + } + + $.support.transition && $parent.hasClass('fade') ? + $parent.on($.support.transition.end, removeElement) : + removeElement() + } + + + // ALERT PLUGIN DEFINITION + // ======================= + + var old = $.fn.alert + + $.fn.alert = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.alert') + + if (!data) $this.data('bs.alert', (data = new Alert(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.alert.Constructor = Alert + + + // ALERT NO CONFLICT + // ================= + + $.fn.alert.noConflict = function () { + $.fn.alert = old + return this + } + + + // ALERT DATA-API + // ============== + + $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/button.js b/vendor/assets/javascripts/button.js new file mode 100644 index 00000000..c2964784 --- /dev/null +++ b/vendor/assets/javascripts/button.js @@ -0,0 +1,105 @@ +/* ======================================================================== + * Bootstrap: button.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#buttons + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // BUTTON PUBLIC CLASS DEFINITION + // ============================== + + var Button = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Button.DEFAULTS, options) + } + + Button.DEFAULTS = { + loadingText: 'loading...' + } + + Button.prototype.setState = function (state) { + var d = 'disabled' + var $el = this.$element + var val = $el.is('input') ? 'val' : 'html' + var data = $el.data() + + state = state + 'Text' + + if (!data.resetText) $el.data('resetText', $el[val]()) + + $el[val](data[state] || this.options[state]) + + // push to event loop to allow forms to submit + setTimeout(function () { + state == 'loadingText' ? + $el.addClass(d).attr(d, d) : + $el.removeClass(d).removeAttr(d); + }, 0) + } + + Button.prototype.toggle = function () { + var $parent = this.$element.closest('[data-toggle="buttons-radio"]') + + if ($parent) { + $parent.find('.active').removeClass('active') + } + + this.$element.toggleClass('active') + } + + + // BUTTON PLUGIN DEFINITION + // ======================== + + var old = $.fn.button + + $.fn.button = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('button') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.button', (data = new Button(this, options))) + + if (option == 'toggle') data.toggle() + else if (option) data.setState(option) + }) + } + + $.fn.button.Constructor = Button + + + // BUTTON NO CONFLICT + // ================== + + $.fn.button.noConflict = function () { + $.fn.button = old + return this + } + + + // BUTTON DATA-API + // =============== + + $(document).on('click.bs.button.data-api', '[data-toggle^=button]', function (e) { + var $btn = $(e.target) + if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') + $btn.button('toggle') + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/carousel.js b/vendor/assets/javascripts/carousel.js new file mode 100644 index 00000000..0da8e41c --- /dev/null +++ b/vendor/assets/javascripts/carousel.js @@ -0,0 +1,210 @@ +/* ======================================================================== + * Bootstrap: carousel.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#carousel + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CAROUSEL CLASS DEFINITION + // ========================= + + var Carousel = function (element, options) { + this.$element = $(element) + this.$indicators = this.$element.find('.carousel-indicators') + this.options = options + this.paused = + this.sliding = + this.interval = + this.$active = + this.$items = null + + this.options.pause == 'hover' && this.$element + .on('mouseenter', $.proxy(this.pause, this)) + .on('mouseleave', $.proxy(this.cycle, this)) + } + + Carousel.DEFAULTS = { + interval: 5000 + , pause: 'hover' + } + + Carousel.prototype.cycle = function (e) { + e || (this.paused = false) + + this.interval && clearInterval(this.interval) + + this.options.interval + && !this.paused + && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) + + return this + } + + Carousel.prototype.getActiveIndex = function () { + this.$active = this.$element.find('.item.active') + this.$items = this.$active.parent().children() + + return this.$items.index(this.$active) + } + + Carousel.prototype.to = function (pos) { + var that = this + var activeIndex = this.getActiveIndex() + + if (pos > (this.$items.length - 1) || pos < 0) return + + if (this.sliding) return this.$element.one('slid', function () { that.to(pos) }) + if (activeIndex == pos) return this.pause().cycle() + + return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) + } + + Carousel.prototype.pause = function (e) { + e || (this.paused = true) + + if (this.$element.find('.next, .prev').length && $.support.transition.end) { + this.$element.trigger($.support.transition.end) + this.cycle(true) + } + + this.interval = clearInterval(this.interval) + + return this + } + + Carousel.prototype.next = function () { + if (this.sliding) return + return this.slide('next') + } + + Carousel.prototype.prev = function () { + if (this.sliding) return + return this.slide('prev') + } + + Carousel.prototype.slide = function (type, next) { + var $active = this.$element.find('.item.active') + var $next = next || $active[type]() + var isCycling = this.interval + var direction = type == 'next' ? 'left' : 'right' + var fallback = type == 'next' ? 'first' : 'last' + var that = this + + this.sliding = true + + isCycling && this.pause() + + $next = $next.length ? $next : this.$element.find('.item')[fallback]() + + var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) + + if ($next.hasClass('active')) return + + if (this.$indicators.length) { + this.$indicators.find('.active').removeClass('active') + this.$element.one('slid', function () { + var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) + $nextIndicator && $nextIndicator.addClass('active') + }) + } + + if ($.support.transition && this.$element.hasClass('slide')) { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $next.addClass(type) + $next[0].offsetWidth // force reflow + $active.addClass(direction) + $next.addClass(direction) + this.$element.one($.support.transition.end, function () { + $next.removeClass([type, direction].join(' ')).addClass('active') + $active.removeClass(['active', direction].join(' ')) + that.sliding = false + setTimeout(function () { that.$element.trigger('slid') }, 0) + }) + } else { + this.$element.trigger(e) + if (e.isDefaultPrevented()) return + $active.removeClass('active') + $next.addClass('active') + this.sliding = false + this.$element.trigger('slid') + } + + isCycling && this.cycle() + + return this + } + + + // CAROUSEL PLUGIN DEFINITION + // ========================== + + var old = $.fn.carousel + + $.fn.carousel = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.carousel') + var options = $.extend({}, Carousel.DEFAULTS, typeof option == 'object' && option) + var action = typeof option == 'string' ? option : options.slide + + if (!data) $this.data('bs.carousel', (data = new Carousel(this, options))) + if (typeof option == 'number') data.to(option) + else if (action) data[action]() + else if (options.interval) data.pause().cycle() + }) + } + + $.fn.carousel.Constructor = Carousel + + + // CAROUSEL NO CONFLICT + // ==================== + + $.fn.carousel.noConflict = function () { + $.fn.carousel = old + return this + } + + + // CAROUSEL DATA-API + // ================= + + $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { + var $this = $(this), href + var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + var options = $.extend({}, $target.data(), $this.data()) + var slideIndex + + $target.carousel(options) + + if (slideIndex = $this.attr('data-slide-to')) { + $target.data('bs-carousel').pause().to(slideIndex).cycle() + } + + e.preventDefault() + }) + + $(window).on('load', function () { + $('[data-ride="carousel"]').each(function () { + var $carousel = $(this) + $carousel.carousel($carousel.data()) + }) + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/collapse.js b/vendor/assets/javascripts/collapse.js new file mode 100644 index 00000000..f8b65b39 --- /dev/null +++ b/vendor/assets/javascripts/collapse.js @@ -0,0 +1,153 @@ +/* ======================================================================== + * Bootstrap: collapse.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#collapse + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // COLLAPSE PUBLIC CLASS DEFINITION + // ================================ + + var Collapse = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, Collapse.DEFAULTS, options) + this.transitioning = null + + if (this.options.parent) this.$parent = $(this.options.parent) + if (this.options.toggle) this.toggle() + } + + Collapse.DEFAULTS = { + toggle: true + } + + Collapse.prototype.dimension = function () { + var hasWidth = this.$element.hasClass('width') + return hasWidth ? 'width' : 'height' + } + + Collapse.prototype.show = function () { + if (this.transitioning || this.$element.hasClass('in')) return + + var dimension = this.dimension() + var scroll = $.camelCase(['scroll', dimension].join('-')) + var actives = this.$parent && this.$parent.find('> .accordion-group > .in') + + if (actives && actives.length) { + var hasData = actives.data('collapse') + if (hasData && hasData.transitioning) return + actives.collapse('hide') + hasData || actives.data('collapse', null) + } + + this.$element[dimension](0) + this.transition('addClass', $.Event('show.bs.collapse'), 'shown.bs.collapse') + + if ($.support.transition) this.$element[dimension](this.$element[0][scroll]) + } + + Collapse.prototype.hide = function () { + if (this.transitioning || !this.$element.hasClass('in')) return + var dimension = this.dimension() + this.reset(this.$element[dimension]()) + this.transition('removeClass', $.Event('hide.bs.collapse'), 'hidden') + this.$element[dimension](0) + } + + Collapse.prototype.reset = function (size) { + var dimension = this.dimension() + + this.$element + .removeClass('collapse') + [dimension](size || 'auto') + [0].offsetWidth + + this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') + + return this + } + + Collapse.prototype.transition = function (method, startEvent, completeEvent) { + var that = this + var complete = function () { + if (startEvent.type == 'show') that.reset() + that.transitioning = 0 + that.$element.trigger(completeEvent) + } + + this.$element.trigger(startEvent) + + if (startEvent.isDefaultPrevented()) return + + this.transitioning = 1 + + this.$element[method]('in') + + $.support.transition && this.$element.hasClass('collapse') ? + this.$element.one($.support.transition.end, complete) : + complete() + } + + Collapse.prototype.toggle = function () { + this[this.$element.hasClass('in') ? 'hide' : 'show']() + } + + + // COLLAPSE PLUGIN DEFINITION + // ========================== + + var old = $.fn.collapse + + $.fn.collapse = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('collapse') + var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('collapse', (data = new Collapse(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.collapse.Constructor = Collapse + + + // COLLAPSE NO CONFLICT + // ==================== + + $.fn.collapse.noConflict = function () { + $.fn.collapse = old + return this + } + + + // COLLAPSE DATA-API + // ================= + + $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + var $this = $(this), href + var target = $this.attr('data-target') + || e.preventDefault() + || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 + var option = $(target).data('collapse') ? 'toggle' : $this.data() + + $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') + $(target).collapse(option) + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/dropdown.js b/vendor/assets/javascripts/dropdown.js new file mode 100644 index 00000000..2bb789a7 --- /dev/null +++ b/vendor/assets/javascripts/dropdown.js @@ -0,0 +1,155 @@ +/* ======================================================================== + * Bootstrap: dropdown.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#dropdowns + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // DROPDOWN CLASS DEFINITION + // ========================= + + var backdrop = '.dropdown-backdrop' + var toggle = '[data-toggle=dropdown]' + var Dropdown = function (element) { + var $el = $(element).on('click.bs.dropdown', this.toggle) + } + + Dropdown.prototype.toggle = function (e) { + var $this = $(this) + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + clearMenus() + + if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $('
').insertBefore($(this)).on('click', clearMenus) + } + + $parent.trigger(e = $.Event('show.bs.dropdown')) + + if (e.isDefaultPrevented()) return + + $parent + .toggleClass('open') + .trigger('shown.bs.dropdown') + } + + $this.focus() + + return false + } + + Dropdown.prototype.keydown = function (e) { + if (!/(38|40|27)/.test(e.keyCode)) return + + var $this = $(this) + + e.preventDefault() + e.stopPropagation() + + if ($this.is('.disabled, :disabled')) return + + var $parent = getParent($this) + var isActive = $parent.hasClass('open') + + if (!isActive || (isActive && e.keyCode == 27)) { + if (e.which == 27) $parent.find(toggle).focus() + return $this.click() + } + + var $items = $('[role=menu] li:not(.divider):visible a', $parent) + + if (!$items.length) return + + var index = $items.index($items.filter(':focus')) + + if (e.keyCode == 38 && index > 0) index-- // up + if (e.keyCode == 40 && index < $items.length - 1) index++ // down + if (!~index) index=0 + + $items.eq(index).focus() + } + + function clearMenus() { + $(backdrop).remove() + $(toggle).each(function (e) { + var $parent = getParent($(this)) + if (!$parent.hasClass('open')) return + $parent.trigger(e = $.Event('hide.bs.dropdown')) + if (e.isDefaultPrevented()) return + $parent.removeClass('open').trigger('hidden.bs.dropdown') + }) + } + + function getParent($this) { + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + var $parent = selector && $(selector) + + return $parent && $parent.length ? $parent : $this.parent() + } + + + // DROPDOWN PLUGIN DEFINITION + // ========================== + + var old = $.fn.dropdown + + $.fn.dropdown = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('dropdown') + + if (!data) $this.data('dropdown', (data = new Dropdown(this))) + if (typeof option == 'string') data[option].call($this) + }) + } + + $.fn.dropdown.Constructor = Dropdown + + + // DROPDOWN NO CONFLICT + // ==================== + + $.fn.dropdown.noConflict = function () { + $.fn.dropdown = old + return this + } + + + // APPLY TO STANDARD DROPDOWN ELEMENTS + // =================================== + + + $(document) + .on('click.bs.dropdown.data-api', clearMenus) + .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/modal.js b/vendor/assets/javascripts/modal.js new file mode 100644 index 00000000..07b50812 --- /dev/null +++ b/vendor/assets/javascripts/modal.js @@ -0,0 +1,243 @@ +/* ======================================================================== + * Bootstrap: modal.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#modals + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // MODAL CLASS DEFINITION + // ====================== + + var Modal = function (element, options) { + this.options = options + this.$element = $(element).delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this)) + this.$backdrop = + this.isShown = null + + if (this.options.remote) this.$element.find('.modal-body').load(this.options.remote) + } + + Modal.DEFAULTS = { + backdrop: true + , keyboard: true + , show: true + } + + Modal.prototype.toggle = function () { + return this[!this.isShown ? 'show' : 'hide']() + } + + Modal.prototype.show = function () { + var that = this + var e = $.Event('show.bs.modal') + + this.$element.trigger(e) + + if (this.isShown || e.isDefaultPrevented()) return + + this.isShown = true + + this.escape() + + this.backdrop(function () { + var transition = $.support.transition && that.$element.hasClass('fade') + + if (!that.$element.parent().length) { + that.$element.appendTo(document.body) // don't move modals dom position + } + + that.$element.show() + + if (transition) { + that.$element[0].offsetWidth // force reflow + } + + that.$element + .addClass('in') + .attr('aria-hidden', false) + + that.enforceFocus() + + transition ? + that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown.bs.modal') }) : + that.$element.focus().trigger('shown.bs.modal') + }) + } + + Modal.prototype.hide = function (e) { + if (e) e.preventDefault() + + e = $.Event('hide.bs.modal') + + this.$element.trigger(e) + + if (!this.isShown || e.isDefaultPrevented()) return + + this.isShown = false + + this.escape() + + $(document).off('focusin.bs.modal') + + this.$element + .removeClass('in') + .attr('aria-hidden', true) + + $.support.transition && this.$element.hasClass('fade') ? + this.hideWithTransition() : + this.hideModal() + } + + Modal.prototype.enforceFocus = function () { + $(document) + .off('focusin.bs.modal') // guard against infinite focus loop + .on('focusin.bs.modal', function (e) { + if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { + this.$element.focus() + } + }, this) + } + + Modal.prototype.escape = function () { + if (this.isShown && this.options.keyboard) { + this.$element.on('keyup.dismiss.bs.modal', function ( e ) { + e.which == 27 && this.hide() + }, this) + } else if (!this.isShown) { + this.$element.off('keyup.dismiss.bs.modal') + } + } + + Modal.prototype.hideWithTransition = function () { + var that = this + var timeout = setTimeout(function () { + that.$element.off($.support.transition.end) + that.hideModal() + }, 500) + + this.$element.one($.support.transition.end, function () { + clearTimeout(timeout) + that.hideModal() + }) + } + + Modal.prototype.hideModal = function () { + var that = this + this.$element.hide() + this.backdrop(function () { + that.removeBackdrop() + that.$element.trigger('hidden.bs.modal') + }) + } + + Modal.prototype.removeBackdrop = function () { + this.$backdrop && this.$backdrop.remove() + this.$backdrop = null + } + + Modal.prototype.backdrop = function (callback) { + var that = this + var animate = this.$element.hasClass('fade') ? 'fade' : '' + + if (this.isShown && this.options.backdrop) { + var doAnimate = $.support.transition && animate + + this.$backdrop = $('
') + .appendTo(document.body) + + this.$backdrop.click( + this.options.backdrop == 'static' ? + $.proxy(this.$element[0].focus, this.$element[0]) + : $.proxy(this.hide, this) + ) + + if (doAnimate) this.$backdrop[0].offsetWidth // force reflow + + this.$backdrop.addClass('in') + + if (!callback) return + + doAnimate ? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (!this.isShown && this.$backdrop) { + this.$backdrop.removeClass('in') + + $.support.transition && this.$element.hasClass('fade')? + this.$backdrop.one($.support.transition.end, callback) : + callback() + + } else if (callback) { + callback() + } + } + + + // MODAL PLUGIN DEFINITION + // ======================= + + var old = $.fn.modal + + $.fn.modal = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.modal') + var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option) + + if (!data) $this.data('bs.modal', (data = new Modal(this, options))) + if (typeof option == 'string') data[option]() + else if (options.show) data.show() + }) + } + + $.fn.modal.Constructor = Modal + + + // MODAL NO CONFLICT + // ================= + + $.fn.modal.noConflict = function () { + $.fn.modal = old + return this + } + + + // MODAL DATA-API + // ============== + + $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) { + var $this = $(this) + var href = $this.attr('href') + var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 + var option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) + + e.preventDefault() + + $target + .modal(option) + .one('hide', function () { + $this.focus() + }) + }) + + var $body = $(document.body) + .on('bs.modal.shown', '.modal', function () { $body.addClass('modal-open') }) + .on('bs.modal.hidden', '.modal', function () { $body.removeClass('modal-open') }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/popover.js b/vendor/assets/javascripts/popover.js new file mode 100644 index 00000000..33edadf7 --- /dev/null +++ b/vendor/assets/javascripts/popover.js @@ -0,0 +1,109 @@ +/* ======================================================================== + * Bootstrap: popover.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#popovers + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // POPOVER PUBLIC CLASS DEFINITION + // =============================== + + var Popover = function (element, options) { + this.init('popover', element, options) + } + + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '

' + }) + + + // NOTE: POPOVER EXTENDS tooltip.js + // ================================ + + Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype) + + Popover.prototype.constructor = Popover + + Popover.prototype.getDefaults = function () { + return Popover.DEFAULTS + } + + Popover.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + var content = this.getContent() + + $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) + $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) + + $tip.removeClass('fade top bottom left right in') + } + + Popover.prototype.hasContent = function () { + return this.getTitle() || this.getContent() + } + + Popover.prototype.getContent = function () { + var content = typeof this.options.content == 'function' ? + this.options.content.call(this.$element[0]) : + this.options.content + + return content || this.$element.attr('data-content') + } + + Popover.prototype.tip = function () { + if (!this.$tip) this.$tip = $(this.options.template) + return this.$tip + } + + Popover.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData(this.type) + } + + + // POPOVER PLUGIN DEFINITION + // ========================= + + var old = $.fn.popover + + $.fn.popover = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.popover') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.popover', (data = new Popover(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.popover.Constructor = Popover + + + // POPOVER NO CONFLICT + // =================== + + $.fn.popover.noConflict = function () { + $.fn.popover = old + return this + } + +}(window.jQuery); diff --git a/vendor/assets/javascripts/scrollspy.js b/vendor/assets/javascripts/scrollspy.js new file mode 100644 index 00000000..8d1e72a8 --- /dev/null +++ b/vendor/assets/javascripts/scrollspy.js @@ -0,0 +1,156 @@ +/* ======================================================================== + * Bootstrap: scrollspy.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#scrollspy + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // SCROLLSPY CLASS DEFINITION + // ========================== + + function ScrollSpy(element, options) { + var href + var process = $.proxy(this.process, this) + var $element = $(element).is('body') ? $(window) : $(element) + + this.$body = $('body') + this.$scrollElement = $element.on('scroll.bs.scroll-spy.data-api', process) + this.options = $.extend({}, ScrollSpy.DEFAULTS, options) + this.selector = (this.options.target + || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 + || '') + ' .nav li > a' + this.offsets = $([]) + this.targets = $([]) + this.activeTarget = null + + this.refresh() + this.process() + } + + ScrollSpy.DEFAULTS = { + offset: 10 + } + + ScrollSpy.prototype.refresh = function () { + this.offsets = $([]) + this.targets = $([]) + + var self = this + var $targets = this.$body + .find(this.selector) + .map(function () { + var $el = $(this) + var href = $el.data('target') || $el.attr('href') + var $href = /^#\w/.test(href) && $(href) + + return ($href + && $href.length + && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + }) + .sort(function (a, b) { return a[0] - b[0] }) + .each(function () { + self.offsets.push(this[0]) + self.targets.push(this[1]) + }) + } + + ScrollSpy.prototype.process = function () { + var scrollTop = this.$scrollElement.scrollTop() + this.options.offset + var scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight + var maxScroll = scrollHeight - this.$scrollElement.height() + var offsets = this.offsets + var targets = this.targets + var activeTarget = this.activeTarget + var i + + if (scrollTop >= maxScroll) { + return activeTarget != (i = targets.last()[0]) && this.activate(i) + } + + for (i = offsets.length; i--;) { + activeTarget != targets[i] + && scrollTop >= offsets[i] + && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && this.activate( targets[i] ) + } + } + + ScrollSpy.prototype.activate = function (target) { + this.activeTarget = target + + $(this.selector) + .parents('.active') + .removeClass('active') + + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' + + var active = $(selector) + .parents('li') + .addClass('active') + + if (active.parent('.dropdown-menu').length) { + active = active + .closest('li.dropdown') + .addClass('active') + } + + active.trigger('activate') + } + + + // SCROLLSPY PLUGIN DEFINITION + // =========================== + + var old = $.fn.scrollspy + + $.fn.scrollspy = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.scrollspy') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.scrollspy.Constructor = ScrollSpy + + + // SCROLLSPY NO CONFLICT + // ===================== + + $.fn.scrollspy.noConflict = function () { + $.fn.scrollspy = old + return this + } + + + // SCROLLSPY DATA-API + // ================== + + $(window).on('load', function () { + $('[data-spy="scroll"]').each(function () { + var $spy = $(this) + $spy.scrollspy($spy.data()) + }) + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/tab.js b/vendor/assets/javascripts/tab.js new file mode 100644 index 00000000..89dbb8b7 --- /dev/null +++ b/vendor/assets/javascripts/tab.js @@ -0,0 +1,133 @@ +/* ======================================================================== + * Bootstrap: tab.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#tabs + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TAB CLASS DEFINITION + // ==================== + + var Tab = function (element) { + this.element = $(element) + } + + Tab.prototype.show = function () { + var $this = this.element + var $ul = $this.closest('ul:not(.dropdown-menu)') + var selector = $this.attr('data-target') + + if (!selector) { + selector = $this.attr('href') + selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + } + + if ($this.parent('li').hasClass('active')) return + + var previous = $ul.find('.active:last a')[0] + var e = $.Event('show.bs.tab', { + relatedTarget: previous + }) + + $this.trigger(e) + + if (e.isDefaultPrevented()) return + + var $target = $(selector) + + this.activate($this.parent('li'), $ul) + this.activate($target, $target.parent(), function () { + $this.trigger({ + type: 'shown.bs.tab' + , relatedTarget: previous + }) + }) + } + + Tab.prototype.activate = function (element, container, callback) { + var $active = container.find('> .active') + var transition = callback + && $.support.transition + && $active.hasClass('fade') + + function next() { + $active + .removeClass('active') + .find('> .dropdown-menu > .active') + .removeClass('active') + + element.addClass('active') + + if (transition) { + element[0].offsetWidth // reflow for transition + element.addClass('in') + } else { + element.removeClass('fade') + } + + if (element.parent('.dropdown-menu')) { + element.closest('li.dropdown').addClass('active') + } + + callback && callback() + } + + transition ? + $active.one($.support.transition.end, next) : + next() + + $active.removeClass('in') + } + + + // TAB PLUGIN DEFINITION + // ===================== + + var old = $.fn.tab + + $.fn.tab = function ( option ) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tab') + + if (!data) $this.data('bs.tab', (data = new Tab(this))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tab.Constructor = Tab + + + // TAB NO CONFLICT + // =============== + + $.fn.tab.noConflict = function () { + $.fn.tab = old + return this + } + + + // TAB DATA-API + // ============ + + $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { + e.preventDefault() + $(this).tab('show') + }) + +}(window.jQuery); diff --git a/vendor/assets/javascripts/tooltip.js b/vendor/assets/javascripts/tooltip.js new file mode 100644 index 00000000..80bdf726 --- /dev/null +++ b/vendor/assets/javascripts/tooltip.js @@ -0,0 +1,353 @@ +/* ======================================================================== + * Bootstrap: tooltip.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#affix + * Inspired by the original jQuery.tipsy by Jason Frame + * ======================================================================== + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // TOOLTIP PUBLIC CLASS DEFINITION + // =============================== + + var Tooltip = function (element, options) { + this.type = + this.options = + this.enabled = + this.timeout = + this.hoverState = + this.$element = null + + this.init('tooltip', element, options) + } + + Tooltip.DEFAULTS = { + animation: true + , placement: 'top' + , selector: false + , template: '
' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false + } + + Tooltip.prototype.init = function (type, element, options) { + this.enabled = true + this.type = type + this.$element = $(element) + this.options = this.getOptions(options) + + var triggers = this.options.trigger.split(' ') + + for (var i = triggers.length; i--;) { + var trigger = triggers[i] + + if (trigger == 'click') { + this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) + } else if (trigger != 'manual') { + var eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' + var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' + + this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) + this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) + } + } + + this.options.selector ? + (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : + this.fixTitle() + } + + Tooltip.prototype.getDefaults = function () { + return Tooltip.DEFAULTS + } + + Tooltip.prototype.getOptions = function (options) { + options = $.extend({}, this.getDefaults(), this.$element.data(), options) + + if (options.delay && typeof options.delay == 'number') { + options.delay = { + show: options.delay + , hide: options.delay + } + } + + return options + } + + Tooltip.prototype.enter = function (e) { + var defaults = this.getDefaults() + var options = {} + + this._options && $.each(this._options, function (key, value) { + if (defaults[key] != value) options[key] = value + }) + + var self = $(e.currentTarget)[this.type](options).data('bs.' + this.type) + + if (!self.options.delay || !self.options.delay.show) return self.show() + + clearTimeout(this.timeout) + + self.hoverState = 'in' + this.timeout = setTimeout(function() { + if (self.hoverState == 'in') self.show() + }, self.options.delay.show) + } + + Tooltip.prototype.leave = function (e) { + var self = $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) + + if (this.timeout) clearTimeout(this.timeout) + if (!self.options.delay || !self.options.delay.hide) return self.hide() + + self.hoverState = 'out' + this.timeout = setTimeout(function() { + if (self.hoverState == 'out') self.hide() + }, self.options.delay.hide) + } + + Tooltip.prototype.show = function () { + var e = $.Event('show.bs.'+ this.type) + + if (this.hasContent() && this.enabled) { + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + var $tip = this.tip() + + this.setContent() + + if (this.options.animation) $tip.addClass('fade') + + var placement = typeof this.options.placement == 'function' ? + this.options.placement.call(this, $tip[0], this.$element[0]) : + this.options.placement + + $tip + .detach() + .css({ top: 0, left: 0, display: 'block' }) + + this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) + + var tp + var pos = this.getPosition() + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + switch (placement) { + case 'bottom': + tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'top': + tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} + break + case 'left': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} + break + case 'right': + tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} + break + } + + this.applyPlacement(tp, placement) + this.$element.trigger('shown.bs.' + this.type) + } + } + + Tooltip.prototype.applyPlacement = function(offset, placement) { + var replace + var $tip = this.tip() + var width = $tip[0].offsetWidth + var height = $tip[0].offsetHeight + + $tip + .offset(offset) + .addClass(placement) + .addClass('in') + + var actualWidth = $tip[0].offsetWidth + var actualHeight = $tip[0].offsetHeight + + if (placement == 'top' && actualHeight != height) { + replace = true + offset.top = offset.top + height - actualHeight + } + + if (placement == 'bottom' || placement == 'top') { + var delta = 0 + + if (offset.left < 0){ + delta = offset.left * -2 + offset.left = 0 + + $tip.offset(offset) + + actualWidth = $tip[0].offsetWidth + actualHeight = $tip[0].offsetHeight + } + + this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') + } else { + this.replaceArrow(actualHeight - height, actualHeight, 'top') + } + + if (replace) $tip.offset(offset) + } + + Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + } + + Tooltip.prototype.setContent = function () { + var $tip = this.tip() + var title = this.getTitle() + + $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) + $tip.removeClass('fade in top bottom left right') + } + + Tooltip.prototype.hide = function () { + var that = this + var $tip = this.tip() + var e = $.Event('hide.bs.' + this.type) + + this.$element.trigger(e) + + if (e.isDefaultPrevented()) return + + $tip.removeClass('in') + + function removeWithAnimation() { + var timeout = setTimeout(function () { + $tip.off($.support.transition.end).detach() + }, 500) + + $tip.one($.support.transition.end, function () { + clearTimeout(timeout) + $tip.detach() + }) + } + + $.support.transition && this.$tip.hasClass('fade') ? + removeWithAnimation() : + $tip.detach() + + this.$element.trigger('hidden.bs.' + this.type) + + return this + } + + Tooltip.prototype.fixTitle = function () { + var $e = this.$element + if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { + $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') + } + } + + Tooltip.prototype.hasContent = function () { + return this.getTitle() + } + + Tooltip.prototype.getPosition = function () { + var el = this.$element[0] + return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { + width: el.offsetWidth + , height: el.offsetHeight + }, this.$element.offset()) + } + + Tooltip.prototype.getTitle = function () { + var title + var $e = this.$element + var o = this.options + + title = $e.attr('data-original-title') + || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) + + return title + } + + Tooltip.prototype.tip = function () { + return this.$tip = this.$tip || $(this.options.template) + } + + Tooltip.prototype.arrow =function(){ + return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") + } + + Tooltip.prototype.validate = function () { + if (!this.$element[0].parentNode) { + this.hide() + this.$element = null + this.options = null + } + } + + Tooltip.prototype.enable = function () { + this.enabled = true + } + + Tooltip.prototype.disable = function () { + this.enabled = false + } + + Tooltip.prototype.toggleEnabled = function () { + this.enabled = !this.enabled + } + + Tooltip.prototype.toggle = function (e) { + var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this + self.tip().hasClass('in') ? self.hide() : self.show() + } + + Tooltip.prototype.destroy = function () { + this.hide().$element.off('.' + this.type).removeData('bs.' + this.type) + } + + + // TOOLTIP PLUGIN DEFINITION + // ========================= + + var old = $.fn.tooltip + + $.fn.tooltip = function (option) { + return this.each(function () { + var $this = $(this) + var data = $this.data('bs.tooltip') + var options = typeof option == 'object' && option + + if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.tooltip.Constructor = Tooltip + + + // TOOLTIP NO CONFLICT + // =================== + + $.fn.tooltip.noConflict = function () { + $.fn.tooltip = old + return this + } + +}(window.jQuery); diff --git a/vendor/assets/javascripts/transition.js b/vendor/assets/javascripts/transition.js new file mode 100644 index 00000000..2ad53234 --- /dev/null +++ b/vendor/assets/javascripts/transition.js @@ -0,0 +1,47 @@ +/* ======================================================================== + * Bootstrap: transition.js v3.0.0 + * http://twitter.github.com/bootstrap/javascript.html#transitions + * ======================================================================== + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ======================================================================== */ + + ++function ($) { "use strict"; + + // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) + // ============================================================ + + function transitionEnd() { + var el = document.createElement('bootstrap') + + var transEndEventNames = { + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' + } + + for (var name in transEndEventNames) { + if (el.style[name] !== undefined) { + return { end: transEndEventNames[name] } + } + } + } + + $(function () { + $.support.transition = transitionEnd() + }) + +}(window.jQuery); diff --git a/vendor/assets/stylesheets/bootstrap/_alerts.scss b/vendor/assets/stylesheets/bootstrap/_alerts.scss index a3e5e52c..a56fef90 100644 --- a/vendor/assets/stylesheets/bootstrap/_alerts.scss +++ b/vendor/assets/stylesheets/bootstrap/_alerts.scss @@ -7,7 +7,7 @@ // ------------------------- .alert { - padding: 8px 35px 8px 14px; + padding: 10px 35px 10px 15px; margin-bottom: $line-height-computed; color: $alert-text; background-color: $alert-bg; @@ -24,14 +24,12 @@ hr { border-top-color: darken($alert-border, 5%); } - // Inherit color for immediate links and bolden them some - > a, - > p > a { + // Provide class for links that match alerts + .alert-link { font-weight: 500; color: darken($alert-text, 10%); } - - + // Adjust close link position .close { position: relative; @@ -41,44 +39,39 @@ } } - // Alternate styles // ------------------------- .alert-success { - background-color: $state-success-bg; - border-color: $state-success-border; + background-color: $alert-success-bg; + border-color: $alert-success-border; color: $alert-success-text; hr { border-top-color: darken($alert-success-border, 5%); } - > a, - > p > a { + .alert-link { color: darken($alert-success-text, 10%); } } -.alert-danger, -.alert-error { +.alert-danger { background-color: $alert-danger-bg; border-color: $alert-danger-border; color: $alert-danger-text; hr { border-top-color: darken($alert-danger-border, 5%); } - > a, - > p > a { + .alert-link { color: darken($alert-danger-text, 10%); } } .alert-info { - background-color: $alert-danger-bg; + background-color: $alert-info-bg; border-color: $alert-info-border; color: $alert-info-text; hr { - border-top-color: darken($state-info-border, 5%); + border-top-color: darken($alert-info-border, 5%); } - > a, - > p > a { + .alert-link { color: darken($alert-info-text, 10%); } } diff --git a/vendor/assets/stylesheets/bootstrap/_badges.scss b/vendor/assets/stylesheets/bootstrap/_badges.scss index f9ceac2e..f827cff3 100644 --- a/vendor/assets/stylesheets/bootstrap/_badges.scss +++ b/vendor/assets/stylesheets/bootstrap/_badges.scss @@ -48,7 +48,7 @@ a.badge { } // Account for counters in navs -.nav-list > .active > a > .badge, +a.list-group-item.active > .badge, .nav-pills > .active > a > .badge { color: $link-color; background-color: #fff; diff --git a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss index bd55b206..d0c8cd6f 100644 --- a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +++ b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss @@ -5,7 +5,7 @@ .breadcrumb { padding: 8px 15px; - margin: 0 0 $line-height-base; + margin: 0 0 $line-height-computed; list-style: none; background-color: #f5f5f5; border-radius: $border-radius-base; diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss index 82bc62a4..79e64d10 100644 --- a/vendor/assets/stylesheets/bootstrap/_button-groups.scss +++ b/vendor/assets/stylesheets/bootstrap/_button-groups.scss @@ -23,7 +23,7 @@ &:hover, &:active { z-index: 2; - } + } } } @@ -87,6 +87,7 @@ } + // Split button dropdowns // ---------------------- @@ -113,7 +114,6 @@ // Reposition the caret .btn .caret { - margin-top: 8px; margin-left: 0; } // Carets in other button sizes @@ -142,12 +142,13 @@ border-radius: 0; } .btn-group-vertical .btn:first-child { - @inclue border-bottom-radius(0); + @include border-bottom-radius(0); } .btn-group-vertical .btn:last-child { @include border-top-radius(0); } + // Justified button groups // ---------------------- diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss index ca4ab94d..f9717b2f 100644 --- a/vendor/assets/stylesheets/bootstrap/_buttons.scss +++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss @@ -9,7 +9,7 @@ // Core styles .btn { display: inline-block; - padding: 6px 12px; + padding: $padding-base-vertical $padding-base-horizontal; margin-bottom: 0; // For input.btn font-size: $font-size-base; font-weight: 500; @@ -120,32 +120,23 @@ fieldset[disabled] .btn-link { // Button Sizes -// ------------------------- +// -------------------------------------------------- -// Large .btn-large { - padding: $padding-large; + padding: $padding-large-vertical $padding-large-horizontal; font-size: $font-size-large; border-radius: $border-radius-large; } - -// Small .btn-small { - padding: $padding-small; + padding: $padding-small-vertical $padding-small-horizontal; font-size: $font-size-small; - border-radius: $border-radius-small; -} - -// Mini -.btn-mini { - padding: $padding-mini; - font-size: $font-size-mini; + line-height: 1.5; // ensure proper height of button next to small input border-radius: $border-radius-small; } // Block button -// ------------------------- +// -------------------------------------------------- .btn-block { display: block; diff --git a/vendor/assets/stylesheets/bootstrap/_carousel.scss b/vendor/assets/stylesheets/bootstrap/_carousel.scss index a22a317a..4061e69d 100644 --- a/vendor/assets/stylesheets/bootstrap/_carousel.scss +++ b/vendor/assets/stylesheets/bootstrap/_carousel.scss @@ -86,7 +86,7 @@ // animation if you trip this while // in the middle of another animation // ;_; - // .transition(opacity .2s linear); + // @include transition(opacity .2s linear); // Set gradients for backgrounds &.left { @@ -128,7 +128,7 @@ position: absolute; bottom: 20px; left: 50%; - z-index: 5; + z-index: 15; width: 100px; margin: 0 0 0 -50px; list-style: none; @@ -162,6 +162,7 @@ padding-top: 20px; padding-bottom: 20px; color: #fff; + text-align: center; text-shadow: 0 1px 2px rgba(0,0,0,.6); & .btn { text-shadow: none; // No shadow for button elements in carousel-caption @@ -185,6 +186,6 @@ .carousel-caption { left: 20%; right: 20%; - padding: 30px; + padding-bottom: 30px; } } diff --git a/vendor/assets/stylesheets/bootstrap/_close.scss b/vendor/assets/stylesheets/bootstrap/_close.scss index 30bcce36..286333cb 100644 --- a/vendor/assets/stylesheets/bootstrap/_close.scss +++ b/vendor/assets/stylesheets/bootstrap/_close.scss @@ -5,12 +5,13 @@ .close { float: right; - font-size: 20px; + font-size: ($font-size-base * 1.5); font-weight: bold; line-height: 1; color: #000; text-shadow: 0 1px 0 rgba(255,255,255,1); @include opacity(.2); + &:hover, &:focus { color: #000; diff --git a/vendor/assets/stylesheets/bootstrap/_component-animations.scss b/vendor/assets/stylesheets/bootstrap/_component-animations.scss index 7172139c..87e744cb 100644 --- a/vendor/assets/stylesheets/bootstrap/_component-animations.scss +++ b/vendor/assets/stylesheets/bootstrap/_component-animations.scss @@ -11,22 +11,13 @@ } } -/*.collapse { - position: relative; - height: 0; - overflow: hidden; - .transition(height .35s ease); - &.in { - height: auto; - } -}*/ - .collapse { position: relative; height: 0; overflow: hidden; @include transition(height .35s ease); + + &.in { + height: auto; + } } -.collapse.in { - height: auto; -} \ No newline at end of file diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss index 69613a9a..1128aa91 100644 --- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss @@ -3,35 +3,20 @@ // -------------------------------------------------- -// Use the .menu class on any
  • element within the topbar or ul.tabs and you'll get some superfancy dropdowns -.dropup, -.dropdown { - position: relative; -} -.dropdown-toggle:active, -.open .dropdown-toggle { - outline: 0; -} - // Dropdown arrow/caret // -------------------- .caret { display: inline-block; width: 0; height: 0; - vertical-align: top; + margin-left: 2px; + vertical-align: middle; border-top: 4px solid #000; border-right: 4px solid transparent; border-left: 4px solid transparent; content: ""; } -// Place the caret -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} - // The dropdown menu (ul) // ---------------------- .dropdown-menu { @@ -71,7 +56,7 @@ font-weight: normal; line-height: $line-height-base; color: $dropdown-link-color; - white-space: nowrap; + white-space: nowrap; // prevent links from randomly breaking onto new lines } } @@ -118,9 +103,27 @@ // Open state for the dropdown // --------------------------- .open { - & > .dropdown-menu { + // Show the menu + > .dropdown-menu { display: block; } + + // Remove the outline when :focus is triggered + > a { + outline: 0; + } +} + + +// Backdrop to catch body clicks on mobile, etc. +// --------------------------- +.dropdown-backdrop { + position: fixed; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: $zindex-dropdown - 10; } // Right aligned dropdowns diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index 3f23610a..b1fd45c5 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -22,7 +22,7 @@ legend { padding: 0; margin-bottom: $line-height-computed; font-size: ($font-size-base * 1.5); - line-height: $line-height-headings; + line-height: inherit; color: $gray-dark; border: 0; border-bottom: 1px solid #e5e5e5; @@ -56,7 +56,7 @@ input[type="tel"], input[type="color"] { display: block; min-height: $input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border) - padding: 6px 9px; + padding: $padding-base-vertical $padding-base-horizontal; font-size: $font-size-base; line-height: $line-height-base; color: $gray; @@ -65,7 +65,13 @@ input[type="color"] { border: 1px solid $input-border; border-radius: $input-border-radius; @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); - @include transition(#{border linear .2s, box-shadow linear .2s}); + @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s); + + &:focus { + border-color: rgba(82,168,236,.8); + outline: 0; + @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)); + } } // Reset appearance properties for textual inputs and textarea @@ -97,32 +103,6 @@ textarea { height: auto; } -// Everything else -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -input[type="search"], -input[type="tel"], -input[type="color"] { - // Focus state - &:focus { - border-color: rgba(82,168,236,.8); - outline: 0; - outline: thin dotted \9; /* IE6-9 */ - //.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); - @include box-shadow(0 0 8px rgba(82,168,236,.6)); - } -} - // Position radios and checkboxes better input[type="radio"], input[type="checkbox"] { @@ -144,8 +124,14 @@ select[size] { height: auto; } +// Fix optgroup Firefox bug per https://github.com/twitter/bootstrap/issues/7611 +select optgroup { + font-size: inherit; + font-style: inherit; + font-family: inherit; +} + // Focus for select, file, radio, and checkbox -select:focus, input[type="file"]:focus, input[type="radio"]:focus, input[type="checkbox"]:focus { @@ -194,17 +180,19 @@ textarea { margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing } +/* // Move the options list down to align with labels .controls > .radio:first-child, .controls > .checkbox:first-child { padding-top: 5px; // has to be padding because margin collaspes } +*/ // Radios and checkboxes on same line .radio-inline, .checkbox-inline { display: inline-block; - // padding-top: 5px; +// padding-top: 5px; padding-left: 20px; margin-bottom: 0; vertical-align: middle; @@ -239,13 +227,13 @@ input[type="search"], input[type="tel"], input[type="color"] { &.input-large { - padding: $padding-large; + padding: $padding-large-vertical $padding-large-horizontal; font-size: $font-size-large; border-radius: $border-radius-large; } &.input-small { min-height: $input-height-small; - padding: $padding-small; + padding: $padding-small-vertical $padding-small-horizontal; font-size: $font-size-small; border-radius: $border-radius-small; } @@ -287,15 +275,15 @@ input[type="checkbox"] { // Warning .has-warning { - @include formFieldState($state-warning-text, $state-warning-text, $state-warning-bg); + @include form-field-validation($state-warning-text, $state-warning-text, $state-warning-bg); } // Error .has-error { - @include formFieldState($state-danger-text, $state-danger-text, $state-danger-bg); + @include form-field-validation($state-danger-text, $state-danger-text, $state-danger-bg); } // Success .has-success { - @include formFieldState($state-success-text, $state-success-text, $state-success-bg); + @include form-field-validation($state-success-text, $state-success-text, $state-success-bg); } // HTML5 invalid states @@ -314,19 +302,6 @@ select:focus:invalid { -// FORM ACTIONS -// ------------ - -.form-actions { - padding: $line-height-computed 20px; - margin-top: $line-height-computed; - margin-bottom: $line-height-computed; - background-color: $form-actions-bg; - border-top: 1px solid #e5e5e5; - @include clearfix(); // Adding clearfix to allow for .pull-right button containers -} - - // HELP TEXT // --------- @@ -364,6 +339,7 @@ select:focus:invalid { // Display as table-cell // ------------------------- +.input-group-addon, .input-group-btn, .input-group input { display: table-cell; @@ -383,7 +359,7 @@ select:focus:invalid { // ------------------------- .input-group-addon { @include box-sizing(border-box); - padding: 6px 8px; + padding: $padding-base-vertical $padding-base-horizontal; font-size: $font-size-base; font-weight: normal; line-height: $line-height-base; @@ -391,24 +367,26 @@ select:focus:invalid { text-shadow: 0 1px 0 #fff; background-color: $gray-lighter; border: 1px solid #ccc; + border-radius: $border-radius-base; - &.input-small { - padding: $padding-small; - font-size: $font-size-small; + &.input-small { + padding: $padding-small-vertical $padding-small-horizontal; + font-size: $font-size-small; border-radius: $border-radius-small; } - &.input-large { - padding: $padding-large; - font-size: $font-size-large; + &.input-large { + padding: $padding-large-vertical $padding-large-horizontal; + font-size: $font-size-large; border-radius: $border-radius-large; - } + } } // Reset rounded corners .input-group input:first-child, .input-group-addon:first-child, -.input-group-btn:first-child > .btn:first-child, -.input-group-btn:first-child > .dropdown-toggle:first-child { +.input-group-btn:first-child > .btn, +.input-group-btn:first-child > .dropdown-toggle, +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { @include border-right-radius(0); } .input-group-addon:first-child { @@ -416,8 +394,9 @@ select:focus:invalid { } .input-group input:last-child, .input-group-addon:last-child, -.input-group-btn:last-child > .btn:last-child, -.input-group-btn:last-child > .dropdown-toggle { +.input-group-btn:last-child > .btn, +.input-group-btn:last-child > .dropdown-toggle, +.input-group-btn:first-child > .btn:not(:first-child) { @include border-left-radius(0); } .input-group-addon:last-child { @@ -433,7 +412,6 @@ select:focus:invalid { .input-group-btn > .btn { position: relative; float: left; // Collapse white-space - border-radius: 0; + .btn { margin-left: -1px; } @@ -472,8 +450,14 @@ select:focus:invalid { .row + .row { margin-top: 15px; } - .row-label { + .control-label { padding-top: 6px; + } +} + +// Only right aline form labels here when the columns stop stacking +@media (min-width: 768px) { + .form-horizontal .control-label { text-align: right; } } diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss index 0d935ea1..b7dbdb68 100644 --- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss @@ -21,11 +21,11 @@ // Import the fonts @font-face { font-family: 'Glyphicons Halflings'; - src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot'); - src: url('@{glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), - url('@{glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'), - url('@{glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'), - url('@{glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot'); + src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), + url('#{$glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'), + url('#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'), + url('#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); } // Catchall baseclass diff --git a/vendor/assets/stylesheets/bootstrap/_grid.scss b/vendor/assets/stylesheets/bootstrap/_grid.scss index 6efcfddf..8bd0ad47 100644 --- a/vendor/assets/stylesheets/bootstrap/_grid.scss +++ b/vendor/assets/stylesheets/bootstrap/_grid.scss @@ -41,10 +41,6 @@ .container { max-width: 728px; } - .row { - margin-left: ($grid-gutter-width / -2); - margin-right: ($grid-gutter-width / -2); - } } // Responsive: Desktops and up diff --git a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss index e98cc552..72e4a718 100644 --- a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +++ b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss @@ -6,7 +6,7 @@ .jumbotron { padding: 30px; margin-bottom: 30px; - font-size: 21px; + font-size: ($font-size-base * 1.5); font-weight: 200; line-height: ($line-height-base * 1.5); color: $jumbotron-lead-color; diff --git a/vendor/assets/stylesheets/bootstrap/_labels.scss b/vendor/assets/stylesheets/bootstrap/_labels.scss index b3c1004d..85c75855 100644 --- a/vendor/assets/stylesheets/bootstrap/_labels.scss +++ b/vendor/assets/stylesheets/bootstrap/_labels.scss @@ -2,10 +2,9 @@ // Labels // -------------------------------------------------- - -// Base classes .label { - padding: inline; + display: inline; + padding: .25em .6em; font-size: 75%; font-weight: 500; line-height: 1; @@ -13,18 +12,18 @@ text-align: center; white-space: nowrap; vertical-align: middle; - background-color: $gray_light; + background-color: $gray-light; border-radius: .25em; -} -// Hover state, but only for links -a.label { - &:hover, - &:focus { - color: #fff; - text-decoration: none; - cursor: pointer; - background-color: darken($gray-light, 10%); + // Add hover effects, but only for links + &[href] { + &:hover, + &:focus { + color: #fff; + text-decoration: none; + cursor: pointer; + background-color: darken($gray-light, 10%); + } } } @@ -68,4 +67,4 @@ a.label { background-color: darken($label-info-bg, 10%); } } -} +} \ No newline at end of file diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 115b9133..e82068f7 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -102,13 +102,13 @@ } // Drop shadows -@mixin box-shadow($shadow) { +@mixin box-shadow($shadow...) { -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1 box-shadow: $shadow; } // Transitions -@mixin transition($transition) { +@mixin transition($transition...) { -webkit-transition: $transition; -moz-transition: $transition; -o-transition: $transition; @@ -155,7 +155,6 @@ -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885 -o-transform: skew($x, $y); transform: skew($x, $y); - -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319 } @mixin translate3d($x, $y, $z) { -webkit-transform: translate3d($x, $y, $z); @@ -248,20 +247,18 @@ // Gradients @mixin gradient-horizontal($startColor: #555, $endColor: #333) { background-color: $endColor; - background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+ background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10 + background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+ background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10 background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down } @mixin gradient-vertical($startColor: #555, $endColor: #333) { background-color: $endColor; - background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+ background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10 + background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+ background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10 background-repeat: repeat-x; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down @@ -269,9 +266,8 @@ @mixin gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) { background-color: $endColor; background-repeat: repeat-x; - background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+ background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10 + background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+ background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10 } @mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { @@ -279,10 +275,9 @@ background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); - background-image: -o-linear-gradient(left, $startColor, $midColor $colorStop, $endColor); background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor); background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback } @mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) { @@ -290,7 +285,6 @@ background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor)); background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor); background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor); - background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor); background-image: linear-gradient($startColor, $midColor $colorStop, $endColor); background-repeat: no-repeat; filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback @@ -300,7 +294,7 @@ background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor)); background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor); background-image: -moz-radial-gradient(circle, $innerColor, $outerColor); - background-image: -o-radial-gradient(circle, $innerColor, $outerColor); + background-image: radial-gradient(circle, $innerColor, $outerColor); background-repeat: no-repeat; } @mixin gradient-striped($color: #555, $angle: 45deg) { @@ -308,7 +302,6 @@ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); } @@ -409,13 +402,12 @@ @mixin make-row() { // Then clear the floated columns @include clearfix(); - - // Negative margin the row out to align the content of columns - .row { - margin-left: ($grid-gutter-width / -2); - margin-right: ($grid-gutter-width / -2); - } + // Negative margin nested rows out to align the content of columns + .row { + margin-left: ($grid-gutter-width / -2); + margin-right: ($grid-gutter-width / -2); + } } // Generate the columns @mixin make-column($columns) { @@ -451,14 +443,12 @@ } } - // Small grid columns - -// Generate columns @mixin generate-grid-columns($grid-columns) { @include col-sm-X($grid-columns) } +// Generate columns @mixin col-sm-X ($grid-columns) { $index: $grid-columns; @while $index > 0 { @@ -474,8 +464,6 @@ // Large grid columns - -// Generate columns @mixin generate-large-grid-columns($grid-columns) { @include col-lg-X($grid-columns); @include col-offset-X($grid-columns); @@ -536,19 +524,12 @@ } + // Framework mixins // -------------------------------------------------- -// Generate rem font-sizes with pixel fallbacks -// By default uses `$font-size-base` with an initial value of 14 (1.4rem or 14px) -@mixin font-size($font-size: $font-size-base) { - $rem-size: ($font-size / 10); - font-size: #{$font-size}px; - font-size: #{$rem-size}rem; -} - // Generate form validation states -@mixin formFieldState($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) { +@mixin form-field-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) { // Color the label text .control-label { color: $text-color; diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss index 23b2ca8f..e2febd55 100644 --- a/vendor/assets/stylesheets/bootstrap/_modals.scss +++ b/vendor/assets/stylesheets/bootstrap/_modals.scss @@ -28,7 +28,7 @@ // When fading in the modal, animate it to slide down &.fade { top: -25%; - @include transition(#{opacity 0.3s linear, top 0.3s ease-out}); + @include transition(opacity 0.3s linear, top 0.3s ease-out); } &.fade.in { top: 0; } } @@ -80,7 +80,7 @@ } // Close icon .modal-header .close { - margin-top: 2px; + margin-top: -2px; } // Title text within header @@ -102,7 +102,7 @@ padding: ($modal-inner-padding - 1) $modal-inner-padding $modal-inner-padding; text-align: right; // right align buttons border-top: 1px solid #e5e5e5; - @extend .clearfix; // clear it in case folks use .pull-* classes on buttons + @include clearfix(); // clear it in case folks use .pull-* classes on buttons // Properly space out buttons .btn + .btn { diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 0326b139..ef1474d6 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -10,6 +10,7 @@ padding-right: 15px; background-color: $navbar-bg; border-radius: $border-radius-base; + // Prevent floats from breaking the navbar @include clearfix(); } @@ -21,12 +22,14 @@ // Space out from .navbar .brand and .btn-navbar when stacked in mobile views // and outdent nav links so text lines up with logo. margin-top: 10px; + margin-bottom: 15px; > li > a { padding-top: (($navbar-height - $line-height-computed) / 2); padding-bottom: (($navbar-height - $line-height-computed) / 2); color: $navbar-link-color; line-height: 20px; + border-radius: $border-radius-base; } > li > a:hover, > li > a:focus { @@ -67,10 +70,10 @@ z-index: $zindex-navbar-fixed; border-radius: 0; } -.navbar-fixed-top { +.navbar-fixed-top { top: 0; } -.navbar-fixed-bottom { +.navbar-fixed-bottom { bottom: 0; margin-bottom: 0; // override .navbar defaults } @@ -132,7 +135,7 @@ // Navbar form .navbar-form { @extend .form-inline; - @include navbar-vertical-align(34px); // Vertically center in navbar + @include navbar-vertical-align($input-height-base); // Vertically center in navbar } // Dropdown menus @@ -178,8 +181,8 @@ } // Right aligned menus need alt position -.navbar .pull-right > li > .dropdown-menu, -.navbar .nav > li > .dropdown-menu.pull-right { +.navbar-nav.pull-right > li > .dropdown-menu, +.navbar-nav > li > .dropdown-menu.pull-right { left: auto; right: 0; } @@ -266,6 +269,8 @@ } } + + // Responsive navbar // -------------------------------------------------- @@ -278,10 +283,15 @@ } .navbar .nav { float: left; - margin-top: 0; // undo top margin to make nav extend full height of navbar + // undo margin to make nav extend full height of navbar + margin-top: 0; + margin-bottom: 0; > li { float: left; + > a { + border-radius: 0; + } } &.pull-right { diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss index aefcb32f..4e70b87d 100644 --- a/vendor/assets/stylesheets/bootstrap/_navs.scss +++ b/vendor/assets/stylesheets/bootstrap/_navs.scss @@ -39,22 +39,23 @@ background-color: transparent; cursor: default; } + // Space the headers out when they follow another list item (link) - &+ .nav-header { + + .nav-header { margin-top: 9px; } + } - // Open dropdowns - &.open > a, - &.open > a:hover, - &.open > a:focus { - color: #fff; - background-color: $link-color; - border-color: $link-color; - .caret { - border-top-color: #fff; - border-bottom-color: #fff; - } + // Open dropdowns + &.open > a, + &.open > a:hover, + &.open > a:focus { + color: #fff; + background-color: $link-color; + border-color: $link-color; + .caret { + border-top-color: #fff; + border-bottom-color: #fff; } } @@ -71,6 +72,7 @@ } + // Nav variations // -------------------------------------------------- @@ -117,7 +119,6 @@ // Pills // ------------------------- - .nav-pills { > li { float: left; @@ -156,7 +157,6 @@ } } - // Justified nav links // ------------------------- @@ -184,6 +184,7 @@ > .active > a { border-bottom-color: $body-bg; } + } diff --git a/vendor/assets/stylesheets/bootstrap/_pager.scss b/vendor/assets/stylesheets/bootstrap/_pager.scss index 9b003ca9..d72a3499 100644 --- a/vendor/assets/stylesheets/bootstrap/_pager.scss +++ b/vendor/assets/stylesheets/bootstrap/_pager.scss @@ -4,7 +4,7 @@ .pager { - margin: $line-height-base 0; + margin: $line-height-computed 0; list-style: none; text-align: center; @include clearfix(); diff --git a/vendor/assets/stylesheets/bootstrap/_pagination.scss b/vendor/assets/stylesheets/bootstrap/_pagination.scss index 90bff5a4..66729d4f 100644 --- a/vendor/assets/stylesheets/bootstrap/_pagination.scss +++ b/vendor/assets/stylesheets/bootstrap/_pagination.scss @@ -56,7 +56,7 @@ .pagination-large { > li > a, > li > span { - padding: $padding-large; + padding: $padding-large-vertical $padding-large-horizontal; font-size: $font-size-large; } > li:first-child > a, @@ -69,9 +69,13 @@ } } -// Small and mini -.pagination-mini, +// Small .pagination-small { + > li > a, + > li > span { + padding: $padding-small-vertical $padding-small-horizontal; + font-size: $font-size-small; + } > li:first-child > a, > li:first-child > span { @include border-left-radius($border-radius-small); @@ -81,20 +85,3 @@ @include border-right-radius($border-radius-small); } } - -// Small -.pagination-small { - > li > a, - > li > span { - padding: $padding-small; - font-size: $font-size-small; - } -} -// Mini -.pagination-mini { - > li > a, - > li > span { - padding: $padding-mini; - font-size: $font-size-mini; - } -} diff --git a/vendor/assets/stylesheets/bootstrap/_panels.scss b/vendor/assets/stylesheets/bootstrap/_panels.scss index fd16b85d..91c60de6 100644 --- a/vendor/assets/stylesheets/bootstrap/_panels.scss +++ b/vendor/assets/stylesheets/bootstrap/_panels.scss @@ -25,6 +25,16 @@ border-top-right-radius: ($panel-border-radius - 1); } +// Optional footer (stays gray in every modifier class) +.panel-footer { + margin: 15px -15px -15px; + padding: 10px 15px; + background-color: $panel-footer-bg; + border-top: 1px solid $panel-border; + border-bottom-left-radius: ($panel-border-radius - 1); + border-bottom-right-radius: ($panel-border-radius - 1); +} + // Contextual variations .panel-primary { border-color: $panel-primary-border; diff --git a/vendor/assets/stylesheets/bootstrap/_print.scss b/vendor/assets/stylesheets/bootstrap/_print.scss index 55f98a80..ec71acbb 100644 --- a/vendor/assets/stylesheets/bootstrap/_print.scss +++ b/vendor/assets/stylesheets/bootstrap/_print.scss @@ -52,7 +52,7 @@ } @page { - margin: 2cm 0.5cm; + margin: 2cm .5cm; } p, diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss index 0ced66f7..eb1a53dc 100644 --- a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +++ b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss @@ -33,43 +33,45 @@ visibility: hidden; } -// For Phones -.visible-phone { display: inherit !important; } -.visible-tablet { display: none !important; } -.visible-desktop { display: none !important; } +// Visibility utilities -.hidden-phone { display: none !important; } -.hidden-tablet { display: inherit !important; } -.hidden-desktop { display: inherit !important; } +// For Phones +.visible-sm { display: block !important; } +.visible-md { display: none !important; } +.visible-lg { display: none !important; } + +.hidden-sm { display: none !important; } +.hidden-md { display: block !important; } +.hidden-lg { display: block !important; } // Tablets & small desktops only @media (min-width: $screen-tablet) and (max-width: $screen-tablet-max) { - .visible-phone { display: none !important; } - .visible-tablet { display: inherit !important; } - .visible-desktop { display: none !important; } + .visible-sm { display: none !important; } + .visible-md { display: block !important; } + .visible-lg { display: none !important; } - .hidden-phone { display: inherit !important; } - .hidden-tablet { display: none !important; } - .hidden-desktop { display: inherit !important; } + .hidden-sm { display: block !important; } + .hidden-md { display: none !important; } + .hidden-lg { display: block !important; } } // For desktops @media (min-width: $screen-desktop) { - .visible-phone { display: none !important; } - .visible-tablet { display: none !important; } - .visible-desktop { display: inherit !important; } + .visible-sm { display: none !important; } + .visible-md { display: none !important; } + .visible-lg { display: block !important; } - .hidden-phone { display: inherit !important; } - .hidden-tablet { display: inherit !important; } - .hidden-desktop { display: none !important; } + .hidden-sm { display: block !important; } + .hidden-md { display: block !important; } + .hidden-lg { display: none !important; } } // Print utilities -.visible-print { display: none !important; } -.hidden-print { } +.visible-print { display: none !important; } +.hidden-print { } @media print { - .visible-print { display: inherit !important; } + .visible-print { display: block !important; } .hidden-print { display: none !important; } } diff --git a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss index cce0c736..fe9075bd 100644 --- a/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +++ b/vendor/assets/stylesheets/bootstrap/_scaffolding.scss @@ -39,6 +39,7 @@ textarea { line-height: inherit; } + // Links // ------------------------- @@ -62,7 +63,6 @@ a:focus { img { // Responsive images (ensure images don't scale beyond their parents) max-width: 100%; // Part 1: Set a maxium relative to the parent - width: auto\9; // IE8 need help adjusting responsive images height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching // Match vertical alignment with other comment elements diff --git a/vendor/assets/stylesheets/bootstrap/_tables.scss b/vendor/assets/stylesheets/bootstrap/_tables.scss index 7c7d6f4f..2a123423 100644 --- a/vendor/assets/stylesheets/bootstrap/_tables.scss +++ b/vendor/assets/stylesheets/bootstrap/_tables.scss @@ -67,6 +67,7 @@ th { } + // BORDERED VERSION // ---------------- @@ -75,7 +76,7 @@ th { border-collapse: separate; // Done so we can round those corners! border-left: 0; border-radius: $border-radius-base; - + > thead > tr > th, > tbody > tr > th, > thead > tr > td, @@ -145,7 +146,7 @@ th { border-top-right-radius: $border-radius-base; } -} +} @@ -204,8 +205,8 @@ table th[class*="col-span-"] { background-color: $state-success-bg; border-color: $state-success-border; } - > td.error, - > th.error, + > td.danger, + > th.danger, &.danger > td { background-color: $state-danger-bg; border-color: $state-danger-border; diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss index 72f584e2..ea90ae29 100644 --- a/vendor/assets/stylesheets/bootstrap/_type.scss +++ b/vendor/assets/stylesheets/bootstrap/_type.scss @@ -11,7 +11,7 @@ p { } .lead { margin-bottom: $line-height-computed; - @include font-size(($font-size-base * 1.5)); + font-size: ($font-size-base * 1.5); font-weight: 200; line-height: 1.4; } @@ -28,17 +28,17 @@ em { font-style: italic; } cite { font-style: normal; } // Utility classes -.text-muted { color: $gray-light; } +.text-muted { color: $gray-light; } a.text-muted:hover, -a.muted:focus { color: darken($gray-light, 10%); } +a.text-muted:focus { color: darken($gray-light, 10%); } .text-warning { color: $state-warning-text; } a.text-warning:hover, a.text-warning:focus { color: darken($state-warning-text, 10%); } -.text-danger { color: $state-danger-text; } +.text-danger { color: $state-danger-text; } a.text-danger:hover, -a.text-danger:focus { color: darken($state-danger-text, 10%); } +a.text-danger:focus { color: darken($state-danger-text, 10%); } .text-success { color: $state-success-text; } a.text-success:hover, @@ -54,9 +54,8 @@ 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: $line-height-headings; + line-height: $headings-line-height; small { font-weight: normal; line-height: 1; @@ -149,7 +148,7 @@ dt { font-weight: bold; } dd { - margin-left: ($line-height-base / 2); + margin-left: ($line-height-computed / 2); } // Horizontal layout (like forms) .dl-horizontal { diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index 307b169b..86495178 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -10,11 +10,11 @@ // Grays // ------------------------- -$gray-darker: lighten(#000, 13.5%); // #222 -$gray-dark: lighten(#000, 20%); // #333 -$gray: lighten(#000, 33.5%); // #555 -$gray-light: lighten(#000, 60%); // #999 -$gray-lighter: lighten(#000, 93.5%); // #eee +$gray-darker: lighten(#000, 13.5%) !default; // #222 +$gray-dark: lighten(#000, 20%) !default; // #333 +$gray: lighten(#000, 33.5%) !default; // #555 +$gray-light: lighten(#000, 60%) !default; // #999 +$gray-lighter: lighten(#000, 93.5%) !default; // #eee // Brand colors // ------------------------- @@ -34,7 +34,7 @@ $text-color: $gray-dark !default; // Links // ------------------------- -$link-color: #428bca !default; +$link-color: $brand-primary !default; $link-hover-color: darken($link-color, 15%) !default; // Typography @@ -50,27 +50,31 @@ $font-size-large: ceil($font-size-base * 1.25) !default; // ~18px $font-size-small: ceil($font-size-base * 0.85) !default; // ~12px $font-size-mini: ceil($font-size-base * 0.75) !default; // ~11px -$line-height-base: 1.428 !default; // 20/14 -$line-height-computed: ceil($font-size-base * $line-height-base) !default; // ~20px -$line-height-headings: 1.1 !default; +$line-height-base: 1.428571429 !default; // 20/14 +$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px -$headings-font-family: inherit !default; // empty to use BS default, $font-family-base $headings-font-weight: 500 !default; +$headings-line-height: 1.1 !default; -// Component +// Components // ------------------------- -// Based on 14px font-size and 1.5 line-height +// Based on 14px font-size and 1.428 line-height (~20px to start) -$padding-large: 11px 14px !default; // 44px -$padding-small: 2px 10px !default; // 26px -$padding-mini: 0 6px !default; // 22px +$padding-base-vertical: 8px !default; +$padding-base-horizontal: 12px !default; -$border-radius-base: 4px !default; -$border-radius-large: 6px !default; -$border-radius-small: 3px !default; +$padding-large-vertical: 14px !default; +$padding-large-horizontal: 16px !default; -$component-active-bg: $brand-primary; +$padding-small-vertical: 5px !default; +$padding-small-horizontal: 10px !default; + +$border-radius-base: 4px !default; +$border-radius-large: 6px !default; +$border-radius-small: 3px !default; + +$component-active-bg: $brand-primary !default; // Tables @@ -123,11 +127,11 @@ $input-border-radius: $border-radius-base !default; $input-color-placeholder: $gray-light !default; -$input-height-base: ($line-height-computed + 14px) !default; // base line-height + 12px vertical padding + 2px top/bottom border -$input-height-large: ($line-height-computed + 24px) !default; // base line-height + 22px vertical padding + 2px top/bottom border -$input-height-small: ($line-height-computed + 6px) !default; // base line-height + 4px vertical padding + 2px top/bottom border +$input-height-base: ($line-height-computed + ($padding-base-vertical * 2)) !default; +$input-height-large: ($line-height-computed + ($padding-large-vertical * 2)) !default; +$input-height-small: ($line-height-computed + ($padding-small-vertical * 2)) !default; -$form-actions-bg: #f5f5f5 !default; +$form-actions-bg: #f5f5f5 !default; // Dropdowns @@ -173,7 +177,7 @@ $glyphicons-font-path: "../fonts" !default; // Basics of a navbar $navbar-height: 50px !default; -$navbar-text: #777 !default; +$navbar-color: #777 !default; $navbar-bg: #eee !default; // Navbar links @@ -191,7 +195,7 @@ $navbar-brand-hover-color: darken($navbar-link-color, 10%) !default; $navbar-brand-hover-bg: transparent !default; // Inverted navbar -$navbar-inverse-color: $gray-light !default; +$navbar-inverse-color: $gray-light !default; $navbar-inverse-bg: #222 !default; // Inverted navbar links @@ -331,6 +335,7 @@ $panel-bg: #fff !default; $panel-border: #ddd !default; $panel-border-radius: $border-radius-base !default; $panel-heading-bg: #f5f5f5 !default; +$panel-footer-bg: #f5f5f5 !default; $panel-primary-text: #fff !default; $panel-primary-border: $brand-primary !default; @@ -380,32 +385,32 @@ $component-offset-horizontal: 180px !default; // -------------------------------------------------- // Tiny screen / phone -$screen-tiny: 480px; -$screen-phone: $screen-tiny; +$screen-tiny: 480px !default; +$screen-phone: $screen-tiny !default; // Small screen / tablet -$screen-small: 768px; -$screen-tablet: $screen-small; +$screen-small: 768px !default; +$screen-tablet: $screen-small !default; // Medium screen / desktop -$screen-medium: 992px; -$screen-desktop: $screen-medium; +$screen-medium: 992px !default; +$screen-desktop: $screen-medium !default; // So media queries don't overlap when required, provide a maximum -$screen-small-max: ($screen-medium - 1); -$screen-tablet-max: $screen-small-max; +$screen-small-max: ($screen-medium - 1) !default; +$screen-tablet-max: $screen-small-max !default; // Large screen / wide desktop -$screen-large: 1200px; -$screen-large-desktop: $screen-large; +$screen-large: 1200px !default; +$screen-large-desktop: $screen-large !default; // Grid system // -------------------------------------------------- // Number of columns in the grid system -$grid-columns: 12; +$grid-columns: 12 !default; // Padding, to be divided by two and applied to the left and right of all columns -$grid-gutter-width: 30px; +$grid-gutter-width: 30px !default; // Point at which the navbar stops collapsing -$grid-float-breakpoint: $screen-tablet; +$grid-float-breakpoint: $screen-tablet !default; diff --git a/vendor/assets/stylesheets/bootstrap/bootstrap.scss b/vendor/assets/stylesheets/bootstrap/bootstrap.scss index d0b7a675..660eb274 100644 --- a/vendor/assets/stylesheets/bootstrap/bootstrap.scss +++ b/vendor/assets/stylesheets/bootstrap/bootstrap.scss @@ -5,7 +5,7 @@ * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * - * Designed and built with all the love in the world by @mdo and @fat. + * Designed and built with all the love in the world by $mdo and $fat. */ // Core variables and mixins From 40534b5dbc5c1d94fd82c98bde75572667b34673 Mon Sep 17 00:00:00 2001 From: gleb Date: Tue, 28 May 2013 17:54:00 +0200 Subject: [PATCH 2/6] glyphicons asset-url --- asseturl.patch | 34 +++++++++++-------- update-bootstrap.sh | 4 +-- .../stylesheets/bootstrap/_glyphicons.scss | 10 +++--- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/asseturl.patch b/asseturl.patch index ffe62e24..24dd216a 100644 --- a/asseturl.patch +++ b/asseturl.patch @@ -1,15 +1,19 @@ -diff --git a/vendor/assets/stylesheets/_variables.scss b/vendor/assets/stylesheets/_variables.scss -index e29dc59..85f4d56 100644 ---- a/vendor/assets/stylesheets/_variables.scss -+++ b/vendor/assets/stylesheets/_variables.scss -@@ -151,8 +151,8 @@ $zindexModal: 1050 !default; - - // Sprite icons path - // ------------------------- --$iconSpritePath: "../img/glyphicons-halflings.png" !default; --$iconWhiteSpritePath: "../img/glyphicons-halflings-white.png" !default; -+$iconSpritePath: image-path("glyphicons-halflings.png") !default; -+$iconWhiteSpritePath: image-path("glyphicons-halflings-white.png") !default; - - - // Input placeholder text color +diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +index b7dbdb6..ebcf0f4 100644 +--- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss ++++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +@@ -21,11 +21,11 @@ + // Import the fonts + @font-face { + font-family: 'Glyphicons Halflings'; +- src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot'); +- src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), +- url('#{$glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'), +- url('#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'), +- url('#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); ++ src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot")); ++ src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix")) format('embedded-opentype'), ++ url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.woff")) format('woff'), ++ url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf")) format('truetype'), ++ url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular")) format('svg'); + } diff --git a/update-bootstrap.sh b/update-bootstrap.sh index fb730372..37d91000 100755 --- a/update-bootstrap.sh +++ b/update-bootstrap.sh @@ -15,8 +15,8 @@ cp -r $TMP/img/* $ROOT/images rm -r $ROOT/javascripts/tests rm -r $ROOT/stylesheets/bootstrap/tests -# Patch the asset-url in _variables.scss -patch -f vendor/assets/stylesheets/bootstrap/_variables.scss < asseturl.patch +# Patch the asset-url in _glyphicons.scss +patch -f vendor/assets/stylesheets/bootstrap/_glyphicons.scss < asseturl.patch # Patch paths in bootstrap.scss and responsive.scss sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss index b7dbdb68..ebcf0f4d 100644 --- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss @@ -21,11 +21,11 @@ // Import the fonts @font-face { font-family: 'Glyphicons Halflings'; - src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot'); - src: url('#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix') format('embedded-opentype'), - url('#{$glyphicons-font-path}/glyphiconshalflings-regular.woff') format('woff'), - url('#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf') format('truetype'), - url('#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot")); + src: url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.eot?#iefix")) format('embedded-opentype'), + url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.woff")) format('woff'), + url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.ttf")) format('truetype'), + url(font-path("#{$glyphicons-font-path}/glyphiconshalflings-regular.svg#glyphicons_halflingsregular")) format('svg'); } // Catchall baseclass From 9ef003c3b579369782aee5cdc0162e9254f70ca0 Mon Sep 17 00:00:00 2001 From: gleb Date: Tue, 28 May 2013 18:37:56 +0200 Subject: [PATCH 3/6] sort out javascripts --- update-bootstrap.sh | 12 +- vendor/assets/javascripts/bootstrap-affix.js | 117 ------ vendor/assets/javascripts/bootstrap-alert.js | 99 ----- vendor/assets/javascripts/bootstrap-button.js | 105 ----- .../assets/javascripts/bootstrap-carousel.js | 207 ---------- .../assets/javascripts/bootstrap-collapse.js | 167 -------- .../assets/javascripts/bootstrap-dropdown.js | 165 -------- vendor/assets/javascripts/bootstrap-modal.js | 251 ------------ .../assets/javascripts/bootstrap-popover.js | 114 ------ .../assets/javascripts/bootstrap-scrollspy.js | 162 -------- vendor/assets/javascripts/bootstrap-tab.js | 144 ------- .../assets/javascripts/bootstrap-tooltip.js | 361 ------------------ .../javascripts/bootstrap-transition.js | 60 --- .../assets/javascripts/bootstrap-typeahead.js | 335 ---------------- vendor/assets/javascripts/bootstrap.js | 25 +- .../javascripts/{ => bootstrap}/affix.js | 0 .../javascripts/{ => bootstrap}/alert.js | 0 .../javascripts/{ => bootstrap}/button.js | 0 .../javascripts/{ => bootstrap}/carousel.js | 0 .../javascripts/{ => bootstrap}/collapse.js | 0 .../javascripts/{ => bootstrap}/dropdown.js | 0 .../javascripts/{ => bootstrap}/modal.js | 0 .../javascripts/{ => bootstrap}/popover.js | 0 .../javascripts/{ => bootstrap}/scrollspy.js | 0 .../assets/javascripts/{ => bootstrap}/tab.js | 0 .../javascripts/{ => bootstrap}/tooltip.js | 0 .../javascripts/{ => bootstrap}/transition.js | 0 27 files changed, 19 insertions(+), 2305 deletions(-) delete mode 100644 vendor/assets/javascripts/bootstrap-affix.js delete mode 100644 vendor/assets/javascripts/bootstrap-alert.js delete mode 100644 vendor/assets/javascripts/bootstrap-button.js delete mode 100644 vendor/assets/javascripts/bootstrap-carousel.js delete mode 100644 vendor/assets/javascripts/bootstrap-collapse.js delete mode 100644 vendor/assets/javascripts/bootstrap-dropdown.js delete mode 100644 vendor/assets/javascripts/bootstrap-modal.js delete mode 100644 vendor/assets/javascripts/bootstrap-popover.js delete mode 100644 vendor/assets/javascripts/bootstrap-scrollspy.js delete mode 100644 vendor/assets/javascripts/bootstrap-tab.js delete mode 100644 vendor/assets/javascripts/bootstrap-tooltip.js delete mode 100644 vendor/assets/javascripts/bootstrap-transition.js delete mode 100644 vendor/assets/javascripts/bootstrap-typeahead.js rename vendor/assets/javascripts/{ => bootstrap}/affix.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/alert.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/button.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/carousel.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/collapse.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/dropdown.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/modal.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/popover.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/scrollspy.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/tab.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/tooltip.js (100%) rename vendor/assets/javascripts/{ => bootstrap}/transition.js (100%) diff --git a/update-bootstrap.sh b/update-bootstrap.sh index 37d91000..8fa6f18a 100755 --- a/update-bootstrap.sh +++ b/update-bootstrap.sh @@ -7,19 +7,21 @@ git clone https://github.com/jlong/sass-twitter-bootstrap.git tmp/sass-twitter-b # Copy lib/ to stylesheets/ mkdir -p $ROOT/stylesheets/bootstrap cp -r $TMP/lib/* $ROOT/stylesheets/bootstrap -# Copy js/ to javascripts/ -cp -r $TMP/js/* $ROOT/javascripts +# Copy js/ to javascripts/bootstrap +cp -r $TMP/js/* $ROOT/javascripts/bootstrap # Copy img/ to images/ cp -r $TMP/img/* $ROOT/images +# Copy fonts/ to fonts/ +cp -r $TMP/fonts/* $ROOT/fonts # Remove tests -rm -r $ROOT/javascripts/tests -rm -r $ROOT/stylesheets/bootstrap/tests +rm -r $ROOT/javascripts/bootstrap/tests # Patch the asset-url in _glyphicons.scss patch -f vendor/assets/stylesheets/bootstrap/_glyphicons.scss < asseturl.patch +rm $ROOT/stylesheets/bootstrap/_glyphicons.scss.orig # Patch paths in bootstrap.scss and responsive.scss -sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/{bootstrap,responsive}.scss +sed -i .bak 's_@import \"_@import \"bootstrap/_g' $ROOT/stylesheets/bootstrap/bootstrap.scss rm $ROOT/stylesheets/bootstrap/*.bak rm -rf $TMP diff --git a/vendor/assets/javascripts/bootstrap-affix.js b/vendor/assets/javascripts/bootstrap-affix.js deleted file mode 100644 index 2b76881c..00000000 --- a/vendor/assets/javascripts/bootstrap-affix.js +++ /dev/null @@ -1,117 +0,0 @@ -/* ========================================================== - * bootstrap-affix.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#affix - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* AFFIX CLASS DEFINITION - * ====================== */ - - var Affix = function (element, options) { - this.options = $.extend({}, $.fn.affix.defaults, options) - this.$window = $(window) - .on('scroll.affix.data-api', $.proxy(this.checkPosition, this)) - .on('click.affix.data-api', $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this)) - this.$element = $(element) - this.checkPosition() - } - - Affix.prototype.checkPosition = function () { - if (!this.$element.is(':visible')) return - - var scrollHeight = $(document).height() - , scrollTop = this.$window.scrollTop() - , position = this.$element.offset() - , offset = this.options.offset - , offsetBottom = offset.bottom - , offsetTop = offset.top - , reset = 'affix affix-top affix-bottom' - , affix - - if (typeof offset != 'object') offsetBottom = offsetTop = offset - if (typeof offsetTop == 'function') offsetTop = offset.top() - if (typeof offsetBottom == 'function') offsetBottom = offset.bottom() - - affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ? - false : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? - 'bottom' : offsetTop != null && scrollTop <= offsetTop ? - 'top' : false - - if (this.affixed === affix) return - - this.affixed = affix - this.unpin = affix == 'bottom' ? position.top - scrollTop : null - - this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : '')) - } - - - /* AFFIX PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.affix - - $.fn.affix = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('affix') - , options = typeof option == 'object' && option - if (!data) $this.data('affix', (data = new Affix(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.affix.Constructor = Affix - - $.fn.affix.defaults = { - offset: 0 - } - - - /* AFFIX NO CONFLICT - * ================= */ - - $.fn.affix.noConflict = function () { - $.fn.affix = old - return this - } - - - /* AFFIX DATA-API - * ============== */ - - $(window).on('load', function () { - $('[data-spy="affix"]').each(function () { - var $spy = $(this) - , data = $spy.data() - - data.offset = data.offset || {} - - data.offsetBottom && (data.offset.bottom = data.offsetBottom) - data.offsetTop && (data.offset.top = data.offsetTop) - - $spy.affix(data) - }) - }) - - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-alert.js b/vendor/assets/javascripts/bootstrap-alert.js deleted file mode 100644 index bc456745..00000000 --- a/vendor/assets/javascripts/bootstrap-alert.js +++ /dev/null @@ -1,99 +0,0 @@ -/* ========================================================== - * bootstrap-alert.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#alerts - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* ALERT CLASS DEFINITION - * ====================== */ - - var dismiss = '[data-dismiss="alert"]' - , Alert = function (el) { - $(el).on('click', dismiss, this.close) - } - - Alert.prototype.close = function (e) { - var $this = $(this) - , selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = $(selector) - - e && e.preventDefault() - - $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) - - $parent.trigger(e = $.Event('close')) - - if (e.isDefaultPrevented()) return - - $parent.removeClass('in') - - function removeElement() { - $parent - .trigger('closed') - .remove() - } - - $.support.transition && $parent.hasClass('fade') ? - $parent.on($.support.transition.end, removeElement) : - removeElement() - } - - - /* ALERT PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.alert - - $.fn.alert = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('alert') - if (!data) $this.data('alert', (data = new Alert(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.alert.Constructor = Alert - - - /* ALERT NO CONFLICT - * ================= */ - - $.fn.alert.noConflict = function () { - $.fn.alert = old - return this - } - - - /* ALERT DATA-API - * ============== */ - - $(document).on('click.alert.data-api', dismiss, Alert.prototype.close) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-button.js b/vendor/assets/javascripts/bootstrap-button.js deleted file mode 100644 index 6e1aa9c8..00000000 --- a/vendor/assets/javascripts/bootstrap-button.js +++ /dev/null @@ -1,105 +0,0 @@ -/* ============================================================ - * bootstrap-button.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#buttons - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* BUTTON PUBLIC CLASS DEFINITION - * ============================== */ - - var Button = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.button.defaults, options) - } - - Button.prototype.setState = function (state) { - var d = 'disabled' - , $el = this.$element - , data = $el.data() - , val = $el.is('input') ? 'val' : 'html' - - state = state + 'Text' - data.resetText || $el.data('resetText', $el[val]()) - - $el[val](data[state] || this.options[state]) - - // push to event loop to allow forms to submit - setTimeout(function () { - state == 'loadingText' ? - $el.addClass(d).attr(d, d) : - $el.removeClass(d).removeAttr(d) - }, 0) - } - - Button.prototype.toggle = function () { - var $parent = this.$element.closest('[data-toggle="buttons-radio"]') - - $parent && $parent - .find('.active') - .removeClass('active') - - this.$element.toggleClass('active') - } - - - /* BUTTON PLUGIN DEFINITION - * ======================== */ - - var old = $.fn.button - - $.fn.button = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('button') - , options = typeof option == 'object' && option - if (!data) $this.data('button', (data = new Button(this, options))) - if (option == 'toggle') data.toggle() - else if (option) data.setState(option) - }) - } - - $.fn.button.defaults = { - loadingText: 'loading...' - } - - $.fn.button.Constructor = Button - - - /* BUTTON NO CONFLICT - * ================== */ - - $.fn.button.noConflict = function () { - $.fn.button = old - return this - } - - - /* BUTTON DATA-API - * =============== */ - - $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) { - var $btn = $(e.target) - if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn') - $btn.button('toggle') - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-carousel.js b/vendor/assets/javascripts/bootstrap-carousel.js deleted file mode 100644 index 3a9d980c..00000000 --- a/vendor/assets/javascripts/bootstrap-carousel.js +++ /dev/null @@ -1,207 +0,0 @@ -/* ========================================================== - * bootstrap-carousel.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#carousel - * ========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CAROUSEL CLASS DEFINITION - * ========================= */ - - var Carousel = function (element, options) { - this.$element = $(element) - this.$indicators = this.$element.find('.carousel-indicators') - this.options = options - this.options.pause == 'hover' && this.$element - .on('mouseenter', $.proxy(this.pause, this)) - .on('mouseleave', $.proxy(this.cycle, this)) - } - - Carousel.prototype = { - - cycle: function (e) { - if (!e) this.paused = false - if (this.interval) clearInterval(this.interval); - this.options.interval - && !this.paused - && (this.interval = setInterval($.proxy(this.next, this), this.options.interval)) - return this - } - - , getActiveIndex: function () { - this.$active = this.$element.find('.item.active') - this.$items = this.$active.parent().children() - return this.$items.index(this.$active) - } - - , to: function (pos) { - var activeIndex = this.getActiveIndex() - , that = this - - if (pos > (this.$items.length - 1) || pos < 0) return - - if (this.sliding) { - return this.$element.one('slid', function () { - that.to(pos) - }) - } - - if (activeIndex == pos) { - return this.pause().cycle() - } - - return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos])) - } - - , pause: function (e) { - if (!e) this.paused = true - if (this.$element.find('.next, .prev').length && $.support.transition.end) { - this.$element.trigger($.support.transition.end) - this.cycle(true) - } - clearInterval(this.interval) - this.interval = null - return this - } - - , next: function () { - if (this.sliding) return - return this.slide('next') - } - - , prev: function () { - if (this.sliding) return - return this.slide('prev') - } - - , slide: function (type, next) { - var $active = this.$element.find('.item.active') - , $next = next || $active[type]() - , isCycling = this.interval - , direction = type == 'next' ? 'left' : 'right' - , fallback = type == 'next' ? 'first' : 'last' - , that = this - , e - - this.sliding = true - - isCycling && this.pause() - - $next = $next.length ? $next : this.$element.find('.item')[fallback]() - - e = $.Event('slide', { - relatedTarget: $next[0] - , direction: direction - }) - - if ($next.hasClass('active')) return - - if (this.$indicators.length) { - this.$indicators.find('.active').removeClass('active') - this.$element.one('slid', function () { - var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()]) - $nextIndicator && $nextIndicator.addClass('active') - }) - } - - if ($.support.transition && this.$element.hasClass('slide')) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $next.addClass(type) - $next[0].offsetWidth // force reflow - $active.addClass(direction) - $next.addClass(direction) - this.$element.one($.support.transition.end, function () { - $next.removeClass([type, direction].join(' ')).addClass('active') - $active.removeClass(['active', direction].join(' ')) - that.sliding = false - setTimeout(function () { that.$element.trigger('slid') }, 0) - }) - } else { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $active.removeClass('active') - $next.addClass('active') - this.sliding = false - this.$element.trigger('slid') - } - - isCycling && this.cycle() - - return this - } - - } - - - /* CAROUSEL PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.carousel - - $.fn.carousel = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('carousel') - , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option) - , action = typeof option == 'string' ? option : options.slide - if (!data) $this.data('carousel', (data = new Carousel(this, options))) - if (typeof option == 'number') data.to(option) - else if (action) data[action]() - else if (options.interval) data.pause().cycle() - }) - } - - $.fn.carousel.defaults = { - interval: 5000 - , pause: 'hover' - } - - $.fn.carousel.Constructor = Carousel - - - /* CAROUSEL NO CONFLICT - * ==================== */ - - $.fn.carousel.noConflict = function () { - $.fn.carousel = old - return this - } - - /* CAROUSEL DATA-API - * ================= */ - - $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) { - var $this = $(this), href - , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - , options = $.extend({}, $target.data(), $this.data()) - , slideIndex - - $target.carousel(options) - - if (slideIndex = $this.attr('data-slide-to')) { - $target.data('carousel').pause().to(slideIndex).cycle() - } - - e.preventDefault() - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-collapse.js b/vendor/assets/javascripts/bootstrap-collapse.js deleted file mode 100644 index 2730a48d..00000000 --- a/vendor/assets/javascripts/bootstrap-collapse.js +++ /dev/null @@ -1,167 +0,0 @@ -/* ============================================================= - * bootstrap-collapse.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#collapse - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* COLLAPSE PUBLIC CLASS DEFINITION - * ================================ */ - - var Collapse = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.collapse.defaults, options) - - if (this.options.parent) { - this.$parent = $(this.options.parent) - } - - this.options.toggle && this.toggle() - } - - Collapse.prototype = { - - constructor: Collapse - - , dimension: function () { - var hasWidth = this.$element.hasClass('width') - return hasWidth ? 'width' : 'height' - } - - , show: function () { - var dimension - , scroll - , actives - , hasData - - if (this.transitioning || this.$element.hasClass('in')) return - - dimension = this.dimension() - scroll = $.camelCase(['scroll', dimension].join('-')) - actives = this.$parent && this.$parent.find('> .accordion-group > .in') - - if (actives && actives.length) { - hasData = actives.data('collapse') - if (hasData && hasData.transitioning) return - actives.collapse('hide') - hasData || actives.data('collapse', null) - } - - this.$element[dimension](0) - this.transition('addClass', $.Event('show'), 'shown') - $.support.transition && this.$element[dimension](this.$element[0][scroll]) - } - - , hide: function () { - var dimension - if (this.transitioning || !this.$element.hasClass('in')) return - dimension = this.dimension() - this.reset(this.$element[dimension]()) - this.transition('removeClass', $.Event('hide'), 'hidden') - this.$element[dimension](0) - } - - , reset: function (size) { - var dimension = this.dimension() - - this.$element - .removeClass('collapse') - [dimension](size || 'auto') - [0].offsetWidth - - this.$element[size !== null ? 'addClass' : 'removeClass']('collapse') - - return this - } - - , transition: function (method, startEvent, completeEvent) { - var that = this - , complete = function () { - if (startEvent.type == 'show') that.reset() - that.transitioning = 0 - that.$element.trigger(completeEvent) - } - - this.$element.trigger(startEvent) - - if (startEvent.isDefaultPrevented()) return - - this.transitioning = 1 - - this.$element[method]('in') - - $.support.transition && this.$element.hasClass('collapse') ? - this.$element.one($.support.transition.end, complete) : - complete() - } - - , toggle: function () { - this[this.$element.hasClass('in') ? 'hide' : 'show']() - } - - } - - - /* COLLAPSE PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.collapse - - $.fn.collapse = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('collapse') - , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('collapse', (data = new Collapse(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.collapse.defaults = { - toggle: true - } - - $.fn.collapse.Constructor = Collapse - - - /* COLLAPSE NO CONFLICT - * ==================== */ - - $.fn.collapse.noConflict = function () { - $.fn.collapse = old - return this - } - - - /* COLLAPSE DATA-API - * ================= */ - - $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) { - var $this = $(this), href - , target = $this.attr('data-target') - || e.preventDefault() - || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7 - , option = $(target).data('collapse') ? 'toggle' : $this.data() - $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed') - $(target).collapse(option) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-dropdown.js b/vendor/assets/javascripts/bootstrap-dropdown.js deleted file mode 100644 index a86684fb..00000000 --- a/vendor/assets/javascripts/bootstrap-dropdown.js +++ /dev/null @@ -1,165 +0,0 @@ -/* ============================================================ - * bootstrap-dropdown.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#dropdowns - * ============================================================ - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* DROPDOWN CLASS DEFINITION - * ========================= */ - - var toggle = '[data-toggle=dropdown]' - , Dropdown = function (element) { - var $el = $(element).on('click.dropdown.data-api', this.toggle) - $('html').on('click.dropdown.data-api', function () { - $el.parent().removeClass('open') - }) - } - - Dropdown.prototype = { - - constructor: Dropdown - - , toggle: function (e) { - var $this = $(this) - , $parent - , isActive - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - clearMenus() - - if (!isActive) { - $parent.toggleClass('open') - } - - $this.focus() - - return false - } - - , keydown: function (e) { - var $this - , $items - , $active - , $parent - , isActive - , index - - if (!/(38|40|27)/.test(e.keyCode)) return - - $this = $(this) - - e.preventDefault() - e.stopPropagation() - - if ($this.is('.disabled, :disabled')) return - - $parent = getParent($this) - - isActive = $parent.hasClass('open') - - if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() - } - - $items = $('[role=menu] li:not(.divider):visible a', $parent) - - if (!$items.length) return - - index = $items.index($items.filter(':focus')) - - if (e.keyCode == 38 && index > 0) index-- // up - if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 - - $items - .eq(index) - .focus() - } - - } - - function clearMenus() { - $(toggle).each(function () { - getParent($(this)).removeClass('open') - }) - } - - function getParent($this) { - var selector = $this.attr('data-target') - , $parent - - if (!selector) { - selector = $this.attr('href') - selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - $parent = selector && $(selector) - - if (!$parent || !$parent.length) $parent = $this.parent() - - return $parent - } - - - /* DROPDOWN PLUGIN DEFINITION - * ========================== */ - - var old = $.fn.dropdown - - $.fn.dropdown = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('dropdown') - if (!data) $this.data('dropdown', (data = new Dropdown(this))) - if (typeof option == 'string') data[option].call($this) - }) - } - - $.fn.dropdown.Constructor = Dropdown - - - /* DROPDOWN NO CONFLICT - * ==================== */ - - $.fn.dropdown.noConflict = function () { - $.fn.dropdown = old - return this - } - - - /* APPLY TO STANDARD DROPDOWN ELEMENTS - * =================================== */ - - $(document) - .on('click.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown-menu', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-modal.js b/vendor/assets/javascripts/bootstrap-modal.js deleted file mode 100644 index f45749d4..00000000 --- a/vendor/assets/javascripts/bootstrap-modal.js +++ /dev/null @@ -1,251 +0,0 @@ -/* ========================================================= - * bootstrap-modal.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#modals - * ========================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================= */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* MODAL CLASS DEFINITION - * ====================== */ - - var Modal = function (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 ? 'show' : 'hide']() - } - - , show: function () { - var that = this - , e = $.Event('show') - - this.$element.trigger(e) - - if (this.isShown || e.isDefaultPrevented()) return - - this.isShown = true - - this.escape() - - this.backdrop(function () { - var transition = $.support.transition && that.$element.hasClass('fade') - - if (!that.$element.parent().length) { - that.$element.appendTo(document.body) //don't move modals dom position - } - - that.$element.show() - - if (transition) { - that.$element[0].offsetWidth // force reflow - } - - that.$element - .addClass('in') - .attr('aria-hidden', false) - - 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() - - var that = this - - e = $.Event('hide') - - this.$element.trigger(e) - - if (!this.isShown || e.isDefaultPrevented()) return - - this.isShown = false - - this.escape() - - $(document).off('focusin.modal') - - this.$element - .removeClass('in') - .attr('aria-hidden', true) - - $.support.transition && this.$element.hasClass('fade') ? - this.hideWithTransition() : - this.hideModal() - } - - , enforceFocus: function () { - var that = this - $(document).on('focusin.modal', function (e) { - if (that.$element[0] !== e.target && !that.$element.has(e.target).length) { - that.$element.focus() - } - }) - } - - , escape: function () { - var that = this - if (this.isShown && this.options.keyboard) { - this.$element.on('keyup.dismiss.modal', function ( e ) { - e.which == 27 && that.hide() - }) - } else if (!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 () { - var that = this - this.$element.hide() - this.backdrop(function () { - that.removeBackdrop() - that.$element.trigger('hidden') - }) - } - - , removeBackdrop: function () { - this.$backdrop && this.$backdrop.remove() - this.$backdrop = null - } - - , backdrop: function (callback) { - var that = this - , animate = this.$element.hasClass('fade') ? 'fade' : '' - - if (this.isShown && this.options.backdrop) { - var doAnimate = $.support.transition && animate - - this.$backdrop = $('
    ') - .appendTo(document.body) - - this.$backdrop.click( - this.options.backdrop == 'static' ? - $.proxy(this.$element[0].focus, this.$element[0]) - : $.proxy(this.hide, this) - ) - - if (doAnimate) this.$backdrop[0].offsetWidth // force reflow - - this.$backdrop.addClass('in') - - if (!callback) return - - doAnimate ? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (!this.isShown && this.$backdrop) { - this.$backdrop.removeClass('in') - - $.support.transition && this.$element.hasClass('fade')? - this.$backdrop.one($.support.transition.end, callback) : - callback() - - } else if (callback) { - callback() - } - } - } - - - /* MODAL PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.modal - - $.fn.modal = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('modal') - , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option) - if (!data) $this.data('modal', (data = new Modal(this, options))) - if (typeof option == 'string') data[option]() - else if (options.show) data.show() - }) - } - - $.fn.modal.defaults = { - backdrop: true - , keyboard: true - , show: true - } - - $.fn.modal.Constructor = Modal - - - /* MODAL NO CONFLICT - * ================= */ - - $.fn.modal.noConflict = function () { - $.fn.modal = old - return this - } - - - /* MODAL DATA-API - * ============== */ - - $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) { - var $this = $(this) - , href = $this.attr('href') - , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7 - , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data()) - - e.preventDefault() - - $target - .modal(option) - .one('hide', function () { - $this.focus() - }) - }) - - var $body = $(document.body) - .on('shown', '.modal', function () { $body.addClass('modal-open') }) - .on('hidden', '.modal', function () { $body.removeClass('modal-open') }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-popover.js b/vendor/assets/javascripts/bootstrap-popover.js deleted file mode 100644 index c5eecbdd..00000000 --- a/vendor/assets/javascripts/bootstrap-popover.js +++ /dev/null @@ -1,114 +0,0 @@ -/* =========================================================== - * bootstrap-popover.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#popovers - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * =========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* POPOVER PUBLIC CLASS DEFINITION - * =============================== */ - - var Popover = function (element, options) { - this.init('popover', element, options) - } - - - /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js - ========================================== */ - - Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, { - - constructor: Popover - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - , content = this.getContent() - - $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title) - $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) - - $tip.removeClass('fade top bottom left right in') - } - - , hasContent: function () { - return this.getTitle() || this.getContent() - } - - , getContent: function () { - var content - , $e = this.$element - , o = this.options - - content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content) - || $e.attr('data-content') - - return content - } - - , tip: function () { - if (!this.$tip) { - this.$tip = $(this.options.template) - } - return this.$tip - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - }) - - - /* POPOVER PLUGIN DEFINITION - * ======================= */ - - var old = $.fn.popover - - $.fn.popover = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('popover') - , options = typeof option == 'object' && option - if (!data) $this.data('popover', (data = new Popover(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.popover.Constructor = Popover - - $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, { - placement: 'right' - , trigger: 'click' - , content: '' - , template: '

    ' - }) - - - /* POPOVER NO CONFLICT - * =================== */ - - $.fn.popover.noConflict = function () { - $.fn.popover = old - return this - } - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-scrollspy.js b/vendor/assets/javascripts/bootstrap-scrollspy.js deleted file mode 100644 index 7e845a51..00000000 --- a/vendor/assets/javascripts/bootstrap-scrollspy.js +++ /dev/null @@ -1,162 +0,0 @@ -/* ============================================================= - * bootstrap-scrollspy.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#scrollspy - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* SCROLLSPY CLASS DEFINITION - * ========================== */ - - function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - , $element = $(element).is('body') ? $(window) : $(element) - , href - this.options = $.extend({}, $.fn.scrollspy.defaults, options) - this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' - this.$body = $('body') - this.refresh() - this.process() - } - - ScrollSpy.prototype = { - - constructor: ScrollSpy - - , refresh: function () { - var self = this - , $targets - - this.offsets = $([]) - this.targets = $([]) - - $targets = this.$body - .find(this.selector) - .map(function () { - var $el = $(this) - , href = $el.data('target') || $el.attr('href') - , $href = /^#\w/.test(href) && $(href) - return ( $href - && $href.length - && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null - }) - .sort(function (a, b) { return a[0] - b[0] }) - .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) - }) - } - - , process: function () { - var scrollTop = this.$scrollElement.scrollTop() + this.options.offset - , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight - , maxScroll = scrollHeight - this.$scrollElement.height() - , offsets = this.offsets - , targets = this.targets - , activeTarget = this.activeTarget - , i - - if (scrollTop >= maxScroll) { - return activeTarget != (i = targets.last()[0]) - && this.activate ( i ) - } - - for (i = offsets.length; i--;) { - activeTarget != targets[i] - && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) - && this.activate( targets[i] ) - } - } - - , activate: function (target) { - var active - , selector - - this.activeTarget = target - - $(this.selector) - .parent('.active') - .removeClass('active') - - selector = this.selector - + '[data-target="' + target + '"],' - + this.selector + '[href="' + target + '"]' - - active = $(selector) - .parent('li') - .addClass('active') - - if (active.parent('.dropdown-menu').length) { - active = active.closest('li.dropdown').addClass('active') - } - - active.trigger('activate') - } - - } - - - /* SCROLLSPY PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.scrollspy - - $.fn.scrollspy = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('scrollspy') - , options = typeof option == 'object' && option - if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.scrollspy.Constructor = ScrollSpy - - $.fn.scrollspy.defaults = { - offset: 10 - } - - - /* SCROLLSPY NO CONFLICT - * ===================== */ - - $.fn.scrollspy.noConflict = function () { - $.fn.scrollspy = old - return this - } - - - /* SCROLLSPY DATA-API - * ================== */ - - $(window).on('load', function () { - $('[data-spy="scroll"]').each(function () { - var $spy = $(this) - $spy.scrollspy($spy.data()) - }) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-tab.js b/vendor/assets/javascripts/bootstrap-tab.js deleted file mode 100644 index 2914cdb1..00000000 --- a/vendor/assets/javascripts/bootstrap-tab.js +++ /dev/null @@ -1,144 +0,0 @@ -/* ======================================================== - * bootstrap-tab.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tabs - * ======================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ======================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TAB CLASS DEFINITION - * ==================== */ - - var Tab = function (element) { - this.element = $(element) - } - - Tab.prototype = { - - constructor: Tab - - , show: function () { - var $this = this.element - , $ul = $this.closest('ul:not(.dropdown-menu)') - , selector = $this.attr('data-target') - , previous - , $target - , e - - if (!selector) { - selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 - } - - if ( $this.parent('li').hasClass('active') ) return - - previous = $ul.find('.active:last a')[0] - - e = $.Event('show', { - relatedTarget: previous - }) - - $this.trigger(e) - - if (e.isDefaultPrevented()) return - - $target = $(selector) - - this.activate($this.parent('li'), $ul) - this.activate($target, $target.parent(), function () { - $this.trigger({ - type: 'shown' - , relatedTarget: previous - }) - }) - } - - , activate: function ( element, container, callback) { - var $active = container.find('> .active') - , transition = callback - && $.support.transition - && $active.hasClass('fade') - - function next() { - $active - .removeClass('active') - .find('> .dropdown-menu > .active') - .removeClass('active') - - element.addClass('active') - - if (transition) { - element[0].offsetWidth // reflow for transition - element.addClass('in') - } else { - element.removeClass('fade') - } - - if ( element.parent('.dropdown-menu') ) { - element.closest('li.dropdown').addClass('active') - } - - callback && callback() - } - - transition ? - $active.one($.support.transition.end, next) : - next() - - $active.removeClass('in') - } - } - - - /* TAB PLUGIN DEFINITION - * ===================== */ - - var old = $.fn.tab - - $.fn.tab = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tab') - if (!data) $this.data('tab', (data = new Tab(this))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tab.Constructor = Tab - - - /* TAB NO CONFLICT - * =============== */ - - $.fn.tab.noConflict = function () { - $.fn.tab = old - return this - } - - - /* TAB DATA-API - * ============ */ - - $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) { - e.preventDefault() - $(this).tab('show') - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-tooltip.js b/vendor/assets/javascripts/bootstrap-tooltip.js deleted file mode 100644 index e43b1193..00000000 --- a/vendor/assets/javascripts/bootstrap-tooltip.js +++ /dev/null @@ -1,361 +0,0 @@ -/* =========================================================== - * bootstrap-tooltip.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#tooltips - * Inspired by the original jQuery.tipsy by Jason Frame - * =========================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* TOOLTIP PUBLIC CLASS DEFINITION - * =============================== */ - - var Tooltip = function (element, options) { - this.init('tooltip', element, options) - } - - Tooltip.prototype = { - - constructor: Tooltip - - , init: function (type, element, options) { - var eventIn - , eventOut - , triggers - , trigger - , i - - this.type = type - this.$element = $(element) - this.options = this.getOptions(options) - this.enabled = true - - triggers = this.options.trigger.split(' ') - - for (i = triggers.length; i--;) { - trigger = triggers[i] - if (trigger == 'click') { - this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this)) - } else if (trigger != 'manual') { - eventIn = trigger == 'hover' ? 'mouseenter' : 'focus' - eventOut = trigger == 'hover' ? 'mouseleave' : 'blur' - this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this)) - this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this)) - } - } - - this.options.selector ? - (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) : - this.fixTitle() - } - - , getOptions: function (options) { - options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options) - - if (options.delay && typeof options.delay == 'number') { - options.delay = { - show: options.delay - , hide: options.delay - } - } - - return options - } - - , enter: function (e) { - var defaults = $.fn[this.type].defaults - , options = {} - , self - - this._options && $.each(this._options, function (key, value) { - if (defaults[key] != value) options[key] = value - }, this) - - self = $(e.currentTarget)[this.type](options).data(this.type) - - if (!self.options.delay || !self.options.delay.show) return self.show() - - clearTimeout(this.timeout) - self.hoverState = 'in' - this.timeout = setTimeout(function() { - if (self.hoverState == 'in') self.show() - }, self.options.delay.show) - } - - , leave: function (e) { - var self = $(e.currentTarget)[this.type](this._options).data(this.type) - - if (this.timeout) clearTimeout(this.timeout) - if (!self.options.delay || !self.options.delay.hide) return self.hide() - - self.hoverState = 'out' - this.timeout = setTimeout(function() { - if (self.hoverState == 'out') self.hide() - }, self.options.delay.hide) - } - - , show: function () { - var $tip - , pos - , actualWidth - , actualHeight - , placement - , tp - , e = $.Event('show') - - if (this.hasContent() && this.enabled) { - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - $tip = this.tip() - this.setContent() - - if (this.options.animation) { - $tip.addClass('fade') - } - - placement = typeof this.options.placement == 'function' ? - this.options.placement.call(this, $tip[0], this.$element[0]) : - this.options.placement - - $tip - .detach() - .css({ top: 0, left: 0, display: 'block' }) - - this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element) - - pos = this.getPosition() - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - switch (placement) { - case 'bottom': - tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'top': - tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2} - break - case 'left': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth} - break - case 'right': - tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width} - break - } - - this.applyPlacement(tp, placement) - this.$element.trigger('shown') - } - } - - , applyPlacement: function(offset, placement){ - var $tip = this.tip() - , width = $tip[0].offsetWidth - , height = $tip[0].offsetHeight - , actualWidth - , actualHeight - , delta - , replace - - $tip - .offset(offset) - .addClass(placement) - .addClass('in') - - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - - if (placement == 'top' && actualHeight != height) { - offset.top = offset.top + height - actualHeight - replace = true - } - - if (placement == 'bottom' || placement == 'top') { - delta = 0 - - if (offset.left < 0){ - delta = offset.left * -2 - offset.left = 0 - $tip.offset(offset) - actualWidth = $tip[0].offsetWidth - actualHeight = $tip[0].offsetHeight - } - - this.replaceArrow(delta - width + actualWidth, actualWidth, 'left') - } else { - this.replaceArrow(actualHeight - height, actualHeight, 'top') - } - - if (replace) $tip.offset(offset) - } - - , replaceArrow: function(delta, dimension, position){ - this - .arrow() - .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') - } - - , setContent: function () { - var $tip = this.tip() - , title = this.getTitle() - - $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title) - $tip.removeClass('fade in top bottom left right') - } - - , hide: function () { - var that = this - , $tip = this.tip() - , e = $.Event('hide') - - this.$element.trigger(e) - if (e.isDefaultPrevented()) return - - $tip.removeClass('in') - - function removeWithAnimation() { - var timeout = setTimeout(function () { - $tip.off($.support.transition.end).detach() - }, 500) - - $tip.one($.support.transition.end, function () { - clearTimeout(timeout) - $tip.detach() - }) - } - - $.support.transition && this.$tip.hasClass('fade') ? - removeWithAnimation() : - $tip.detach() - - this.$element.trigger('hidden') - - return this - } - - , fixTitle: function () { - var $e = this.$element - if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') { - $e.attr('data-original-title', $e.attr('title') || '').attr('title', '') - } - } - - , hasContent: function () { - return this.getTitle() - } - - , getPosition: function () { - var el = this.$element[0] - return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth - , height: el.offsetHeight - }, this.$element.offset()) - } - - , getTitle: function () { - var title - , $e = this.$element - , o = this.options - - title = $e.attr('data-original-title') - || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) - - return title - } - - , tip: function () { - return this.$tip = this.$tip || $(this.options.template) - } - - , arrow: function(){ - return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow") - } - - , validate: function () { - if (!this.$element[0].parentNode) { - this.hide() - this.$element = null - this.options = null - } - } - - , enable: function () { - this.enabled = true - } - - , disable: function () { - this.enabled = false - } - - , toggleEnabled: function () { - this.enabled = !this.enabled - } - - , toggle: function (e) { - var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this - self.tip().hasClass('in') ? self.hide() : self.show() - } - - , destroy: function () { - this.hide().$element.off('.' + this.type).removeData(this.type) - } - - } - - - /* TOOLTIP PLUGIN DEFINITION - * ========================= */ - - var old = $.fn.tooltip - - $.fn.tooltip = function ( option ) { - return this.each(function () { - var $this = $(this) - , data = $this.data('tooltip') - , options = typeof option == 'object' && option - if (!data) $this.data('tooltip', (data = new Tooltip(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.tooltip.Constructor = Tooltip - - $.fn.tooltip.defaults = { - animation: true - , placement: 'top' - , selector: false - , template: '
    ' - , trigger: 'hover focus' - , title: '' - , delay: 0 - , html: false - , container: false - } - - - /* TOOLTIP NO CONFLICT - * =================== */ - - $.fn.tooltip.noConflict = function () { - $.fn.tooltip = old - return this - } - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-transition.js b/vendor/assets/javascripts/bootstrap-transition.js deleted file mode 100644 index db83485b..00000000 --- a/vendor/assets/javascripts/bootstrap-transition.js +++ /dev/null @@ -1,60 +0,0 @@ -/* =================================================== - * bootstrap-transition.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#transitions - * =================================================== - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ========================================================== */ - - -!function ($) { - - "use strict"; // jshint ;_; - - - /* CSS TRANSITION SUPPORT (http://www.modernizr.com/) - * ======================================================= */ - - $(function () { - - $.support.transition = (function () { - - var transitionEnd = (function () { - - var el = document.createElement('bootstrap') - , transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd' - , 'MozTransition' : 'transitionend' - , 'OTransition' : 'oTransitionEnd otransitionend' - , 'transition' : 'transitionend' - } - , name - - for (name in transEndEventNames){ - if (el.style[name] !== undefined) { - return transEndEventNames[name] - } - } - - }()) - - return transitionEnd && { - end: transitionEnd - } - - })() - - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap-typeahead.js b/vendor/assets/javascripts/bootstrap-typeahead.js deleted file mode 100644 index 7e6c7820..00000000 --- a/vendor/assets/javascripts/bootstrap-typeahead.js +++ /dev/null @@ -1,335 +0,0 @@ -/* ============================================================= - * bootstrap-typeahead.js v3.0.0 - * http://twitter.github.com/bootstrap/javascript.html#typeahead - * ============================================================= - * Copyright 2012 Twitter, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============================================================ */ - - -!function($){ - - "use strict"; // jshint ;_; - - - /* TYPEAHEAD PUBLIC CLASS DEFINITION - * ================================= */ - - var Typeahead = function (element, options) { - this.$element = $(element) - this.options = $.extend({}, $.fn.typeahead.defaults, options) - this.matcher = this.options.matcher || this.matcher - this.sorter = this.options.sorter || this.sorter - this.highlighter = this.options.highlighter || this.highlighter - this.updater = this.options.updater || this.updater - this.source = this.options.source - this.$menu = $(this.options.menu) - this.shown = false - this.listen() - } - - Typeahead.prototype = { - - constructor: Typeahead - - , select: function () { - var val = this.$menu.find('.active').attr('data-value') - this.$element - .val(this.updater(val)) - .change() - return this.hide() - } - - , updater: function (item) { - return item - } - - , show: function () { - var pos = $.extend({}, this.$element.position(), { - height: this.$element[0].offsetHeight - }) - - this.$menu - .insertAfter(this.$element) - .css({ - top: pos.top + pos.height - , left: pos.left - }) - .show() - - this.shown = true - return this - } - - , hide: function () { - this.$menu.hide() - this.shown = false - return this - } - - , lookup: function (event) { - var items - - this.query = this.$element.val() - - if (!this.query || this.query.length < this.options.minLength) { - return this.shown ? this.hide() : this - } - - items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source - - return items ? this.process(items) : this - } - - , process: function (items) { - var that = this - - items = $.grep(items, function (item) { - return that.matcher(item) - }) - - items = this.sorter(items) - - if (!items.length) { - return this.shown ? this.hide() : this - } - - return this.render(items.slice(0, this.options.items)).show() - } - - , matcher: function (item) { - return ~item.toLowerCase().indexOf(this.query.toLowerCase()) - } - - , sorter: function (items) { - var beginswith = [] - , caseSensitive = [] - , caseInsensitive = [] - , item - - while (item = items.shift()) { - if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) - else if (~item.indexOf(this.query)) caseSensitive.push(item) - else caseInsensitive.push(item) - } - - return beginswith.concat(caseSensitive, caseInsensitive) - } - - , highlighter: function (item) { - var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') - return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { - return '' + match + '' - }) - } - - , render: function (items) { - var that = this - - items = $(items).map(function (i, item) { - i = $(that.options.item).attr('data-value', item) - i.find('a').html(that.highlighter(item)) - return i[0] - }) - - items.first().addClass('active') - this.$menu.html(items) - return this - } - - , next: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , next = active.next() - - if (!next.length) { - next = $(this.$menu.find('li')[0]) - } - - next.addClass('active') - } - - , prev: function (event) { - var active = this.$menu.find('.active').removeClass('active') - , prev = active.prev() - - if (!prev.length) { - prev = this.$menu.find('li').last() - } - - prev.addClass('active') - } - - , listen: function () { - this.$element - .on('focus', $.proxy(this.focus, this)) - .on('blur', $.proxy(this.blur, this)) - .on('keypress', $.proxy(this.keypress, this)) - .on('keyup', $.proxy(this.keyup, this)) - - if (this.eventSupported('keydown')) { - this.$element.on('keydown', $.proxy(this.keydown, this)) - } - - this.$menu - .on('click', $.proxy(this.click, this)) - .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) - .on('mouseleave', 'li', $.proxy(this.mouseleave, this)) - } - - , eventSupported: function(eventName) { - var isSupported = eventName in this.$element - if (!isSupported) { - this.$element.setAttribute(eventName, 'return;') - isSupported = typeof this.$element[eventName] === 'function' - } - return isSupported - } - - , move: function (e) { - if (!this.shown) return - - switch(e.keyCode) { - case 9: // tab - case 13: // enter - case 27: // escape - e.preventDefault() - break - - case 38: // up arrow - e.preventDefault() - this.prev() - break - - case 40: // down arrow - e.preventDefault() - this.next() - break - } - - e.stopPropagation() - } - - , keydown: function (e) { - this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27]) - this.move(e) - } - - , keypress: function (e) { - if (this.suppressKeyPressRepeat) return - this.move(e) - } - - , keyup: function (e) { - switch(e.keyCode) { - case 40: // down arrow - case 38: // up arrow - case 16: // shift - case 17: // ctrl - case 18: // alt - break - - case 9: // tab - case 13: // enter - if (!this.shown) return - this.select() - break - - case 27: // escape - if (!this.shown) return - this.hide() - break - - default: - this.lookup() - } - - e.stopPropagation() - e.preventDefault() - } - - , focus: function (e) { - this.focused = true - } - - , blur: function (e) { - this.focused = false - if (!this.mousedover && this.shown) this.hide() - } - - , click: function (e) { - e.stopPropagation() - e.preventDefault() - this.select() - this.$element.focus() - } - - , mouseenter: function (e) { - this.mousedover = true - this.$menu.find('.active').removeClass('active') - $(e.currentTarget).addClass('active') - } - - , mouseleave: function (e) { - this.mousedover = false - if (!this.focused && this.shown) this.hide() - } - - } - - - /* TYPEAHEAD PLUGIN DEFINITION - * =========================== */ - - var old = $.fn.typeahead - - $.fn.typeahead = function (option) { - return this.each(function () { - var $this = $(this) - , data = $this.data('typeahead') - , options = typeof option == 'object' && option - if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) - if (typeof option == 'string') data[option]() - }) - } - - $.fn.typeahead.defaults = { - source: [] - , items: 8 - , menu: '
      ' - , item: '
      • ' - , minLength: 1 - } - - $.fn.typeahead.Constructor = Typeahead - - - /* TYPEAHEAD NO CONFLICT - * =================== */ - - $.fn.typeahead.noConflict = function () { - $.fn.typeahead = old - return this - } - - - /* TYPEAHEAD DATA-API - * ================== */ - - $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { - var $this = $(this) - if ($this.data('typeahead')) return - $this.typeahead($this.data()) - }) - -}(window.jQuery); \ No newline at end of file diff --git a/vendor/assets/javascripts/bootstrap.js b/vendor/assets/javascripts/bootstrap.js index f28d8bbc..7daa4d6f 100644 --- a/vendor/assets/javascripts/bootstrap.js +++ b/vendor/assets/javascripts/bootstrap.js @@ -1,13 +1,12 @@ -//= require bootstrap-transition -//= require bootstrap-affix -//= require bootstrap-alert -//= require bootstrap-button -//= require bootstrap-carousel -//= require bootstrap-collapse -//= require bootstrap-dropdown -//= require bootstrap-modal -//= require bootstrap-scrollspy -//= require bootstrap-tab -//= require bootstrap-tooltip -//= require bootstrap-popover -//= require bootstrap-typeahead \ No newline at end of file +//= require bootstrap/affix +//= require bootstrap/alert +//= require bootstrap/button +//= require bootstrap/carousel +//= require bootstrap/collapse +//= require bootstrap/dropdown +//= require bootstrap/modal +//= require bootstrap/popover +//= require bootstrap/scrollspy +//= require bootstrap/tab +//= require bootstrap/tooltip +//= require bootstrap/transition diff --git a/vendor/assets/javascripts/affix.js b/vendor/assets/javascripts/bootstrap/affix.js similarity index 100% rename from vendor/assets/javascripts/affix.js rename to vendor/assets/javascripts/bootstrap/affix.js diff --git a/vendor/assets/javascripts/alert.js b/vendor/assets/javascripts/bootstrap/alert.js similarity index 100% rename from vendor/assets/javascripts/alert.js rename to vendor/assets/javascripts/bootstrap/alert.js diff --git a/vendor/assets/javascripts/button.js b/vendor/assets/javascripts/bootstrap/button.js similarity index 100% rename from vendor/assets/javascripts/button.js rename to vendor/assets/javascripts/bootstrap/button.js diff --git a/vendor/assets/javascripts/carousel.js b/vendor/assets/javascripts/bootstrap/carousel.js similarity index 100% rename from vendor/assets/javascripts/carousel.js rename to vendor/assets/javascripts/bootstrap/carousel.js diff --git a/vendor/assets/javascripts/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js similarity index 100% rename from vendor/assets/javascripts/collapse.js rename to vendor/assets/javascripts/bootstrap/collapse.js diff --git a/vendor/assets/javascripts/dropdown.js b/vendor/assets/javascripts/bootstrap/dropdown.js similarity index 100% rename from vendor/assets/javascripts/dropdown.js rename to vendor/assets/javascripts/bootstrap/dropdown.js diff --git a/vendor/assets/javascripts/modal.js b/vendor/assets/javascripts/bootstrap/modal.js similarity index 100% rename from vendor/assets/javascripts/modal.js rename to vendor/assets/javascripts/bootstrap/modal.js diff --git a/vendor/assets/javascripts/popover.js b/vendor/assets/javascripts/bootstrap/popover.js similarity index 100% rename from vendor/assets/javascripts/popover.js rename to vendor/assets/javascripts/bootstrap/popover.js diff --git a/vendor/assets/javascripts/scrollspy.js b/vendor/assets/javascripts/bootstrap/scrollspy.js similarity index 100% rename from vendor/assets/javascripts/scrollspy.js rename to vendor/assets/javascripts/bootstrap/scrollspy.js diff --git a/vendor/assets/javascripts/tab.js b/vendor/assets/javascripts/bootstrap/tab.js similarity index 100% rename from vendor/assets/javascripts/tab.js rename to vendor/assets/javascripts/bootstrap/tab.js diff --git a/vendor/assets/javascripts/tooltip.js b/vendor/assets/javascripts/bootstrap/tooltip.js similarity index 100% rename from vendor/assets/javascripts/tooltip.js rename to vendor/assets/javascripts/bootstrap/tooltip.js diff --git a/vendor/assets/javascripts/transition.js b/vendor/assets/javascripts/bootstrap/transition.js similarity index 100% rename from vendor/assets/javascripts/transition.js rename to vendor/assets/javascripts/bootstrap/transition.js From 5a8e5096249e95c00b756fbe5d4bae4553dfb348 Mon Sep 17 00:00:00 2001 From: gleb Date: Tue, 28 May 2013 20:04:23 +0200 Subject: [PATCH 4/6] fix js load order --- vendor/assets/javascripts/bootstrap.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vendor/assets/javascripts/bootstrap.js b/vendor/assets/javascripts/bootstrap.js index 7daa4d6f..e97d5c58 100644 --- a/vendor/assets/javascripts/bootstrap.js +++ b/vendor/assets/javascripts/bootstrap.js @@ -5,8 +5,9 @@ //= require bootstrap/collapse //= require bootstrap/dropdown //= require bootstrap/modal -//= require bootstrap/popover //= require bootstrap/scrollspy //= require bootstrap/tab //= require bootstrap/tooltip +// Popover depends on tooltip and must be included after it: +//= require bootstrap/popover //= require bootstrap/transition From 45c302af1a99d3144ccb127700e464cccca434a0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bidegain Date: Fri, 7 Jun 2013 19:53:53 +0200 Subject: [PATCH 5/6] Fix the mixins to correctly create the offset, push and pull classes --- vendor/assets/stylesheets/bootstrap/_mixins.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index e82068f7..74198e21 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -512,15 +512,15 @@ } @mixin col-offset-($columns, $grid-columns) { - width: percentage(($columns / $grid-columns)); + margin-left: percentage(($columns / $grid-columns)); } @mixin col-push-($columns, $grid-columns) { - width: percentage(($columns / $grid-columns)); + left: percentage(($columns / $grid-columns)); } @mixin col-pull-($columns, $grid-columns) { - width: percentage(($columns / $grid-columns)); + right: percentage(($columns / $grid-columns)); } From 6bb419868a6fba5585f63b81224f039fca06deb2 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bidegain Date: Sun, 9 Jun 2013 10:34:05 +0200 Subject: [PATCH 6/6] Fix the import paths in bootstrap.scss --- .../stylesheets/bootstrap/bootstrap.scss | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/vendor/assets/stylesheets/bootstrap/bootstrap.scss b/vendor/assets/stylesheets/bootstrap/bootstrap.scss index 660eb274..3662530e 100644 --- a/vendor/assets/stylesheets/bootstrap/bootstrap.scss +++ b/vendor/assets/stylesheets/bootstrap/bootstrap.scss @@ -9,56 +9,56 @@ */ // Core variables and mixins -@import "bootstrap/variables"; -@import "bootstrap/mixins"; +@import "variables"; +@import "mixins"; // Reset -@import "bootstrap/normalize"; -@import "bootstrap/print"; +@import "normalize"; +@import "print"; // Core CSS -@import "bootstrap/scaffolding"; -@import "bootstrap/type"; -@import "bootstrap/code"; -@import "bootstrap/grid"; +@import "scaffolding"; +@import "type"; +@import "code"; +@import "grid"; -@import "bootstrap/tables"; -@import "bootstrap/forms"; -@import "bootstrap/buttons"; +@import "tables"; +@import "forms"; +@import "buttons"; // Components: common -@import "bootstrap/component-animations"; -@import "bootstrap/glyphicons"; -@import "bootstrap/dropdowns"; -@import "bootstrap/list-group"; -@import "bootstrap/panels"; -@import "bootstrap/wells"; -@import "bootstrap/close"; +@import "component-animations"; +@import "glyphicons"; +@import "dropdowns"; +@import "list-group"; +@import "panels"; +@import "wells"; +@import "close"; // Components: Nav -@import "bootstrap/navs"; -@import "bootstrap/navbar"; -@import "bootstrap/button-groups"; -@import "bootstrap/breadcrumbs"; -@import "bootstrap/pagination"; -@import "bootstrap/pager"; +@import "navs"; +@import "navbar"; +@import "button-groups"; +@import "breadcrumbs"; +@import "pagination"; +@import "pager"; // Components: Popovers -@import "bootstrap/modals"; -@import "bootstrap/tooltip"; -@import "bootstrap/popovers"; +@import "modals"; +@import "tooltip"; +@import "popovers"; // Components: Misc -@import "bootstrap/alerts"; -@import "bootstrap/thumbnails"; -@import "bootstrap/media"; -@import "bootstrap/labels"; -@import "bootstrap/badges"; -@import "bootstrap/progress-bars"; -@import "bootstrap/accordion"; -@import "bootstrap/carousel"; -@import "bootstrap/jumbotron"; +@import "alerts"; +@import "thumbnails"; +@import "media"; +@import "labels"; +@import "badges"; +@import "progress-bars"; +@import "accordion"; +@import "carousel"; +@import "jumbotron"; // Utility classes -@import "bootstrap/utilities"; // Has to be last to override when necessary -@import "bootstrap/responsive-utilities"; +@import "utilities"; // Has to be last to override when necessary +@import "responsive-utilities";