Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'feature/bootstrap-2.3.0' into develop

* feature/bootstrap-2.3.0:
  Upgrade stylesheets to 2.3.0
  Upgrade javascripts to 2.3.0
  • Loading branch information...
commit 85f71dfc101351de2e520abfdf0267838c7df436 2 parents acf5bce + ae68a28
@yabawock authored
Showing with 431 additions and 207 deletions.
  1. +1 −1  vendor/assets/javascripts/twitter/bootstrap/affix.js
  2. +1 −1  vendor/assets/javascripts/twitter/bootstrap/alert.js
  3. +1 −1  vendor/assets/javascripts/twitter/bootstrap/button.js
  4. +31 −9 vendor/assets/javascripts/twitter/bootstrap/carousel.js
  5. +4 −4 vendor/assets/javascripts/twitter/bootstrap/collapse.js
  6. +14 −10 vendor/assets/javascripts/twitter/bootstrap/dropdown.js
  7. +13 −11 vendor/assets/javascripts/twitter/bootstrap/modal.js
  8. +5 −5 vendor/assets/javascripts/twitter/bootstrap/popover.js
  9. +2 −2 vendor/assets/javascripts/twitter/bootstrap/scrollspy.js
  10. +1 −1  vendor/assets/javascripts/twitter/bootstrap/tab.js
  11. +95 −29 vendor/assets/javascripts/twitter/bootstrap/tooltip.js
  12. +1 −1  vendor/assets/javascripts/twitter/bootstrap/transition.js
  13. +16 −4 vendor/assets/javascripts/twitter/bootstrap/typeahead.js
  14. +1 −1  vendor/assets/stylesheets/twitter/bootstrap-no-sprites.css.scss
  15. +1 −1  vendor/assets/stylesheets/twitter/bootstrap.css.scss
  16. +4 −2 vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss
  17. +8 −10 vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss
  18. +34 −7 vendor/assets/stylesheets/twitter/bootstrap/_carousel.scss
  19. +2 −1  vendor/assets/stylesheets/twitter/bootstrap/_close.scss
  20. +16 −12 vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
  21. +5 −2 vendor/assets/stylesheets/twitter/bootstrap/_forms.scss
  22. +4 −2 vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss
  23. +2 −2 vendor/assets/stylesheets/twitter/bootstrap/_media.scss
  24. +17 −1 vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss
  25. +20 −13 vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss
  26. +33 −18 vendor/assets/stylesheets/twitter/bootstrap/_navs.scss
  27. +3 −1 vendor/assets/stylesheets/twitter/bootstrap/_pager.scss
  28. +3 −1 vendor/assets/stylesheets/twitter/bootstrap/_pagination.scss
  29. +5 −1 vendor/assets/stylesheets/twitter/bootstrap/_popovers.scss
  30. +0 −1  vendor/assets/stylesheets/twitter/bootstrap/_reset.scss
  31. +0 −1  vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.scss
  32. +6 −2 vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.scss
  33. +17 −0 vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss
  34. +1 −10 vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss
  35. +2 −1  vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss
  36. +7 −3 vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss
  37. +26 −19 vendor/assets/stylesheets/twitter/bootstrap/_tables.scss
  38. +3 −2 vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.scss
  39. +6 −6 vendor/assets/stylesheets/twitter/bootstrap/_tooltip.scss
  40. +19 −7 vendor/assets/stylesheets/twitter/bootstrap/_type.scss
  41. +1 −1  vendor/assets/stylesheets/twitter/bootstrap/_variables.scss
View
2  vendor/assets/javascripts/twitter/bootstrap/affix.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-affix.js v2.2.2
+ * bootstrap-affix.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#affix
* ==========================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/alert.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-alert.js v2.2.2
+ * bootstrap-alert.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#alerts
* ==========================================================
* Copyright 2012 Twitter, Inc.
View
2  vendor/assets/javascripts/twitter/bootstrap/button.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-button.js v2.2.2
+ * bootstrap-button.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================
* Copyright 2012 Twitter, Inc.
View
40 vendor/assets/javascripts/twitter/bootstrap/carousel.js
@@ -1,5 +1,5 @@
/* ==========================================================
- * bootstrap-carousel.js v2.2.2
+ * bootstrap-carousel.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#carousel
* ==========================================================
* Copyright 2012 Twitter, Inc.
@@ -28,6 +28,7 @@
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))
@@ -38,19 +39,24 @@
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 $active = this.$element.find('.item.active')
- , children = $active.parent().children()
- , activePos = children.index($active)
+ var activeIndex = this.getActiveIndex()
, that = this
- if (pos > (children.length - 1) || pos < 0) return
+ if (pos > (this.$items.length - 1) || pos < 0) return
if (this.sliding) {
return this.$element.one('slid', function () {
@@ -58,11 +64,11 @@
})
}
- if (activePos == pos) {
+ if (activeIndex == pos) {
return this.pause().cycle()
}
- return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
+ return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
}
, pause: function (e) {
@@ -103,10 +109,19 @@
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
@@ -151,7 +166,7 @@
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.cycle()
+ else if (options.interval) data.pause().cycle()
})
}
@@ -174,11 +189,18 @@
/* CAROUSEL DATA-API
* ================= */
- $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
+ $(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()
})
View
8 vendor/assets/javascripts/twitter/bootstrap/collapse.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-collapse.js v2.2.2
+ * bootstrap-collapse.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#collapse
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -52,7 +52,7 @@
, actives
, hasData
- if (this.transitioning) return
+ if (this.transitioning || this.$element.hasClass('in')) return
dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-'))
@@ -72,7 +72,7 @@
, hide: function () {
var dimension
- if (this.transitioning) return
+ if (this.transitioning || !this.$element.hasClass('in')) return
dimension = this.dimension()
this.reset(this.$element[dimension]())
this.transition('removeClass', $.Event('hide'), 'hidden')
@@ -129,7 +129,7 @@
return this.each(function () {
var $this = $(this)
, data = $this.data('collapse')
- , options = typeof option == 'object' && option
+ , 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]()
})
View
24 vendor/assets/javascripts/twitter/bootstrap/dropdown.js
@@ -1,5 +1,5 @@
/* ============================================================
- * bootstrap-dropdown.js v2.2.2
+ * bootstrap-dropdown.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================
* Copyright 2012 Twitter, Inc.
@@ -81,7 +81,10 @@
isActive = $parent.hasClass('open')
- if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
+ 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)
@@ -115,8 +118,9 @@
selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
}
- $parent = $(selector)
- $parent.length || ($parent = $this.parent())
+ $parent = selector && $(selector)
+
+ if (!$parent || !$parent.length) $parent = $this.parent()
return $parent
}
@@ -152,10 +156,10 @@
* =================================== */
$(document)
- .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
- .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
- .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
- .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
- .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+ .on('click.dropdown.data-api', clearMenus)
+ .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+ .on('.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);
+}(window.jQuery);
View
24 vendor/assets/javascripts/twitter/bootstrap/modal.js
@@ -1,5 +1,5 @@
/* =========================================================
- * bootstrap-modal.js v2.2.2
+ * bootstrap-modal.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#modals
* =========================================================
* Copyright 2012 Twitter, Inc.
@@ -60,8 +60,7 @@
that.$element.appendTo(document.body) //don't move modals dom position
}
- that.$element
- .show()
+ that.$element.show()
if (transition) {
that.$element[0].offsetWidth // force reflow
@@ -139,12 +138,13 @@
})
}
- , hideModal: function (that) {
- this.$element
- .hide()
- .trigger('hidden')
-
- this.backdrop()
+ , hideModal: function () {
+ var that = this
+ this.$element.hide()
+ this.backdrop(function () {
+ that.removeBackdrop()
+ that.$element.trigger('hidden')
+ })
}
, removeBackdrop: function () {
@@ -172,6 +172,8 @@
this.$backdrop.addClass('in')
+ if (!callback) return
+
doAnimate ?
this.$backdrop.one($.support.transition.end, callback) :
callback()
@@ -180,8 +182,8 @@
this.$backdrop.removeClass('in')
$.support.transition && this.$element.hasClass('fade')?
- this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
- this.removeBackdrop()
+ this.$backdrop.one($.support.transition.end, callback) :
+ callback()
} else if (callback) {
callback()
View
10 vendor/assets/javascripts/twitter/bootstrap/popover.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-popover.js v2.2.2
+ * bootstrap-popover.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#popovers
* ===========================================================
* Copyright 2012 Twitter, Inc.
@@ -58,8 +58,8 @@
, $e = this.$element
, o = this.options
- content = $e.attr('data-content')
- || (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
+ content = (typeof o.content == 'function' ? o.content.call($e[0]) : o.content)
+ || $e.attr('data-content')
return content
}
@@ -99,7 +99,7 @@
placement: 'right'
, trigger: 'click'
, content: ''
- , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
+ , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
})
@@ -111,4 +111,4 @@
return this
}
-}(window.jQuery);
+}(window.jQuery);
View
4 vendor/assets/javascripts/twitter/bootstrap/scrollspy.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-scrollspy.js v2.2.2
+ * bootstrap-scrollspy.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -59,7 +59,7 @@
, $href = /^#\w/.test(href) && $(href)
return ( $href
&& $href.length
- && [[ $href.position().top + self.$scrollElement.scrollTop(), href ]] ) || null
+ && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
View
2  vendor/assets/javascripts/twitter/bootstrap/tab.js
@@ -1,5 +1,5 @@
/* ========================================================
- * bootstrap-tab.js v2.2.2
+ * bootstrap-tab.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tabs
* ========================================================
* Copyright 2012 Twitter, Inc.
View
124 vendor/assets/javascripts/twitter/bootstrap/tooltip.js
@@ -1,5 +1,5 @@
/* ===========================================================
- * bootstrap-tooltip.js v2.2.2
+ * bootstrap-tooltip.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame
* ===========================================================
@@ -38,19 +38,27 @@
, 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
- if (this.options.trigger == 'click') {
- this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
- } else if (this.options.trigger != 'manual') {
- eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
- eventOut = this.options.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))
+ 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 ?
@@ -59,7 +67,7 @@
}
, getOptions: function (options) {
- options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+ options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
if (options.delay && typeof options.delay == 'number') {
options.delay = {
@@ -97,14 +105,16 @@
, show: function () {
var $tip
- , inside
, 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()
@@ -116,19 +126,18 @@
this.options.placement.call(this, $tip[0], this.$element[0]) :
this.options.placement
- inside = /in/.test(placement)
-
$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
- .insertAfter(this.$element)
- pos = this.getPosition(inside)
+ this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+ pos = this.getPosition()
actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight
- switch (inside ? placement.split(' ')[1] : placement) {
+ switch (placement) {
case 'bottom':
tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
break
@@ -143,11 +152,56 @@
break
}
- $tip
- .offset(tp)
- .addClass(placement)
- .addClass('in')
+ 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 () {
@@ -161,6 +215,10 @@
, hide: function () {
var that = this
, $tip = this.tip()
+ , e = $.Event('hide')
+
+ this.$element.trigger(e)
+ if (e.isDefaultPrevented()) return
$tip.removeClass('in')
@@ -179,13 +237,15 @@
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') || '').removeAttr('title')
+ $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}
@@ -193,11 +253,12 @@
return this.getTitle()
}
- , getPosition: function (inside) {
- return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
- width: this.$element[0].offsetWidth
- , height: this.$element[0].offsetHeight
- })
+ , 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 () {
@@ -215,6 +276,10 @@
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()
@@ -236,8 +301,8 @@
}
, toggle: function (e) {
- var self = $(e.currentTarget)[this.type](this._options).data(this.type)
- self[self.tip().hasClass('in') ? 'hide' : 'show']()
+ var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+ self.tip().hasClass('in') ? self.hide() : self.show()
}
, destroy: function () {
@@ -269,10 +334,11 @@
, placement: 'top'
, selector: false
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
- , trigger: 'hover'
+ , trigger: 'hover focus'
, title: ''
, delay: 0
, html: false
+ , container: false
}
@@ -284,4 +350,4 @@
return this
}
-}(window.jQuery);
+}(window.jQuery);
View
2  vendor/assets/javascripts/twitter/bootstrap/transition.js
@@ -1,5 +1,5 @@
/* ===================================================
- * bootstrap-transition.js v2.2.2
+ * bootstrap-transition.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#transitions
* ===================================================
* Copyright 2012 Twitter, Inc.
View
20 vendor/assets/javascripts/twitter/bootstrap/typeahead.js
@@ -1,5 +1,5 @@
/* =============================================================
- * bootstrap-typeahead.js v2.2.2
+ * bootstrap-typeahead.js v2.3.0
* http://twitter.github.com/bootstrap/javascript.html#typeahead
* =============================================================
* Copyright 2012 Twitter, Inc.
@@ -172,6 +172,7 @@
, 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))
@@ -183,6 +184,7 @@
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) {
@@ -256,22 +258,33 @@
e.preventDefault()
}
+ , focus: function (e) {
+ this.focused = true
+ }
+
, blur: function (e) {
- var that = this
- setTimeout(function () { that.hide() }, 150)
+ 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()
+ }
+
}
@@ -316,7 +329,6 @@
$(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
var $this = $(this)
if ($this.data('typeahead')) return
- e.preventDefault()
$this.typeahead($this.data())
})
View
2  vendor/assets/stylesheets/twitter/bootstrap-no-sprites.css.scss
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.2.2
+ * Bootstrap v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
View
2  vendor/assets/stylesheets/twitter/bootstrap.css.scss
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.2.2
+ * Bootstrap v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
View
6 vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss
@@ -165,8 +165,6 @@
margin-left: 0;
}
// Carets in other button sizes
-.btn-mini .caret,
-.btn-small .caret,
.btn-large .caret {
margin-top: 6px;
}
@@ -175,6 +173,10 @@
border-right-width: 5px;
border-top-width: 5px;
}
+.btn-mini .caret,
+.btn-small .caret {
+ margin-top: 8px;
+}
// Upside down carets for .dropup
.dropup .btn-large .caret {
border-bottom-width: 5px;
View
18 vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss
@@ -25,13 +25,14 @@
@include border-radius($baseBorderRadius);
@include ie7-restore-left-whitespace(); // Give IE7 some love
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
- // Hover state
- &:hover {
+ // Hover/focus state
+ &:hover,
+ &:focus {
color: $grayDark;
text-decoration: none;
background-position: 0 -15px;
- // transition is only when going to hover, otherwise the background
+ // transition is only when going to hover/focus, otherwise the background
// behind the gradient (there for IE<=9 fallback) gets mismatched
@include transition(background-position .1s linear);
}
@@ -140,11 +141,6 @@ input[type="button"] {
// Set the backgrounds
// -------------------------
-.btn {
- // reset here as of 2.0.3 due to Recess property order
- border-color: #c5c5c5;
- border-color: rgba(0,0,0,.15) rgba(0,0,0,.15) rgba(0,0,0,.25);
-}
.btn-primary {
@include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
}
@@ -217,12 +213,14 @@ input[type="submit"].btn {
color: $linkColor;
@include border-radius(0);
}
-.btn-link:hover {
+.btn-link:hover,
+.btn-link:focus {
color: $linkColorHover;
text-decoration: underline;
background-color: transparent;
}
-.btn-link[disabled]:hover {
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
color: $grayDark;
text-decoration: none;
}
View
41 vendor/assets/stylesheets/twitter/bootstrap/_carousel.scss
@@ -22,12 +22,13 @@
display: none;
position: relative;
@include transition(.6s ease-in-out left);
- }
- // Account for jankitude on images
- > .item > img {
- display: block;
- line-height: 1;
+ // Account for jankitude on images
+ > img,
+ > a > img {
+ display: block;
+ line-height: 1;
+ }
}
> .active,
@@ -98,14 +99,40 @@
right: 15px;
}
- // Hover state
- &:hover {
+ // Hover/focus state
+ &:hover,
+ &:focus {
color: $white;
text-decoration: none;
@include opacity(90);
}
}
+// Carousel indicator pips
+// -----------------------------
+.carousel-indicators {
+ position: absolute;
+ top: 15px;
+ right: 15px;
+ z-index: 5;
+ margin: 0;
+ list-style: none;
+
+ li {
+ display: block;
+ float: left;
+ width: 10px;
+ height: 10px;
+ margin-left: 5px;
+ text-indent: -999px;
+ background-color: #ccc;
+ background-color: rgba(255,255,255,.25);
+ border-radius: 5px;
+ }
+ .active {
+ background-color: #fff;
+ }
+}
// Caption for text below images
// -----------------------------
View
3  vendor/assets/stylesheets/twitter/bootstrap/_close.scss
@@ -12,7 +12,8 @@
color: $black;
text-shadow: 0 1px 0 rgba(255,255,255,1);
@include opacity(20);
- &:hover {
+ &:hover,
+ &:focus {
color: $black;
text-decoration: none;
cursor: pointer;
View
28 vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.scss
@@ -72,7 +72,7 @@
}
// Links within the dropdown menu
- li > a {
+ > li > a {
display: block;
padding: 3px 20px;
clear: both;
@@ -83,11 +83,12 @@
}
}
-// Hover state
+// Hover/Focus state
// -----------
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
-.dropdown-submenu:hover > a {
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
text-decoration: none;
color: $dropdownLinkColorHover;
@include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
@@ -95,8 +96,9 @@
// Active state
// ------------
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
color: $dropdownLinkColorActive;
text-decoration: none;
outline: 0;
@@ -105,13 +107,15 @@
// Disabled state
// --------------
-// Gray out text and ensure the hover state remains gray
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
+// Gray out text and ensure the hover/focus state remains gray
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
color: $grayLight;
}
-// Nuke hover effects
-.dropdown-menu .disabled > a:hover {
+// Nuke hover/focus effects
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
background-image: none; // Remove CSS gradient
View
7 vendor/assets/stylesheets/twitter/bootstrap/_forms.scss
@@ -421,7 +421,9 @@ select:focus:invalid {
// Allow us to put symbols and text within the input field for a cleaner look
.input-append,
.input-prepend {
- margin-bottom: 5px;
+ display: inline-block;
+ margin-bottom: $baseLineHeight / 2;
+ vertical-align: middle;
font-size: 0; // white space collapse hack
white-space: nowrap; // Prevent span and input from separating
@@ -429,7 +431,8 @@ select:focus:invalid {
input,
select,
.uneditable-input,
- .dropdown-menu {
+ .dropdown-menu,
+ .popover {
font-size: $baseFontSize;
}
View
6 vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss
@@ -36,10 +36,12 @@
}
}
-// Hover state, but only for links
+// Hover/focus state, but only for links
a {
&.label:hover,
- &.badge:hover {
+ &.label:focus,
+ &.badge:hover,
+ &.badge:focus {
color: $white;
text-decoration: none;
cursor: pointer;
View
4 vendor/assets/stylesheets/twitter/bootstrap/_media.scss
@@ -38,10 +38,10 @@
// Media image alignment
// -------------------------
-.media .pull-left {
+.media > .pull-left {
margin-right: 10px;
}
-.media .pull-right {
+.media > .pull-right {
margin-left: 10px;
}
View
18 vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss
@@ -265,6 +265,12 @@
-o-transition-delay: $transition-delay;
transition-delay: $transition-delay;
}
+@mixin transition-duration($transition-duration) {
+ -webkit-transition-duration: $transition-duration;
+ -moz-transition-duration: $transition-duration;
+ -o-transition-duration: $transition-duration;
+ transition-duration: $transition-duration;
+}
// Transformations
@mixin rotate($degrees) {
@@ -430,6 +436,16 @@
background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
}
+@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
+ background-color: mix($midColor, $endColor, 80%);
+ 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=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) {
background-color: mix($midColor, $endColor, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
@@ -492,7 +508,7 @@
@include reset-filter();
// in these cases the gradient won't cover the background, so we override
- &:hover, &:active, &.active, &.disabled, &[disabled] {
+ &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
color: $textColor;
background-color: $endColor;
*background-color: darken($endColor, 5%);
View
33 vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss
@@ -56,7 +56,8 @@
font-weight: 200;
color: $navbarBrandColor;
text-shadow: 0 1px 0 $navbarBackgroundHighlight;
- &:hover {
+ &:hover,
+ &:focus {
text-decoration: none;
}
}
@@ -73,7 +74,8 @@
// -------------------------
.navbar-link {
color: $navbarLinkColor;
- &:hover {
+ &:hover,
+ &:focus {
color: $navbarLinkColorHover;
}
}
@@ -95,7 +97,9 @@
}
.navbar .btn-group .btn,
.navbar .input-prepend .btn,
-.navbar .input-append .btn {
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
margin-top: 0; // then undo the margin here so we don't accidentally double it
}
@@ -242,12 +246,11 @@
}
.navbar .nav .dropdown-toggle .caret {
margin-top: 8px;
-
}
-// Hover
+// Hover/focus
.navbar .nav > li > a:focus,
.navbar .nav > li > a:hover {
- background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover from .active
+ background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
color: $navbarLinkColorHover;
text-decoration: none;
}
@@ -331,10 +334,11 @@
}
}
-// Caret should match text color on hover
-.navbar .nav li.dropdown > a:hover .caret {
- border-top-color: $navbarLinkColorActive;
- border-bottom-color: $navbarLinkColorActive;
+// Caret should match text color on hover/focus
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+ border-top-color: $navbarLinkColorHover;
+ border-bottom-color: $navbarLinkColorHover;
}
// Remove background color from open dropdown
@@ -393,7 +397,8 @@
.nav > li > a {
color: $navbarInverseLinkColor;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
- &:hover {
+ &:hover,
+ &:focus {
color: $navbarInverseLinkColorHover;
}
}
@@ -422,7 +427,8 @@
// Inline text links
.navbar-link {
color: $navbarInverseLinkColor;
- &:hover {
+ &:hover,
+ &:focus {
color: $navbarInverseLinkColorHover;
}
}
@@ -440,7 +446,8 @@
background-color: $navbarInverseLinkBackgroundActive;
color: $navbarInverseLinkColorActive;
}
- .nav li.dropdown > a:hover .caret {
+ .nav li.dropdown > a:hover .caret,
+ .nav li.dropdown > a:focus .caret {
border-top-color: $navbarInverseLinkColorActive;
border-bottom-color: $navbarInverseLinkColorActive;
}
View
51 vendor/assets/stylesheets/twitter/bootstrap/_navs.scss
@@ -17,7 +17,8 @@
.nav > li > a {
display: block;
}
-.nav > li > a:hover {
+.nav > li > a:hover,
+.nav > li > a:focus {
text-decoration: none;
background-color: $grayLighter;
}
@@ -69,7 +70,8 @@
padding: 3px 15px;
}
.nav-list > .active > a,
-.nav-list > .active > a:hover {
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
color: $white;
text-shadow: 0 -1px 0 rgba(0,0,0,.2);
background-color: $linkColor;
@@ -124,13 +126,15 @@
line-height: $baseLineHeight;
border: 1px solid transparent;
@include border-radius(4px 4px 0 0);
- &:hover {
+ &:hover,
+ &:focus {
border-color: $grayLighter $grayLighter #ddd;
}
}
-// Active state, and it's :hover to override normal :hover
+// Active state, and it's :hover/:focus to override normal :hover/:focus
.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
color: $gray;
background-color: $bodyBackground;
border: 1px solid #ddd;
@@ -187,7 +191,8 @@
@include border-radius(0 0 4px 4px);
@include border-bottom-radius(4px);
}
-.nav-tabs.nav-stacked > li > a:hover {
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
border-color: #ddd;
z-index: 2;
}
@@ -220,7 +225,8 @@
border-bottom-color: $linkColor;
margin-top: 6px;
}
-.nav .dropdown-toggle:hover .caret {
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
border-top-color: $linkColorHover;
border-bottom-color: $linkColorHover;
}
@@ -240,9 +246,10 @@
border-bottom-color: $gray;
}
-// Active:hover dropdown links
+// Active:hover/:focus dropdown links
// -------------------------
-.nav > .dropdown.active > a:hover {
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
cursor: pointer;
}
@@ -250,21 +257,24 @@
// -------------------------
.nav-tabs .open .dropdown-toggle,
.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
color: $white;
background-color: $grayLight;
border-color: $grayLight;
}
.nav li.dropdown.open .caret,
.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret {
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
border-top-color: $white;
border-bottom-color: $white;
@include opacity(100);
}
// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover {
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
border-color: $grayLight;
}
@@ -315,13 +325,15 @@
}
.tabs-below > .nav-tabs > li > a {
@include border-radius(0 0 4px 4px);
- &:hover {
+ &:hover,
+ &:focus {
border-bottom-color: transparent;
border-top-color: #ddd;
}
}
.tabs-below > .nav-tabs .active > a,
-.tabs-below > .nav-tabs .active > a:hover {
+.tabs-below > .nav-tabs .active > a:hover,
+.tabs-below > .nav-tabs .active > a:focus {
border-color: transparent #ddd #ddd #ddd;
}
@@ -350,11 +362,13 @@
margin-right: -1px;
@include border-radius(4px 0 0 4px);
}
-.tabs-left > .nav-tabs > li > a:hover {
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
border-color: $grayLighter #ddd $grayLighter $grayLighter;
}
.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover {
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
border-color: #ddd transparent #ddd #ddd;
*border-right-color: $white;
}
@@ -387,8 +401,9 @@
.nav > .disabled > a {
color: $grayLight;
}
-// Nuke hover effects
-.nav > .disabled > a:hover {
+// Nuke hover/focus effects
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
cursor: default;
View
4 vendor/assets/stylesheets/twitter/bootstrap/_pager.scss
@@ -21,7 +21,8 @@
border: 1px solid #ddd;
@include border-radius(15px);
}
-.pager li > a:hover {
+.pager li > a:hover,
+.pager li > a:focus {
text-decoration: none;
background-color: #f5f5f5;
}
@@ -35,6 +36,7 @@
}
.pager .disabled > a,
.pager .disabled > a:hover,
+.pager .disabled > a:focus,
.pager .disabled > span {
color: $grayLight;
background-color: #fff;
View
4 vendor/assets/stylesheets/twitter/bootstrap/_pagination.scss
@@ -32,6 +32,7 @@
border-left-width: 0;
}
.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: $paginationActiveBackground;
@@ -43,7 +44,8 @@
}
.pagination ul > .disabled > span,
.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover {
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
color: $grayLight;
background-color: transparent;
cursor: default;
View
6 vendor/assets/stylesheets/twitter/bootstrap/_popovers.scss
@@ -10,7 +10,7 @@
left: 0;
z-index: $zindexPopover;
display: none;
- width: 236px;
+ max-width: 276px;
padding: 1px;
text-align: left; // Reset given new insertion method
background-color: $popoverBackground;
@@ -42,6 +42,10 @@
background-color: $popoverTitleBackground;
border-bottom: 1px solid darken($popoverTitleBackground, 5%);
@include border-radius(5px 5px 0 0);
+
+ &:empty {
+ display: none;
+ }
}
.popover-content {
View
1  vendor/assets/stylesheets/twitter/bootstrap/_reset.scss
@@ -214,4 +214,3 @@ textarea {
page-break-after: avoid;
}
}
-
View
1  vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.scss
@@ -75,7 +75,6 @@
margin-left: 0;
}
-
// FORM FIELDS
// -----------
// Make span* classes full width
View
8 vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.scss
@@ -82,7 +82,9 @@
margin-bottom: 2px;
}
.nav-collapse .nav > li > a:hover,
- .nav-collapse .dropdown-menu a:hover {
+ .nav-collapse .nav > li > a:focus,
+ .nav-collapse .dropdown-menu a:hover,
+ .nav-collapse .dropdown-menu a:focus {
background-color: $navbarBackground;
}
.navbar-inverse .nav-collapse .nav > li > a,
@@ -90,7 +92,9 @@
color: $navbarInverseLinkColor;
}
.navbar-inverse .nav-collapse .nav > li > a:hover,
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
background-color: $navbarInverseBackground;
}
// Buttons in the navbar
View
17 vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss
@@ -2,6 +2,14 @@
// RESPONSIVE CLASSES
// ------------------
+
+// IE10 Metro responsive
+// Required for Windows 8 Metro split-screen snapping with IE10
+// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
+@-ms-viewport{
+ width: device-width;
+}
+
// Hide from screenreaders and browsers
// Credit: HTML5 Boilerplate
.hidden {
@@ -40,3 +48,12 @@
// Hide
.hidden-phone { display: none !important; }
}
+
+// Print utilities
+.visible-print { display: none !important; }
+.hidden-print { }
+
+@media print {
+ .visible-print { display: inherit !important; }
+ .hidden-print { display: none !important; }
+}
View
11 vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss
@@ -1,6 +1,6 @@
/* Partial: twitter/bootstrap/_responsive.scss */
/*!
- * Bootstrap Responsive v2.2.2
+ * Bootstrap Responsive v2.3.0
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -15,15 +15,6 @@
// -------------------------------------------------------------
-// IE10 Metro responsive
-// Required for Windows 8 Metro split-screen snapping with IE10
-// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-
-@-ms-viewport{
- width: device-width;
-}
-
-
// REPEAT VARIABLES & MIXINS
// -------------------------
// Required since we compile the responsive stuff separately
View
3  vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss
@@ -25,7 +25,8 @@ a {
color: $linkColor;
text-decoration: none;
}
-a:hover {
+a:hover,
+a:focus {
color: $linkColorHover;
text-decoration: underline;
}
View
10 vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss
@@ -30,7 +30,7 @@
margin-top: 1px;
}
-/* White icons with optional class, or on hover/active states of certain elements */
+/* White icons with optional class, or on hover/focus/active states of certain elements */
.icon-white,
.nav-pills > .active > a > [class^="icon-"],
.nav-pills > .active > a > [class*=" icon-"],
@@ -39,11 +39,15 @@
.navbar-inverse .nav > .active > a > [class^="icon-"],
.navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
.dropdown-menu > .active > a > [class*=" icon-"],
.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
background-image: image-url($iconWhiteSpritePath);
}
@@ -168,7 +172,7 @@
.icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
.icon-retweet { background-position: -336px -120px; }
.icon-shopping-cart { background-position: -360px -120px; }
-.icon-folder-close { background-position: -384px -120px; }
+.icon-folder-close { background-position: -384px -120px; width: 16px; }
.icon-folder-open { background-position: -408px -120px; width: 16px; }
.icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
.icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
View
45 vendor/assets/stylesheets/twitter/bootstrap/_tables.scss
@@ -94,24 +94,32 @@ table {
tbody:first-child tr:first-child td {
border-top: 0;
}
- // For first th or td in the first row in the first thead or tbody
+ // For first th/td in the first row in the first thead or tbody
thead:first-child tr:first-child > th:first-child,
- tbody:first-child tr:first-child > td:first-child {
- @include border-top-left-radius($baseBorderRadius);
+ tbody:first-child tr:first-child > td:first-child,
+ tbody:first-child tr:first-child > th:first-child {
+ @include border-top-left-radius($baseBorderRadius);
}
+ // For last th/td in the first row in the first thead or tbody
thead:first-child tr:first-child > th:last-child,
- tbody:first-child tr:first-child > td:last-child {
- @include border-top-right-radius($baseBorderRadius);
+ tbody:first-child tr:first-child > td:last-child,
+ tbody:first-child tr:first-child > th:last-child {
+ @include border-top-right-radius($baseBorderRadius);
}
- // For first th or td in the last row in the last thead or tbody
+ // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
thead:last-child tr:last-child > th:first-child,
tbody:last-child tr:last-child > td:first-child,
- tfoot:last-child tr:last-child > td:first-child {
+ tbody:last-child tr:last-child > th:first-child,
+ tfoot:last-child tr:last-child > td:first-child,
+ tfoot:last-child tr:last-child > th:first-child {
@include border-bottom-left-radius($baseBorderRadius);
}
+ // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
thead:last-child tr:last-child > th:last-child,
tbody:last-child tr:last-child > td:last-child,
- tfoot:last-child tr:last-child > td:last-child {
+ tbody:last-child tr:last-child > th:last-child,
+ tfoot:last-child tr:last-child > td:last-child,
+ tfoot:last-child tr:last-child > th:last-child {
@include border-bottom-right-radius($baseBorderRadius);
}
@@ -123,7 +131,6 @@ table {
@include border-bottom-right-radius(0);
}
-
// Special fixes to round the left border on the first td/th
caption + thead tr:first-child th:first-child,
caption + tbody tr:first-child td:first-child,
@@ -162,8 +169,8 @@ table {
// Placed here since it has to come after the potential zebra striping
.table-hover {
tbody {
- tr:hover td,
- tr:hover th {
+ tr:hover > td,
+ tr:hover > th {
background-color: $tableBackgroundHover;
}
}
@@ -219,32 +226,32 @@ table th[class*="span"],
// Exact selectors below required to override .table-striped
.table tbody tr {
- &.success td {
+ &.success > td {
background-color: $successBackground;
}
- &.error td {
+ &.error > td {
background-color: $errorBackground;
}
- &.warning td {
+ &.warning > td {
background-color: $warningBackground;
}
- &.info td {
+ &.info > td {
background-color: $infoBackground;
}
}
// Hover states for .table-hover
.table-hover tbody tr {
- &.success:hover td {
+ &.success:hover > td {
background-color: darken($successBackground, 5%);
}
- &.error:hover td {
+ &.error:hover > td {
background-color: darken($errorBackground, 5%);
}
- &.warning:hover td {
+ &.warning:hover > td {
background-color: darken($warningBackground, 5%);
}
- &.info:hover td {
+ &.info:hover > td {
background-color: darken($infoBackground, 5%);
}
}
View
5 vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.scss
@@ -34,8 +34,9 @@
@include box-shadow(0 1px 3px rgba(0,0,0,.055));
@include transition(all .2s ease-in-out);
}
-// Add a hover state for linked versions only
-a.thumbnail:hover {
+// Add a hover/focus state for linked versions only
+a.thumbnail:hover,
+a.thumbnail:focus {
border-color: $linkColor;
@include box-shadow(0 1px 4px rgba(0,105,214,.25));
}
View
12 vendor/assets/stylesheets/twitter/bootstrap/_tooltip.scss
@@ -10,20 +10,20 @@
z-index: $zindexTooltip;
display: block;
visibility: visible;
- padding: 5px;
font-size: 11px;
+ line-height: 1.4;
@include opacity(0);
&.in { @include opacity(80); }
- &.top { margin-top: -3px; }
- &.right { margin-left: 3px; }
- &.bottom { margin-top: 3px; }
- &.left { margin-left: -3px; }
+ &.top { margin-top: -3px; padding: 5px 0; }
+ &.right { margin-left: 3px; padding: 0 5px; }
+ &.bottom { margin-top: 3px; padding: 5px 0; }
+ &.left { margin-left: -3px; padding: 0 5px; }
}
// Wrapper for the tooltip content
.tooltip-inner {
max-width: 200px;
- padding: 3px 8px;
+ padding: 8px;
color: $tooltipColor;
text-align: center;
text-decoration: none;
View
26 vendor/assets/stylesheets/twitter/bootstrap/_type.scss
@@ -30,19 +30,28 @@ cite { font-style: normal; }
// Utility classes
.muted { color: $grayLight; }
-a.muted:hover { color: darken($grayLight, 10%); }
+a.muted:hover,
+a.muted:focus { color: darken($grayLight, 10%); }
.text-warning { color: $warningText; }
-a.text-warning:hover { color: darken($warningText, 10%); }
+a.text-warning:hover,
+a.text-warning:focus { color: darken($warningText, 10%); }
.text-error { color: $errorText; }
-a.text-error:hover { color: darken($errorText, 10%); }
+a.text-error:hover,
+a.text-error:focus { color: darken($errorText, 10%); }
.text-info { color: $infoText; }
-a.text-info:hover { color: darken($infoText, 10%); }
+a.text-info:hover,
+a.text-info:focus { color: darken($infoText, 10%); }
.text-success { color: $successText; }
-a.text-success:hover { color: darken($successText, 10%); }
+a.text-success:hover,
+a.text-success:focus { color: darken($successText, 10%); }
+
+.text-left { text-align: left; }
+.text-right { text-align: right; }
+.text-center { text-align: center; }
// Headings
@@ -118,8 +127,9 @@ ul.inline,
ol.inline {
margin-left: 0;
list-style: none;
- & > li {
+ > li {
display: inline-block;
+ @include ie7-inline-block();
padding-left: 5px;
padding-right: 5px;
}
@@ -184,7 +194,9 @@ blockquote {
border-left: 5px solid $grayLighter;
p {
margin-bottom: 0;
- @include font-shorthand(16px,300,$baseLineHeight * 1.25);
+ font-size: $baseFontSize * 1.25;
+ font-weight: 300;
+ line-height: 1.25;
}
small {
display: block;
View
2  vendor/assets/stylesheets/twitter/bootstrap/_variables.scss
@@ -86,7 +86,7 @@ $tableBorder: #ddd !default; // table and cell border
// -------------------------
$btnBackground: $white !default;
$btnBackgroundHighlight: darken($white, 10%) !default;
-$btnBorder: #bbb !default;
+$btnBorder: #ccc !default;
$btnPrimaryBackground: $linkColor !default;
$btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default;
Please sign in to comment.
Something went wrong with that request. Please try again.