-
+
Third slide label
Praesent commodo cursus magna, vel scelerisque nisl consectetur.
@@ -1663,7 +1718,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
{% highlight html %}
-
+
...
...
@@ -1671,6 +1726,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
{% endhighlight %}
+
+
Accessibility issue
+
The carousel component is generally not compliant with accessibility standards. If you need to be compliant, please consider other options for presenting your content.
+
Usage
@@ -1708,6 +1767,12 @@ $('.carousel').carousel()
"hover"
Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.
+
+ wrap
+ boolean
+ true
+ Whether the carousel should cycle continuously or have hard stops.
+
@@ -1716,7 +1781,7 @@ $('.carousel').carousel()
.carousel(options)
Initializes the carousel with an optional options object and starts cycling through items.
-{% highlight html %}
+{% highlight js %}
$('.carousel').carousel({
interval: 2000
})
@@ -1750,11 +1815,11 @@ $('.carousel').carousel({
- slide
+ slide.bs.carousel
This event fires immediately when the slide instance method is invoked.
- slid
+ slid.bs.carousel
This event is fired when the carousel has completed its slide transition.
diff --git a/js/carousel.js b/js/carousel.js
index d4bcb88b7e..d8c4c243ca 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -41,6 +41,7 @@
Carousel.DEFAULTS = {
interval: 5000
, pause: 'hover'
+ , wrap: true
}
Carousel.prototype.cycle = function (e) {
@@ -105,12 +106,15 @@
var fallback = type == 'next' ? 'first' : 'last'
var that = this
+ if (!$next.length) {
+ if (!this.options.wrap) return
+ $next = this.$element.find('.item')[fallback]()
+ }
+
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
diff --git a/js/collapse.js b/js/collapse.js
index ab575515de..92cc0bc76f 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -48,7 +48,7 @@
this.$element.trigger(startEvent)
if (startEvent.isDefaultPrevented()) return
- var actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+ var actives = this.$parent && this.$parent.find('> .panel > .in')
if (actives && actives.length) {
var hasData = actives.data('bs.collapse')
@@ -169,7 +169,7 @@
var $parent = parent && $(parent)
if (!data || !data.transitioning) {
- if ($parent) $parent.find('[data-toggle=collapse][data-parent=' + parent + ']').not($this).addClass('collapsed')
+ if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed')
$this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
}
diff --git a/js/modal.js b/js/modal.js
index d53cc9eaf1..e0f8b7a0e8 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -29,7 +29,7 @@
this.$backdrop =
this.isShown = null
- if (this.options.remote) this.$element.find('.modal-body').load(this.options.remote)
+ if (this.options.remote) this.$element.load(this.options.remote)
}
Modal.DEFAULTS = {
@@ -38,13 +38,13 @@
, show: true
}
- Modal.prototype.toggle = function () {
- return this[!this.isShown ? 'show' : 'hide']()
+ Modal.prototype.toggle = function (_relatedTarget) {
+ return this[!this.isShown ? 'show' : 'hide'](_relatedTarget)
}
- Modal.prototype.show = function () {
+ Modal.prototype.show = function (_relatedTarget) {
var that = this
- var e = $.Event('show.bs.modal')
+ var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
this.$element.trigger(e)
@@ -73,13 +73,15 @@
that.enforceFocus()
+ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+
transition ?
that.$element
.one($.support.transition.end, function () {
- that.$element.focus().trigger('shown.bs.modal')
+ that.$element.focus().trigger(e)
})
.emulateTransitionEnd(300) :
- that.$element.focus().trigger('shown.bs.modal')
+ that.$element.focus().trigger(e)
})
}
@@ -101,6 +103,7 @@
this.$element
.removeClass('in')
.attr('aria-hidden', true)
+ .off('click.dismiss.modal')
$.support.transition && this.$element.hasClass('fade') ?
this.$element
@@ -153,7 +156,7 @@
this.$backdrop = $('
')
.appendTo(document.body)
- this.$element.on('click', $.proxy(function (e) {
+ this.$element.on('click.dismiss.modal', $.proxy(function (e) {
if (e.target !== e.currentTarget) return
this.options.backdrop == 'static'
? this.$element[0].focus.call(this.$element[0])
@@ -192,15 +195,15 @@
var old = $.fn.modal
- $.fn.modal = function (option) {
+ $.fn.modal = function (option, _relatedTarget) {
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()
+ if (typeof option == 'string') data[option](_relatedTarget)
+ else if (options.show) data.show(_relatedTarget)
})
}
@@ -223,21 +226,19 @@
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())
+ var option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
e.preventDefault()
$target
- .modal(option)
+ .modal(option, this)
.one('hide', function () {
$this.is(':visible') && $this.focus()
})
})
- $(function () {
- var $body = $(document.body)
- .on('shown.bs.modal', '.modal', function () { $body.addClass('modal-open') })
- .on('hidden.bs.modal', '.modal', function () { $body.removeClass('modal-open') })
- })
+ $(document)
+ .on('shown.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
+ .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
}(window.jQuery);
diff --git a/js/popover.js b/js/popover.js
index 4d49792472..ecd37ac233 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -58,13 +58,9 @@
$tip.removeClass('fade top bottom left right in')
- // Hide empty titles
- //
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents.
- if ($tip.find('.popover-title').html() === '') {
- $tip.find('.popover-title').hide();
- }
+ if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
}
Popover.prototype.hasContent = function () {
@@ -81,7 +77,7 @@
o.content)
}
- Popover.prototype.arrow =function () {
+ Popover.prototype.arrow = function () {
return this.$arrow = this.$arrow || this.tip().find('.arrow')
}
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 73799c75dd..11b2cf8383 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -126,4 +126,39 @@ $(function () {
target3.click()
})
+ test("should allow dots in data-parent", function () {
+ $.support.transition = false
+ stop()
+
+ var accordion = $('
')
+ .appendTo($('#qunit-fixture'))
+
+ var target1 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(0))
+
+ var collapsible1 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(0))
+
+ var target2 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(1))
+
+ var collapsible2 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(1))
+
+ var target3 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(2))
+
+ var collapsible3 = $('
')
+ .appendTo(accordion.find('.accordion-group').eq(2))
+ .on('show.bs.collapse', function () {
+ ok(target1.hasClass('collapsed'))
+ ok(target2.hasClass('collapsed'))
+ ok(!target3.hasClass('collapsed'))
+
+ start()
+ })
+
+ target3.click()
+ })
+
})
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 90762ea901..2c610d83d9 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -1,156 +1,177 @@
$(function () {
- module("modal")
+ module("modal")
- test("should provide no conflict", function () {
- var modal = $.fn.modal.noConflict()
- ok(!$.fn.modal, 'modal was set back to undefined (org value)')
- $.fn.modal = modal
- })
+ test("should provide no conflict", function () {
+ var modal = $.fn.modal.noConflict()
+ ok(!$.fn.modal, 'modal was set back to undefined (org value)')
+ $.fn.modal = modal
+ })
- test("should be defined on jquery object", function () {
- var div = $("
")
- ok(div.modal, 'modal method is defined')
- })
+ test("should be defined on jquery object", function () {
+ var div = $("
")
+ ok(div.modal, 'modal method is defined')
+ })
- test("should return element", function () {
- var div = $("
")
- ok(div.modal() == div, 'document.body returned')
- $('#modal-test').remove()
- })
+ test("should return element", function () {
+ var div = $("
")
+ ok(div.modal() == div, 'document.body returned')
+ $('#modal-test').remove()
+ })
- test("should expose defaults var for settings", function () {
- ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
- })
+ test("should expose defaults var for settings", function () {
+ ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed')
+ })
- test("should insert into dom when show method is called", function () {
- stop()
- $.support.transition = false
- $("
")
- .on("shown.bs.modal", function () {
- ok($('#modal-test').length, 'modal inserted into dom')
- $(this).remove()
- start()
- })
- .modal("show")
- })
+ test("should insert into dom when show method is called", function () {
+ stop()
+ $.support.transition = false
+ $("
")
+ .on("shown.bs.modal", function () {
+ ok($('#modal-test').length, 'modal inserted into dom')
+ $(this).remove()
+ start()
+ })
+ .modal("show")
+ })
- test("should fire show event", function () {
- stop()
- $.support.transition = false
- $("
")
- .on("show.bs.modal", function () {
- ok(true, "show was called")
- })
- .on("shown.bs.modal", function () {
- $(this).remove()
- start()
- })
- .modal("show")
- })
+ test("should fire show event", function () {
+ stop()
+ $.support.transition = false
+ $("
")
+ .on("show.bs.modal", function () {
+ ok(true, "show was called")
+ })
+ .on("shown.bs.modal", function () {
+ $(this).remove()
+ start()
+ })
+ .modal("show")
+ })
- test("should not fire shown when default prevented", function () {
- stop()
- $.support.transition = false
- $("
")
- .on("show.bs.modal", function (e) {
- e.preventDefault()
- ok(true, "show was called")
- start()
- })
- .on("shown.bs.modal", function () {
- ok(false, "shown was called")
- })
- .modal("show")
- })
+ test("should not fire shown when default prevented", function () {
+ stop()
+ $.support.transition = false
+ $("
")
+ .on("show.bs.modal", function (e) {
+ e.preventDefault()
+ ok(true, "show was called")
+ start()
+ })
+ .on("shown.bs.modal", function () {
+ ok(false, "shown was called")
+ })
+ .modal("show")
+ })
- test("should hide modal when hide is called", function () {
- stop()
- $.support.transition = false
+ test("should hide modal when hide is called", function () {
+ stop()
+ $.support.transition = false
- $("
")
- .on("shown.bs.modal", function () {
- ok($('#modal-test').is(":visible"), 'modal visible')
- ok($('#modal-test').length, 'modal inserted into dom')
- $(this).modal("hide")
- })
- .on("hidden.bs.modal", function() {
- ok(!$('#modal-test').is(":visible"), 'modal hidden')
- $('#modal-test').remove()
- start()
- })
- .modal("show")
- })
+ $("
")
+ .on("shown.bs.modal", function () {
+ ok($('#modal-test').is(":visible"), 'modal visible')
+ ok($('#modal-test').length, 'modal inserted into dom')
+ $(this).modal("hide")
+ })
+ .on("hidden.bs.modal", function() {
+ ok(!$('#modal-test').is(":visible"), 'modal hidden')
+ $('#modal-test').remove()
+ start()
+ })
+ .modal("show")
+ })
- test("should toggle when toggle is called", function () {
- stop()
- $.support.transition = false
- var div = $("
")
- div
- .on("shown.bs.modal", function () {
- ok($('#modal-test').is(":visible"), 'modal visible')
- ok($('#modal-test').length, 'modal inserted into dom')
- div.modal("toggle")
- })
- .on("hidden.bs.modal", function() {
- ok(!$('#modal-test').is(":visible"), 'modal hidden')
- div.remove()
- start()
- })
- .modal("toggle")
- })
+ test("should toggle when toggle is called", function () {
+ stop()
+ $.support.transition = false
+ var div = $("
")
+ div
+ .on("shown.bs.modal", function () {
+ ok($('#modal-test').is(":visible"), 'modal visible')
+ ok($('#modal-test').length, 'modal inserted into dom')
+ div.modal("toggle")
+ })
+ .on("hidden.bs.modal", function() {
+ ok(!$('#modal-test').is(":visible"), 'modal hidden')
+ div.remove()
+ start()
+ })
+ .modal("toggle")
+ })
- test("should remove from dom when click [data-dismiss=modal]", function () {
- stop()
- $.support.transition = false
- var div = $("
")
- div
- .on("shown.bs.modal", function () {
- ok($('#modal-test').is(":visible"), 'modal visible')
- ok($('#modal-test').length, 'modal inserted into dom')
- div.find('.close').click()
- })
- .on("hidden.bs.modal", function() {
- ok(!$('#modal-test').is(":visible"), 'modal hidden')
- div.remove()
- start()
- })
- .modal("toggle")
- })
+ test("should remove from dom when click [data-dismiss=modal]", function () {
+ stop()
+ $.support.transition = false
+ var div = $("
")
+ div
+ .on("shown.bs.modal", function () {
+ ok($('#modal-test').is(":visible"), 'modal visible')
+ ok($('#modal-test').length, 'modal inserted into dom')
+ div.find('.close').click()
+ })
+ .on("hidden.bs.modal", function() {
+ ok(!$('#modal-test').is(":visible"), 'modal hidden')
+ div.remove()
+ start()
+ })
+ .modal("toggle")
+ })
- test("should allow modal close with 'backdrop:false'", function () {
- stop()
- $.support.transition = false
- var div = $("
", { id: 'modal-test', "data-backdrop": false })
- div
- .on("shown.bs.modal", function () {
- ok($('#modal-test').is(":visible"), 'modal visible')
- div.modal("hide")
- })
- .on("hidden.bs.modal", function() {
- ok(!$('#modal-test').is(":visible"), 'modal hidden')
- div.remove()
- start()
- })
- .modal("show")
- })
+ test("should allow modal close with 'backdrop:false'", function () {
+ stop()
+ $.support.transition = false
+ var div = $("
", { id: 'modal-test', "data-backdrop": false })
+ div
+ .on("shown.bs.modal", function () {
+ ok($('#modal-test').is(":visible"), 'modal visible')
+ div.modal("hide")
+ })
+ .on("hidden.bs.modal", function() {
+ ok(!$('#modal-test').is(":visible"), 'modal hidden')
+ div.remove()
+ start()
+ })
+ .modal("show")
+ })
- test("should close modal when clicking outside of modal-content", function () {
- stop()
- $.support.transition = false
- var div = $("
")
- div
- .bind("shown.bs.modal", function () {
- ok($('#modal-test').length, 'modal insterted into dom')
- $('.contents').click()
- ok($('#modal-test').is(":visible"), 'modal visible')
- $('#modal-test').click()
- })
- .bind("hidden.bs.modal", function() {
- ok(!$('#modal-test').is(":visible"), 'modal hidden')
- div.remove()
- start()
- })
- .modal("show")
- })
+ test("should close modal when clicking outside of modal-content", function () {
+ stop()
+ $.support.transition = false
+ var div = $("
")
+ div
+ .bind("shown.bs.modal", function () {
+ ok($('#modal-test').length, 'modal insterted into dom')
+ $('.contents').click()
+ ok($('#modal-test').is(":visible"), 'modal visible')
+ $('#modal-test').click()
+ })
+ .bind("hidden.bs.modal", function() {
+ ok(!$('#modal-test').is(":visible"), 'modal hidden')
+ div.remove()
+ start()
+ })
+ .modal("show")
+ })
+
+ test("should trigger hide event once when clicking outside of modal-content", function () {
+ stop()
+ $.support.transition = false
+ var div = $("
")
+ var triggered
+ div
+ .bind("shown.bs.modal", function () {
+ triggered = 0
+ $('#modal-test').click()
+ })
+ .one("hidden.bs.modal", function() {
+ div.modal("show")
+ })
+ .bind("hide.bs.modal", function () {
+ triggered += 1
+ ok(triggered === 1, 'modal hide triggered once')
+ start()
+ })
+ .modal("show")
+ })
})
diff --git a/js/tooltip.js b/js/tooltip.js
index 8f2beedce2..e0732a5a9d 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -1,6 +1,6 @@
/* ========================================================================
* Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
+ * http://twbs.github.com/bootstrap/javascript.html#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
* Copyright 2012 Twitter, Inc.
@@ -64,7 +64,7 @@
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(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
}
}
@@ -91,16 +91,20 @@
return options
}
- Tooltip.prototype.enter = function (obj) {
- var defaults = this.getDefaults()
+ Tooltip.prototype.getDelegateOptions = function () {
var options = {}
+ var defaults = this.getDefaults()
this._options && $.each(this._options, function (key, value) {
if (defaults[key] != value) options[key] = value
})
+ return options
+ }
+
+ Tooltip.prototype.enter = function (obj) {
var self = obj instanceof this.constructor ?
- obj : $(obj.currentTarget)[this.type](options).data('bs.' + this.type)
+ obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
clearTimeout(self.timeout)
@@ -114,7 +118,7 @@
Tooltip.prototype.leave = function (obj) {
var self = obj instanceof this.constructor ?
- obj : $(obj.currentTarget)[this.type](this._options).data('bs.' + this.type)
+ obj : $(obj.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type)
clearTimeout(self.timeout)
@@ -179,7 +183,7 @@
.addClass(placement)
}
- var calculatedOffset = this.getCalcuatedOffset(placement, pos, actualWidth, actualHeight)
+ var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement)
this.$element.trigger('shown.bs.' + this.type)
@@ -292,7 +296,7 @@
}, this.$element.offset())
}
- Tooltip.prototype.getCalcuatedOffset = function (placement, pos, actualWidth, actualHeight) {
+ Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
return placement == 'bottom' ? { top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'top' ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
placement == 'left' ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
@@ -339,7 +343,7 @@
}
Tooltip.prototype.toggle = function (e) {
- var self = e ? $(e.currentTarget)[this.type](this._options).data('bs.' + this.type) : this
+ var self = e ? $(e.currentTarget)[this.type](this.getDelegateOptions()).data('bs.' + this.type) : this
self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
}
diff --git a/less/accordion.less b/less/accordion.less
deleted file mode 100644
index c3023ac49e..0000000000
--- a/less/accordion.less
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Accordion
-// --------------------------------------------------
-
-
-// Parent container
-.accordion {
- margin-bottom: @line-height-computed;
-}
-
-// Group == heading + body
-.accordion-group {
- margin-bottom: 2px;
- border: 1px solid @accordion-border-color;
- border-radius: @border-radius-base;
-}
-.accordion-heading {
- border-bottom: 0;
-
- .accordion-toggle {
- display: block;
- padding: 8px 15px;
- cursor: pointer;
- }
-}
-
-// Inner needs the styles because you can't animate properly with any styles on the element
-.accordion-inner {
- padding: 9px 15px;
- border-top: 1px solid @accordion-border-color;
-}
diff --git a/less/alerts.less b/less/alerts.less
index d40519c731..3ba463dba0 100644
--- a/less/alerts.less
+++ b/less/alerts.less
@@ -7,7 +7,7 @@
// -------------------------
.alert {
- padding: @alert-padding (@alert-padding + 20) @alert-padding @alert-padding;
+ padding: @alert-padding;
margin-bottom: @line-height-computed;
color: @alert-text;
background-color: @alert-bg;
@@ -30,14 +30,6 @@
color: darken(@alert-text, 10%);
}
- // Adjust close link position
- .close {
- position: relative;
- top: -2px;
- right: -21px;
- color: inherit;
- }
-
// Improve alignment and spacing of inner content
> p,
> ul {
@@ -48,8 +40,25 @@
}
}
+// Dismissable alerts
+//
+// Expand the right padding and account for the close button's positioning.
+
+.alert-dismissable {
+ padding-right: (@alert-padding + 20);
+
+ // Adjust close link position
+ .close {
+ position: relative;
+ top: -2px;
+ right: -21px;
+ color: inherit;
+ }
+}
+
// Alternate styles
-// -------------------------
+//
+// Generate contextual modifier classes for colorizing the alert.
.alert-success {
.alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);
diff --git a/less/badges.less b/less/badges.less
index a87e556cb7..0b69753eff 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -18,7 +18,7 @@
background-color: @badge-bg;
border-radius: @badge-border-radius;
- // Empty labels/badges collapse
+ // Empty badges collapse automatically (not available in IE8)
&:empty {
display: none;
}
diff --git a/less/bootstrap.less b/less/bootstrap.less
index b7f393d7ad..accfb92e46 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -55,7 +55,6 @@
@import "labels.less";
@import "badges.less";
@import "progress-bars.less";
-@import "accordion.less";
@import "carousel.less";
@import "jumbotron.less";
diff --git a/less/button-groups.less b/less/button-groups.less
index 3ae18e92f5..adaad3f804 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -55,8 +55,13 @@
}
// Prevent double borders when buttons are next to each other
-.btn-group .btn + .btn {
- margin-left: -1px;
+.btn-group {
+ .btn + .btn,
+ .btn + .btn-group,
+ .btn-group + .btn,
+ .btn-group + .btn-group {
+ margin-left: -1px;
+ }
}
// Optional: Group multiple button groups together for a toolbar
@@ -117,6 +122,14 @@
}
+// Sizing
+//
+// Remix the default button sizing classes into new ones for easier manipulation.
+
+.btn-group-xs > .btn { .btn-xs(); }
+.btn-group-sm > .btn { .btn-sm(); }
+.btn-group-lg > .btn { .btn-lg(); }
+
// Split button dropdowns
// ----------------------
@@ -155,26 +168,58 @@
// Vertical button groups
// ----------------------
-.btn-group-vertical > .btn {
- display: block;
- float: none;
- width: 100%;
- max-width: 100%;
- + .btn {
+.btn-group-vertical {
+ > .btn,
+ > .btn-group {
+ display: block;
+ float: none;
+ width: 100%;
+ max-width: 100%;
+ }
+
+ // Clear floats so dropdown menus can be properly placed
+ > .btn-group {
+ .clearfix();
+ > .btn {
+ float: none;
+ }
+ }
+
+ > .btn + .btn,
+ > .btn + .btn-group,
+ > .btn-group + .btn,
+ > .btn-group + .btn-group {
margin-top: -1px;
+ margin-left: 0;
}
}
-.btn-group-vertical .btn {
+
+.btn-group-vertical > .btn {
&:not(:first-child):not(:last-child) {
border-radius: 0;
}
&:first-child:not(:last-child) {
+ border-top-right-radius: @border-radius-base;
.border-bottom-radius(0);
}
&:last-child:not(:first-child) {
+ border-bottom-left-radius: @border-radius-base;
.border-top-radius(0);
}
}
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+ border-radius: 0;
+}
+.btn-group-vertical > .btn-group:first-child {
+ > .btn:last-child,
+ > .dropdown-toggle {
+ .border-bottom-radius(0);
+ }
+}
+.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+ .border-top-radius(0);
+}
+
// Justified button groups
@@ -193,7 +238,7 @@
// Checkbox and radio options
-.btn-group[data-toggle="buttons"] > .btn > input[type="radio"],
-.btn-group[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
display: none;
}
diff --git a/less/buttons.less b/less/buttons.less
index 8dc05e824c..e5c287fd71 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -54,26 +54,26 @@
// --------------------------------------------------
.btn-default {
- .btn-pseudo-states(@btn-default-color; @btn-default-bg; @btn-default-border);
+ .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);
}
.btn-primary {
- .btn-pseudo-states(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
+ .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
}
// Warning appears as orange
.btn-warning {
- .btn-pseudo-states(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
+ .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
}
// Danger and error appear as red
.btn-danger {
- .btn-pseudo-states(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
+ .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
}
// Success appears as green
.btn-success {
- .btn-pseudo-states(@btn-success-color; @btn-success-bg; @btn-success-border);
+ .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
}
// Info appears as blue-green
.btn-info {
- .btn-pseudo-states(@btn-info-color; @btn-info-bg; @btn-info-border);
+ .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
}
@@ -121,17 +121,13 @@
// --------------------------------------------------
.btn-lg {
- padding: @padding-large-vertical @padding-large-horizontal;
- font-size: @font-size-large;
- line-height: @line-height-large; // ensure even-numbered height of button next to large input
- border-radius: @border-radius-large;
+ // line-height: ensure even-numbered height of button next to large input
+ .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
.btn-sm,
.btn-xs {
- padding: @padding-small-vertical @padding-small-horizontal;
- font-size: @font-size-small;
- line-height: @line-height-small; // ensure proper height of button next to small input
- border-radius: @border-radius-small;
+ // line-height: ensure proper height of button next to small input
+ .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
}
.btn-xs {
padding: 3px 5px;
diff --git a/less/carousel.less b/less/carousel.less
index 045cd52f35..d94108de5c 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -81,13 +81,11 @@
// Set gradients for backgrounds
&.left {
#gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));
- background-color: transparent;
}
&.right {
left: auto;
right: 0;
#gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));
- background-color: transparent;
}
// Hover/focus state
@@ -99,7 +97,6 @@
}
// Toggles
- .glyphicon,
.icon-prev,
.icon-next {
position: absolute;
@@ -113,7 +110,7 @@
margin-left: -10px;
font-family: serif;
}
- // Non-glyphicon toggles
+
.icon-prev {
&:before {
content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
@@ -184,7 +181,6 @@
@media screen and (min-width: @screen-tablet) {
// Scale up the controls a smidge
- .carousel-control .glyphicon,
.carousel-control .icon-prev,
.carousel-control .icon-next {
width: 30px;
diff --git a/less/code.less b/less/code.less
index cd6132560a..d6661d2b9f 100644
--- a/less/code.less
+++ b/less/code.less
@@ -16,7 +16,7 @@ code {
color: @code-color;
background-color: @code-bg;
white-space: nowrap;
- border-radius: 4px;
+ border-radius: @border-radius-base;
}
// Blocks of code
@@ -28,7 +28,7 @@ pre {
line-height: @line-height-base;
word-break: break-all;
word-wrap: break-word;
- color: @gray-dark;
+ color: @pre-color;
background-color: @pre-bg;
border: 1px solid @pre-border-color;
border-radius: @border-radius-base;
@@ -41,6 +41,7 @@ pre {
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
+ font-size: inherit;
color: inherit;
white-space: pre-wrap;
background-color: transparent;
@@ -50,6 +51,6 @@ pre {
// Enable scrollable blocks of code
.pre-scrollable {
- max-height: 340px;
+ max-height: @pre-scrollable-max-height;
overflow-y: scroll;
}
diff --git a/less/dropdowns.less b/less/dropdowns.less
index 675300de54..99cf7d00df 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -4,7 +4,6 @@
// Dropdown arrow/caret
-// --------------------
.caret {
display: inline-block;
width: 0;
@@ -18,13 +17,16 @@
}
// The dropdown wrapper (div)
-// --------------------------
.dropdown {
position: relative;
}
+// Prevent the focus on the dropdown toggle when closing dropdowns
+.dropdown-toggle:focus {
+ outline: 0;
+}
+
// The dropdown menu (ul)
-// ----------------------
.dropdown-menu {
position: absolute;
top: 100%;
@@ -36,12 +38,13 @@
padding: 5px 0;
margin: 2px 0 0; // override default ul
list-style: none;
+ font-size: @font-size-base;
background-color: @dropdown-bg;
border: 1px solid @dropdown-fallback-border; // IE8 fallback
border: 1px solid @dropdown-border;
border-radius: @border-radius-base;
.box-shadow(0 6px 12px rgba(0,0,0,.175));
- .background-clip(padding-box);
+ background-clip: padding-box;
// Aligns the dropdown menu to right
&.pull-right {
@@ -67,18 +70,17 @@
}
// Hover/Focus state
-// -----------
.dropdown-menu > li > a {
&:hover,
&:focus {
text-decoration: none;
color: @dropdown-link-hover-color;
#gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));
+ background-color: darken(@dropdown-link-hover-bg, 5%);
}
}
// Active state
-// ------------
.dropdown-menu > .active > a {
&,
&:hover,
@@ -87,17 +89,19 @@
text-decoration: none;
outline: 0;
#gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));
+ background-color: darken(@dropdown-link-active-bg, 5%);
}
}
// Disabled state
-// --------------
+//
// Gray out text and ensure the hover/focus state remains gray
+
.dropdown-menu > .disabled > a {
&,
&:hover,
&:focus {
- color: @gray-light;
+ color: @dropdown-link-disabled-color;
}
}
// Nuke hover/focus effects
@@ -113,7 +117,6 @@
}
// Open state for the dropdown
-// ---------------------------
.open {
// Show the menu
> .dropdown-menu {
@@ -127,19 +130,15 @@
}
// Dropdown section headers
-// ---------------------------
.dropdown-header {
display: block;
padding: 3px 20px;
font-size: @font-size-small;
line-height: @line-height-base;
- color: @gray-light;
+ color: @dropdown-header-color;
}
-
-
// Backdrop to catch body clicks on mobile, etc.
-// ---------------------------
.dropdown-backdrop {
position: fixed;
left: 0;
@@ -150,16 +149,16 @@
}
// Right aligned dropdowns
-// ---------------------------
.pull-right > .dropdown-menu {
right: 0;
left: auto;
}
// Allow for dropdowns to go bottom up (aka, dropup-menu)
-// ------------------------------------------------------
+//
// Just add .dropup after the standard .dropdown class and you're set, bro.
// TODO: abstract this so that the navbar fixed styles are not placed here?
+
.dropup,
.navbar-fixed-bottom .dropdown {
// Reverse the caret
diff --git a/less/forms.less b/less/forms.less
index d0211eb149..a8847be2b1 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -20,7 +20,7 @@ legend {
margin-bottom: @line-height-computed;
font-size: (@font-size-base * 1.5);
line-height: inherit;
- color: @gray-dark;
+ color: @legend-color;
border: 0;
border-bottom: 1px solid @legend-border-color;
}
@@ -121,7 +121,7 @@ input[type="number"] {
padding: @padding-base-vertical @padding-base-horizontal;
font-size: @font-size-base;
line-height: @line-height-base;
- color: @gray;
+ color: @input-color;
vertical-align: middle;
background-color: @input-bg;
border: 1px solid @input-border;
@@ -208,43 +208,13 @@ input[type="number"] {
}
-
// Form control sizing
-//
-// Relative text size, padding, and border-radii changes for form controls. For
-// horizontal sizing, wrap controls in the predefined grid classes. `
`
-// element gets special love because it's special, and that's a fact!
+.input-sm {
+ .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
+}
.input-lg {
- height: @input-height-large;
- padding: @padding-large-vertical @padding-large-horizontal;
- font-size: @font-size-large;
- line-height: @line-height-large;
- border-radius: @border-radius-large;
-}
-.input-sm {
- height: @input-height-small;
- padding: @padding-small-vertical @padding-small-horizontal;
- font-size: @font-size-small;
- line-height: @line-height-small;
- border-radius: @border-radius-small;
-}
-
-select {
- &.input-lg {
- height: @input-height-large;
- line-height: @input-height-large;
- }
- &.input-sm {
- height: @input-height-small;
- line-height: @input-height-small;
- }
-}
-textarea {
- &.input-lg,
- &.input-sm {
- height: auto;
- }
+ .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
}
@@ -293,28 +263,46 @@ textarea {
// Inline forms
//
-// Make forms appear inline(-block).
+// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
+// forms begin stacked on extra small (mobile) devices and then go inline when
+// viewports reach <768px.
+//
+// Requires wrapping inputs and labels with `.form-group` for proper display of
+// default HTML form controls and our custom form controls (e.g., input groups).
+//
+// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
.form-inline {
- .form-control,
- .radio,
- .checkbox {
- display: inline-block;
- }
- // Remove default margin on radios/checkboxes that were used for stacking, and
- // then undo the floating of radios and checkboxes to match (which also avoids
- // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
- .radio,
- .checkbox {
- margin-top: 0;
- margin-bottom: 0;
- padding-left: 0;
- }
- .radio input[type="radio"],
- .checkbox input[type="checkbox"] {
- float: none;
- margin-left: 0;
+ // Kick in the inline
+ @media (min-width: @screen-tablet) {
+ // Inline-block all the things for "inline"
+ .form-group {
+ display: inline-block;
+ margin-bottom: 0;
+ vertical-align: middle;
+ }
+
+ // In navbar-form, allow folks to *not* use `.form-group`
+ .form-control {
+ display: inline-block;
+ }
+
+ // Remove default margin on radios/checkboxes that were used for stacking, and
+ // then undo the floating of radios and checkboxes to match (which also avoids
+ // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
+ .radio,
+ .checkbox {
+ display: inline-block;
+ margin-top: 0;
+ margin-bottom: 0;
+ padding-left: 0;
+ }
+ .radio input[type="radio"],
+ .checkbox input[type="checkbox"] {
+ float: none;
+ margin-left: 0;
+ }
}
}
diff --git a/less/grid.less b/less/grid.less
index 5142feb654..c51aab9c7c 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -2,6 +2,7 @@
// Grid system
// --------------------------------------------------
+
// Set the container width, and override it for fixed navbars in media queries
.container {
.container-fixed();
@@ -13,18 +14,18 @@
}
// Common styles for small and large grid columns
-.col-1,
-.col-2,
-.col-3,
-.col-4,
-.col-5,
-.col-6,
-.col-7,
-.col-8,
-.col-9,
-.col-10,
-.col-11,
-.col-12,
+.col-xs-1,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9,
+.col-xs-10,
+.col-xs-11,
+.col-xs-12,
.col-sm-1,
.col-sm-2,
.col-sm-3,
@@ -37,6 +38,18 @@
.col-sm-10,
.col-sm-11,
.col-sm-12,
+.col-md-1,
+.col-md-2,
+.col-md-3,
+.col-md-4,
+.col-md-5,
+.col-md-6,
+.col-md-7,
+.col-md-8,
+.col-md-9,
+.col-md-10,
+.col-md-11,
+.col-md-12,
.col-lg-1,
.col-lg-2,
.col-lg-3,
@@ -58,41 +71,50 @@
}
-
+// Extra small grid
//
-// Container and grid column sizing
+// Grid classes for extra small devices like smartphones. No offset, push, or
+// pull classes are present here due to the size of the target.
//
+// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since
+// it's full-width.
-// Extra small device columns (smartphones)
-.col-1,
-.col-2,
-.col-3,
-.col-4,
-.col-5,
-.col-6,
-.col-7,
-.col-8,
-.col-9,
-.col-10,
-.col-11,
-.col-12 {
+.col-xs-1,
+.col-xs-2,
+.col-xs-3,
+.col-xs-4,
+.col-xs-5,
+.col-xs-6,
+.col-xs-7,
+.col-xs-8,
+.col-xs-9,
+.col-xs-10,
+.col-xs-11 {
float: left;
}
-.col-1 { width: percentage((1 / @grid-columns)); }
-.col-2 { width: percentage((2 / @grid-columns)); }
-.col-3 { width: percentage((3 / @grid-columns)); }
-.col-4 { width: percentage((4 / @grid-columns)); }
-.col-5 { width: percentage((5 / @grid-columns)); }
-.col-6 { width: percentage((6 / @grid-columns)); }
-.col-7 { width: percentage((7 / @grid-columns)); }
-.col-8 { width: percentage((8 / @grid-columns)); }
-.col-9 { width: percentage((9 / @grid-columns)); }
-.col-10 { width: percentage((10/ @grid-columns)); }
-.col-11 { width: percentage((11/ @grid-columns)); }
-.col-12 { width: 100%; }
+.col-xs-1 { width: percentage((1 / @grid-columns)); }
+.col-xs-2 { width: percentage((2 / @grid-columns)); }
+.col-xs-3 { width: percentage((3 / @grid-columns)); }
+.col-xs-4 { width: percentage((4 / @grid-columns)); }
+.col-xs-5 { width: percentage((5 / @grid-columns)); }
+.col-xs-6 { width: percentage((6 / @grid-columns)); }
+.col-xs-7 { width: percentage((7 / @grid-columns)); }
+.col-xs-8 { width: percentage((8 / @grid-columns)); }
+.col-xs-9 { width: percentage((9 / @grid-columns)); }
+.col-xs-10 { width: percentage((10/ @grid-columns)); }
+.col-xs-11 { width: percentage((11/ @grid-columns)); }
+.col-xs-12 { width: 100%; }
-// Small device columns (phones to tablets)
-@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+
+// Small grid
+//
+// Columns, offsets, pushes, and pulls for the small device range, from phones
+// to tablets.
+//
+// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
+// it's full-width.
+
+@media (min-width: @screen-tablet) {
.container {
max-width: @container-tablet;
}
@@ -107,8 +129,7 @@
.col-sm-8,
.col-sm-9,
.col-sm-10,
- .col-sm-11,
- .col-sm-12 {
+ .col-sm-11 {
float: left;
}
.col-sm-1 { width: percentage((1 / @grid-columns)); }
@@ -163,11 +184,96 @@
.col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); }
}
-// Medium and large device columns (desktop and up)
+
+// Medium grid
+//
+// Columns, offsets, pushes, and pulls for the desktop device range.
+//
+// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
+// it's full-width.
+
@media (min-width: @screen-desktop) {
.container {
max-width: @container-desktop;
}
+ .col-md-1,
+ .col-md-2,
+ .col-md-3,
+ .col-md-4,
+ .col-md-5,
+ .col-md-6,
+ .col-md-7,
+ .col-md-8,
+ .col-md-9,
+ .col-md-10,
+ .col-md-11 {
+ float: left;
+ }
+ .col-md-1 { width: percentage((1 / @grid-columns)); }
+ .col-md-2 { width: percentage((2 / @grid-columns)); }
+ .col-md-3 { width: percentage((3 / @grid-columns)); }
+ .col-md-4 { width: percentage((4 / @grid-columns)); }
+ .col-md-5 { width: percentage((5 / @grid-columns)); }
+ .col-md-6 { width: percentage((6 / @grid-columns)); }
+ .col-md-7 { width: percentage((7 / @grid-columns)); }
+ .col-md-8 { width: percentage((8 / @grid-columns)); }
+ .col-md-9 { width: percentage((9 / @grid-columns)); }
+ .col-md-10 { width: percentage((10/ @grid-columns)); }
+ .col-md-11 { width: percentage((11/ @grid-columns)); }
+ .col-md-12 { width: 100%; }
+
+ // Push and pull columns for source order changes
+ .col-md-push-1 { left: percentage((1 / @grid-columns)); }
+ .col-md-push-2 { left: percentage((2 / @grid-columns)); }
+ .col-md-push-3 { left: percentage((3 / @grid-columns)); }
+ .col-md-push-4 { left: percentage((4 / @grid-columns)); }
+ .col-md-push-5 { left: percentage((5 / @grid-columns)); }
+ .col-md-push-6 { left: percentage((6 / @grid-columns)); }
+ .col-md-push-7 { left: percentage((7 / @grid-columns)); }
+ .col-md-push-8 { left: percentage((8 / @grid-columns)); }
+ .col-md-push-9 { left: percentage((9 / @grid-columns)); }
+ .col-md-push-10 { left: percentage((10/ @grid-columns)); }
+ .col-md-push-11 { left: percentage((11/ @grid-columns)); }
+
+ .col-md-pull-1 { right: percentage((1 / @grid-columns)); }
+ .col-md-pull-2 { right: percentage((2 / @grid-columns)); }
+ .col-md-pull-3 { right: percentage((3 / @grid-columns)); }
+ .col-md-pull-4 { right: percentage((4 / @grid-columns)); }
+ .col-md-pull-5 { right: percentage((5 / @grid-columns)); }
+ .col-md-pull-6 { right: percentage((6 / @grid-columns)); }
+ .col-md-pull-7 { right: percentage((7 / @grid-columns)); }
+ .col-md-pull-8 { right: percentage((8 / @grid-columns)); }
+ .col-md-pull-9 { right: percentage((9 / @grid-columns)); }
+ .col-md-pull-10 { right: percentage((10/ @grid-columns)); }
+ .col-md-pull-11 { right: percentage((11/ @grid-columns)); }
+
+ // Offsets
+ .col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); }
+ .col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); }
+ .col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); }
+ .col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); }
+ .col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); }
+ .col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); }
+ .col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); }
+ .col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); }
+ .col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); }
+ .col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); }
+ .col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+}
+
+
+// Large grid
+//
+// Columns, offsets, pushes, and pulls for the large desktop device range.
+//
+// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
+// it's full-width.
+
+@media (min-width: @screen-large-desktop) {
+ .container {
+ max-width: @container-large-desktop;
+ }
+
.col-lg-1,
.col-lg-2,
.col-lg-3,
@@ -178,8 +284,7 @@
.col-lg-8,
.col-lg-9,
.col-lg-10,
- .col-lg-11,
- .col-lg-12 {
+ .col-lg-11 {
float: left;
}
.col-lg-1 { width: percentage((1 / @grid-columns)); }
@@ -233,10 +338,3 @@
.col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); }
}
-
-// Large desktops and up
-@media (min-width: @screen-large-desktop) {
- .container {
- max-width: @container-large-desktop;
- }
-}
diff --git a/less/input-groups.less b/less/input-groups.less
index 56c6cb62c8..153b229574 100644
--- a/less/input-groups.less
+++ b/less/input-groups.less
@@ -22,6 +22,19 @@
}
}
+// Sizing options
+//
+// Remix the default form control sizing classes into new ones for easier
+// manipulation.
+
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn { .input-lg(); }
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn { .input-sm(); }
+
+
// Display as table-cell
// -------------------------
.input-group-addon,
@@ -49,7 +62,7 @@
font-weight: normal;
line-height: 1;
text-align: center;
- background-color: @gray-lighter;
+ background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
border-radius: @border-radius-base;
diff --git a/less/labels.less b/less/labels.less
index eee76d2975..941d27f304 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -6,7 +6,7 @@
display: inline;
padding: .25em .6em;
font-size: 75%;
- font-weight: 500;
+ font-weight: bold;
line-height: 1;
color: @label-color;
text-align: center;
@@ -23,6 +23,11 @@
cursor: pointer;
}
}
+
+ // Empty labels collapse automatically (not available in IE8)
+ &:empty {
+ display: none;
+ }
}
// Colors
diff --git a/less/list-group.less b/less/list-group.less
index c0eb5f75ad..46cda4085c 100644
--- a/less/list-group.less
+++ b/less/list-group.less
@@ -17,7 +17,7 @@
.list-group-item {
position: relative;
display: block;
- padding: 10px 30px 10px 15px;
+ padding: 10px 15px;
// Place the border on the list items and negative margin up for better styling
margin-bottom: -1px;
background-color: @list-group-bg;
@@ -25,54 +25,41 @@
// Round the first and last items
&:first-child {
- .border-top-radius(@border-radius-base);
+ .border-top-radius(@list-group-border-radius);
}
&:last-child {
margin-bottom: 0;
- .border-bottom-radius(@border-radius-base);
+ .border-bottom-radius(@list-group-border-radius);
}
// Align badges within list items
> .badge {
float: right;
- margin-right: -15px;
}
-}
-
-// Custom content options
-// -------------------------
-
-.list-group-item-heading {
- margin-top: 0;
- margin-bottom: 5px;
-}
-.list-group-item-text {
- margin-bottom: 0;
- line-height: 1.3;
-}
-
-// Linked list items
-// -------------------------
-
-// Custom content within linked items
-a.list-group-item {
- // Colorize content accordingly
- .list-group-item-heading {
- color: @list-group-link-heading-color;
+ > .badge + .badge {
+ margin-right: 5px;
}
- .list-group-item-text {
+
+ // Linked list items
+ a& {
color: @list-group-link-color;
- }
- // Hover state
- &:hover,
- &:focus {
- text-decoration: none;
- background-color: @list-group-hover-bg;
+ .list-group-item-heading {
+ color: @list-group-link-heading-color;
+ }
+
+ // Hover state
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ background-color: @list-group-hover-bg;
+ }
}
// Active class on item itself, not parent
- &.active {
+ &.active,
+ &.active:hover,
+ &.active:focus {
z-index: 2; // Place active items above their siblings for proper border styling
color: @list-group-active-color;
background-color: @list-group-active-bg;
@@ -87,3 +74,15 @@ a.list-group-item {
}
}
}
+
+// Custom content options
+// -------------------------
+
+.list-group-item-heading {
+ margin-top: 0;
+ margin-bottom: 5px;
+}
+.list-group-item-text {
+ margin-bottom: 0;
+ line-height: 1.3;
+}
diff --git a/less/mixins.less b/less/mixins.less
index b316195215..701ed2cc36 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -163,16 +163,6 @@
backface-visibility: @visibility;
}
-// Background clipping
-.background-clip(@clip) {
- background-clip: @clip;
-}
-
-// Background sizing
-.background-size(@size) {
- background-size: @size;
-}
-
// Box sizing
.box-sizing(@boxmodel) {
-webkit-box-sizing: @boxmodel;
@@ -236,7 +226,6 @@
// Creates two color stops, start and end, by specifying a color and position for each color stop.
// Color stops are not available in IE9 and below.
.horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
- background-color: @end-color;
background-image: -webkit-gradient(linear, @start-percent top, @end-percent top, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1+, Chrome 10+
background-image: -moz-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
@@ -250,7 +239,6 @@
// Creates two color stops, start and end, by specifying a color and position for each color stop.
// Color stops are not available in IE9 and below.
.vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
- background-color: @end-color;
background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
background-image: -webkit-linear-gradient(top, @start-color, @start-percent, @end-color, @end-percent); // Safari 5.1+, Chrome 10+
background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
@@ -260,14 +248,12 @@
}
.directional(@start-color: #555; @end-color: #333; @deg: 45deg) {
- background-color: @end-color;
background-repeat: repeat-x;
background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1+, Chrome 10+
background-image: -moz-linear-gradient(@deg, @start-color, @end-color); // FF 3.6+
background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10
}
.horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
- background-color: mix(@mid-color, @end-color, 80%);
background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
background-image: -moz-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);
@@ -275,9 +261,7 @@
background-repeat: no-repeat;
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
}
-
.vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {
- background-color: mix(@mid-color, @end-color, 80%);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@start-color), color-stop(@color-stop, @mid-color), to(@end-color));
background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);
background-image: -moz-linear-gradient(top, @start-color, @mid-color @color-stop, @end-color);
@@ -286,7 +270,6 @@
filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback
}
.radial(@inner-color: #555; @outer-color: #333) {
- background-color: @outer-color;
background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@inner-color), to(@outer-color));
background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);
background-image: -moz-radial-gradient(circle, @inner-color, @outer-color);
@@ -294,7 +277,6 @@
background-repeat: no-repeat;
}
.striped(@color: #555; @angle: 45deg) {
- background-color: @color;
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);
@@ -345,6 +327,25 @@
background-color: @color;
}
+// Panels
+// -------------------------
+.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
+ border-color: @border;
+ .panel-heading {
+ color: @heading-text-color;
+ background-color: @heading-bg-color;
+ border-color: @heading-border;
+ + .panel-collapse .panel-body {
+ border-top-color: @border;
+ }
+ }
+ .panel-footer {
+ + .panel-collapse .panel-body {
+ border-bottom-color: @border;
+ }
+ }
+}
+
// Alerts
// -------------------------
.alert-variant(@background; @border; @text-color) {
@@ -359,11 +360,11 @@
}
}
-// Button pseudo states
+// Button variants
// -------------------------
// Easily pump out default styles, as well as :hover, :focus, :active,
// and disabled options for all buttons
-.btn-pseudo-states(@color; @background; @border) {
+.button-variant(@color; @background; @border) {
color: @color;
background-color: @background;
border-color: @border;
@@ -391,6 +392,39 @@
}
}
+// Button sizes
+// -------------------------
+.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
+ padding: @padding-vertical @padding-horizontal;
+ font-size: @font-size;
+ line-height: @line-height;
+ border-radius: @border-radius;
+}
+
+// Pagination
+// -------------------------
+.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {
+ > li {
+ > a,
+ > span {
+ padding: @padding-vertical @padding-horizontal;
+ font-size: @font-size;
+ }
+ &:first-child {
+ > a,
+ > span {
+ .border-left-radius(@border-radius);
+ }
+ }
+ &:last-child {
+ > a,
+ > span {
+ .border-right-radius(@border-radius);
+ }
+ }
+ }
+}
+
// Labels
// -------------------------
.label-variant(@color) {
@@ -449,65 +483,34 @@
}
// Creates a wrapper for a series of columns
-.make-row() {
+.make-row(@gutter: @grid-gutter-width) {
// Then clear the floated columns
.clearfix();
- @media (min-width: @screen-small) {
- margin-left: (@grid-gutter-width / -2);
- margin-right: (@grid-gutter-width / -2);
+ .container & {
+ @media (min-width: @screen-small) {
+ margin-left: (@gutter / -2);
+ margin-right: (@gutter / -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);
+ margin-left: (@gutter / -2);
+ margin-right: (@gutter / -2);
}
}
-// Generate the columns
-.make-column(@columns) {
- position: relative;
- // Prevent columns from collapsing when empty
- min-height: 1px;
- // Inner gutter via padding
- padding-left: (@grid-gutter-width / 2);
- padding-right: (@grid-gutter-width / 2);
-
- // Calculate width based on number of columns available
- @media (min-width: @grid-float-breakpoint) {
- float: left;
- width: percentage((@columns / @grid-columns));
- }
-}
-
-// Generate the column offsets
-.make-column-offset(@columns) {
- @media (min-width: @grid-float-breakpoint) {
- margin-left: percentage((@columns / @grid-columns));
- }
-}
-.make-column-push(@columns) {
- @media (min-width: @grid-float-breakpoint) {
- left: percentage((@columns / @grid-columns));
- }
-}
-.make-column-pull(@columns) {
- @media (min-width: @grid-float-breakpoint) {
- right: percentage((@columns / @grid-columns));
- }
-}
-
-// Generate the small columns
-.make-small-column(@columns) {
+// Generate the extra small columns
+.make-xs-column(@columns; @gutter: @grid-gutter-width) {
position: relative;
float: left;
// Prevent columns from collapsing when empty
min-height: 1px;
// Inner gutter via padding
- padding-left: (@grid-gutter-width / 2);
- padding-right: (@grid-gutter-width / 2);
- @max-width: (@grid-float-breakpoint - 1);
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+ @max-width: (@screen-small - 1);
// Calculate width based on number of columns available
@media (max-width: @max-width) {
@@ -515,6 +518,105 @@
}
}
+// Generate the small columns
+.make-sm-column(@columns; @gutter: @grid-gutter-width) {
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+
+ // Calculate width based on number of columns available
+ @media (min-width: @screen-small) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+// Generate the small column offsets
+.make-sm-column-offset(@columns) {
+ @media (min-width: @screen-small) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+.make-sm-column-push(@columns) {
+ @media (min-width: @screen-small) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+.make-sm-column-pull(@columns) {
+ @media (min-width: @screen-small) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
+
+// Generate the medium columns
+.make-md-column(@columns; @gutter: @grid-gutter-width) {
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+
+ // Calculate width based on number of columns available
+ @media (min-width: @screen-medium) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+// Generate the large column offsets
+.make-md-column-offset(@columns) {
+ @media (min-width: @screen-medium) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+.make-md-column-push(@columns) {
+ @media (min-width: @screen-medium) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+.make-md-column-pull(@columns) {
+ @media (min-width: @screen-medium) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
+
+// Generate the large columns
+.make-lg-column(@columns; @gutter: @grid-gutter-width) {
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@gutter / 2);
+ padding-right: (@gutter / 2);
+
+ // Calculate width based on number of columns available
+ @media (min-width: @screen-large) {
+ float: left;
+ width: percentage((@columns / @grid-columns));
+ }
+}
+
+// Generate the large column offsets
+.make-lg-column-offset(@columns) {
+ @media (min-width: @screen-large) {
+ margin-left: percentage((@columns / @grid-columns));
+ }
+}
+.make-lg-column-push(@columns) {
+ @media (min-width: @screen-large) {
+ left: percentage((@columns / @grid-columns));
+ }
+}
+.make-lg-column-pull(@columns) {
+ @media (min-width: @screen-large) {
+ right: percentage((@columns / @grid-columns));
+ }
+}
+
// Form validation states
//
@@ -566,3 +668,26 @@
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}");
}
}
+
+// Form control sizing
+//
+// Relative text size, padding, and border-radii changes for form controls. For
+// horizontal sizing, wrap controls in the predefined grid classes. ``
+// element gets special love because it's special, and that's a fact!
+
+.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {
+ height: @input-height;
+ padding: @padding-vertical @padding-horizontal;
+ font-size: @font-size;
+ line-height: @line-height;
+ border-radius: @border-radius;
+
+ select& {
+ height: @input-height;
+ line-height: @input-height;
+ }
+
+ textarea& {
+ height: auto;
+ }
+}
diff --git a/less/modals.less b/less/modals.less
index 2e574535e5..b43ecfd972 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -49,7 +49,7 @@
border: 1px solid @modal-content-border-color;
border-radius: @border-radius-large;
.box-shadow(0 3px 9px rgba(0,0,0,.5));
- .background-clip(padding-box);
+ background-clip: padding-box;
// Remove focus outline from opened modal
outline: none;
}
diff --git a/less/navbar.less b/less/navbar.less
index 2efc3545bd..8466952124 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -2,34 +2,186 @@
// Navbars
// --------------------------------------------------
+
// Wrapper and base class
+//
+// Provide a static navbar from which we expand to create full-width, fixed, and
+// other navbar variations.
+
.navbar {
position: relative;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
- margin-bottom: 20px;
- padding-left: @navbar-padding-horizontal;
- padding-right: @navbar-padding-horizontal;
+ margin-bottom: @navbar-margin-bottom;
background-color: @navbar-bg;
- border-radius: @navbar-border-radius;
+ border: 1px solid @navbar-border;
// Prevent floats from breaking the navbar
.clearfix();
+
+ @media (min-width: @grid-float-breakpoint) {
+ border-radius: @navbar-border-radius;
+ }
}
+
+// Navbar heading
+//
+// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy
+// styling of responsive aspects.
+
+.navbar-header {
+ padding-left: @navbar-padding-horizontal;
+ padding-right: @navbar-padding-horizontal;
+ .clearfix();
+
+ @media (min-width: @grid-float-breakpoint) {
+ float: left;
+ }
+}
+
+
+// Navbar collapse (body)
+//
+// Group your navbar content into this for easy collapsing and expanding across
+// various device sizes. By default, this content is collapsed when <768px, but
+// will expand past that for a horizontal display.
+//
+// To start (on mobile devices) the navbar links, forms, and buttons are stacked
+// vertically and include a `max-height` to overflow in case you have too much
+// content for the user's viewport.
+
+.navbar-collapse {
+ padding: 5px @navbar-padding-horizontal;
+ border-top: 1px solid darken(@navbar-bg, 7%);
+ box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
+ // Clear floated elements and prevent collapsing of padding
+ .clearfix();
+
+ // This is not automatically added to the `.navbar-fixed-top` because it causes
+ // z-index bugs in iOS7 (possibly earlier).
+ max-height: 340px;
+ overflow-x: visible;
+ overflow-y: auto;
+ -webkit-overflow-scrolling: touch;
+
+ @media (min-width: @grid-float-breakpoint) {
+ width: auto;
+ padding-top: 0;
+ padding-bottom: 0;
+ border-top: 0;
+ box-shadow: none;
+ }
+}
+
+
+//
+// Navbar alignment options
+//
+// Display the navbar across the entirity of the page or fixed it to the top or
+// bottom of the page.
+
+// Static top (unfixed, but 100% wide) navbar
+.navbar-static-top {
+ @media (min-width: @grid-float-breakpoint) {
+ border-width: 0 0 1px;
+ border-radius: 0;
+ }
+}
+
+// Fix the top/bottom navbars when screen real estate supports it
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+ position: fixed;
+ right: 0;
+ left: 0;
+ z-index: @zindex-navbar-fixed;
+ border-width: 0 0 1px;
+
+ // Undo the rounded corners
+ @media (min-width: @grid-float-breakpoint) {
+ border-radius: 0;
+ }
+}
+.navbar-fixed-top {
+ top: 0;
+}
+.navbar-fixed-bottom {
+ bottom: 0;
+ margin-bottom: 0; // override .navbar defaults
+}
+
+
+// Brand/project name
+
+.navbar-brand {
+ float: left;
+ margin-right: (@navbar-padding-horizontal / 2);
+ padding-top: @navbar-padding-vertical;
+ padding-bottom: @navbar-padding-vertical;
+ font-size: @font-size-large;
+ line-height: @line-height-computed;
+ color: @navbar-brand-color;
+ &:hover,
+ &:focus {
+ color: @navbar-brand-hover-color;
+ text-decoration: none;
+ background-color: @navbar-brand-hover-bg;
+ }
+}
+
+
+// Navbar toggle
+//
+// Custom button for toggling the `.navbar-collapse`, powered by the collapse
+// JavaScript plugin.
+
+.navbar-toggle {
+ position: relative;
+ float: right;
+ padding: 9px 10px;
+ .navbar-vertical-align(34px);
+ background-color: transparent;
+ border: 1px solid @navbar-toggle-border-color;
+ border-radius: @border-radius-base;
+
+ &:hover,
+ &:focus {
+ background-color: @navbar-toggle-hover-bg;
+ }
+
+ // Bars
+ .icon-bar {
+ display: block;
+ width: 22px;
+ height: 2px;
+ background-color: @navbar-toggle-icon-bar-bg;
+ border-radius: 1px;
+ }
+ .icon-bar + .icon-bar {
+ margin-top: 4px;
+ }
+}
+
+
// Navbar nav links
-// -------------------------
+//
+// Builds on top of the `.nav` components with it's own modifier class to make
+// the nav the full height of the horizontal nav (above 768px).
.navbar-nav {
- // Space out from .navbar .brand and .btn-navbar when stacked in mobile views
- margin-top: 10px;
- margin-bottom: 15px;
+ margin-left: -@navbar-padding-horizontal;
+ margin-right: -@navbar-padding-horizontal;
+
+ @media (min-width: @grid-float-breakpoint) {
+ margin-left: 0;
+ margin-right: 0;
+ }
> li > a {
- padding-top: ((@navbar-height - @line-height-computed) / 2);
- padding-bottom: ((@navbar-height - @line-height-computed) / 2);
+ padding-top: 10px;
+ padding-bottom: 10px;
color: @navbar-link-color;
line-height: @line-height-computed;
- border-radius: @border-radius-base;
&:hover,
&:focus {
color: @navbar-link-hover-color;
@@ -53,136 +205,110 @@
}
}
- // Right aligned contents
- // Make them full width first so that they align properly on mobile
- &.pull-right {
- width: 100%;
+ @media (max-width: @screen-phone-max) {
+ // Dropdowns get custom display
+ .open .dropdown-menu {
+ position: static;
+ float: none;
+ width: auto;
+ margin-top: 0;
+ background-color: transparent;
+ border: 0;
+ box-shadow: none;
+ > li > a,
+ .dropdown-header {
+ padding: 5px 15px 5px 25px;
+ }
+ > li > a {
+ color: @navbar-link-color;
+ line-height: @line-height-computed;
+ &:hover,
+ &:focus {
+ color: @navbar-link-hover-color;
+ background-color: @navbar-link-hover-bg;
+ background-image: none;
+ }
+ }
+ > .active > a {
+ &,
+ &:hover,
+ &:focus {
+ color: @navbar-link-active-color;
+ background-color: @navbar-link-active-bg;
+ }
+ }
+ > .disabled > a {
+ &,
+ &:hover,
+ &:focus {
+ color: @navbar-link-disabled-color;
+ background-color: @navbar-link-disabled-bg;
+ }
+ }
+ }
}
+
}
-
+// Component alignment
//
-// Navbar alignment options
-// --------------------------------------------------
+// Repurpose the pull utilities as their own navbar utilities to avoid specifity
+// issues with parents and chaining. Only do this when the navbar is uncollapsed
+// though so that navbar contents properly stack and align in mobile.
-// Static navbar
-.navbar-static-top {
- border-radius: 0;
+@media (min-width: @grid-float-breakpoint) {
+ .navbar-left { .pull-left(); }
+ .navbar-right { .pull-right(); }
}
-// Fix the top/bottom navbars when screen real estate supports it
-.navbar-fixed-top,
-.navbar-fixed-bottom {
- position: fixed;
- right: 0;
- left: 0;
- z-index: @zindex-navbar-fixed;
- border-radius: 0;
-}
-.navbar-fixed-top {
- top: 0;
- .nav-collapse {
- }
-}
-.navbar-fixed-bottom {
- bottom: 0;
- margin-bottom: 0; // override .navbar defaults
-}
-
-
-// Scrollable navbar navigation
-//
-// Sometimes you might have too many links in your fixed navbar and you need to
-// maintain access to all that content. To help, add `.nav-collapse-scrollable`
-// to your `.nav-collapse` to prevent the the content from flowing past the max-
-// height of your browser.
-//
-// This is not automatically added to the `.navbar-fixed-top` because it causes
-// z-index bugs in iOS7 (possibly earlier).
-
-@media (max-width: @screen-small) {
- .nav-collapse-scrollable {
- margin-bottom: @navbar-padding-vertical;
- max-height: 360px;
- overflow-y: scroll;
- -webkit-overflow-scrolling: touch;
- }
-}
-
-
-//
-// Navbar optional components
-// --------------------------------------------------
-
-// Brand/project name
-.navbar-brand {
- display: block;
- max-width: 200px;
- margin-left: auto;
- margin-right: auto;
- padding: @navbar-padding-vertical @navbar-padding-horizontal;
- font-size: @font-size-large;
- font-weight: 500;
- line-height: @line-height-computed;
- color: @navbar-brand-color;
- text-align: center;
- &:hover,
- &:focus {
- color: @navbar-brand-hover-color;
- text-decoration: none;
- background-color: @navbar-brand-hover-bg;
- }
-}
-
-// Collapsible navbar toggle
-.navbar-toggle {
- position: relative;
- float: right;
- height: 34px;
- width: 48px;
- .navbar-vertical-align(34px);
- padding: @padding-base-vertical @padding-base-horizontal;
- background-color: transparent;
- border: 1px solid @navbar-toggle-border-color;
- border-radius: @border-radius-base;
-
- &:hover,
- &:focus {
- background-color: @navbar-toggle-hover-bg;
- }
-
- // Bars
- .icon-bar {
- display: block;
- width: 22px;
- height: 2px;
- background-color: @navbar-toggle-icon-bar-bg;
- border-radius: 1px;
- }
- .icon-bar + .icon-bar {
- margin-top: 4px;
- }
-}
// Navbar form
+//
+// Extension of the `.form-inline` with some extra flavor for optimum display in
+// our navbars.
+
.navbar-form {
+ margin-left: -@navbar-padding-horizontal;
+ margin-right: -@navbar-padding-horizontal;
+ padding: 10px @navbar-padding-horizontal;
+ border-top: 1px solid darken(@navbar-bg, 7%);
+ border-bottom: 1px solid darken(@navbar-bg, 7%);
+
+ // Mixin behavior for optimum display
.form-inline();
- .navbar-vertical-align(@input-height-base); // Vertically center in navbar
+
+ .form-group {
+ @media (max-width: @screen-phone-max) {
+ margin-bottom: 5px;
+ }
+ }
+
+ // Vertically center in expanded, horizontal navbar
+ .navbar-vertical-align(@input-height-base);
+
+ // Undo 100% width for pull classes
+ @media (min-width: @grid-float-breakpoint) {
+ width: auto;
+ border: 0;
+ margin-left: 0;
+ margin-right: 0;
+ padding-top: 0;
+ padding-bottom: 0;
+ }
}
+
// Dropdown menus
// Menu position and menu carets
.navbar-nav > li > .dropdown-menu {
margin-top: 0;
- border-top-left-radius: 0;
- border-top-right-radius: 0;
+ .border-top-radius(0);
}
// Menu position and menu caret support for dropups via extra dropup class
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
- border-bottom-left-radius: 0;
- border-bottom-right-radius: 0;
+ .border-bottom-radius(0);
}
// Dropdown menu items and carets
@@ -227,6 +353,7 @@
.navbar-inverse {
background-color: @navbar-inverse-bg;
+ border-color: @navbar-inverse-border;
.navbar-brand {
color: @navbar-inverse-brand-color;
@@ -281,6 +408,10 @@
}
}
+ .navbar-collapse {
+ border-top-color: darken(@navbar-inverse-bg, 7%);
+ }
+
// Dropdowns
.navbar-nav {
> .open > a {
@@ -309,7 +440,41 @@
}
}
}
+
+ @media (max-width: @screen-phone-max) {
+ // Dropdowns get custom display
+ .open .dropdown-menu {
+ > .dropdown-header {
+ border-color: @navbar-inverse-border;
+ }
+ > li > a {
+ color: @navbar-inverse-link-color;
+ &:hover,
+ &:focus {
+ color: @navbar-inverse-link-hover-color;
+ background-color: @navbar-inverse-link-hover-bg;
+ }
+ }
+ > .active > a {
+ &,
+ &:hover,
+ &:focus {
+ color: @navbar-inverse-link-active-color;
+ background-color: @navbar-inverse-link-active-bg;
+ }
+ }
+ > .disabled > a {
+ &,
+ &:hover,
+ &:focus {
+ color: @navbar-inverse-link-disabled-color;
+ background-color: @navbar-inverse-link-disabled-bg;
+ }
+ }
+ }
+ }
}
+
}
@@ -319,12 +484,6 @@
@media screen and (min-width: @grid-float-breakpoint) {
- .navbar-brand {
- float: left;
- margin-left: -(@navbar-padding-horizontal);
- margin-right: 5px;
- max-width: none; // Disables the default mobile setting
- }
.navbar-nav {
float: left;
// undo margin to make nav extend full height of navbar
@@ -334,13 +493,10 @@
> li {
float: left;
> a {
- border-radius: 0;
+ padding-top: ((@navbar-height - @line-height-computed) / 2);
+ padding-bottom: ((@navbar-height - @line-height-computed) / 2);
}
}
-
- &.pull-right {
- width: auto;
- }
}
// Required to make the collapsing navbar work on regular desktops
@@ -350,9 +506,10 @@
left: auto;
display: none;
}
- .nav-collapse.collapse {
+ .navbar-collapse.collapse {
display: block !important;
height: auto !important;
+ padding-bottom: 0; // Override default setting
overflow: visible !important;
}
@@ -376,7 +533,6 @@
.navbar-text {
float: left;
- padding: 0 @navbar-padding-horizontal;
.navbar-vertical-align(@line-height-computed);
}
diff --git a/less/navs.less b/less/navs.less
index a19e5cdfdb..610b97e007 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -60,6 +60,12 @@
.nav-divider {
.nav-divider();
}
+
+ // Prevent IE8 from misplacing imgs
+ // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
+ > li > a > img {
+ max-width: none;
+ }
}
diff --git a/less/pagination.less b/less/pagination.less
index 65679beff4..12bb71b197 100644
--- a/less/pagination.less
+++ b/less/pagination.less
@@ -63,46 +63,10 @@
// Large
.pagination-lg {
- > li {
- > a,
- > span {
- padding: @padding-large-vertical @padding-large-horizontal;
- font-size: @font-size-large;
- }
- &:first-child {
- > a,
- > span {
- .border-left-radius(@border-radius-large);
- }
- }
- &:last-child {
- > a,
- > span {
- .border-right-radius(@border-radius-large);
- }
- }
- }
+ .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);
}
// Small
.pagination-sm {
- > li {
- > a,
- > span {
- padding: @padding-small-vertical @padding-small-horizontal;
- font-size: @font-size-small;
- }
- &:first-child {
- > a,
- > span {
- .border-left-radius(@border-radius-small);
- }
- }
- &:last-child {
- > a,
- > span {
- .border-right-radius(@border-radius-small);
- }
- }
- }
+ .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);
}
diff --git a/less/panels.less b/less/panels.less
index 87a7865248..0639731602 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -5,16 +5,26 @@
// Base class
.panel {
- padding: 15px;
- margin-bottom: 20px;
+ margin-bottom: @line-height-computed;
background-color: @panel-bg;
border: 1px solid @panel-border;
border-radius: @panel-border-radius;
.box-shadow(0 1px 1px rgba(0,0,0,.05));
+}
- // List groups in panels
+// Panel contents
+.panel-body {
+ padding: 15px;
+}
+
+// List groups in panels
+//
+// By default, space out list group content from panel headings to account for
+// any kind of custom content between the two.
+
+.panel {
.list-group {
- margin: 15px -15px -15px;
+ margin-bottom: 0;
.list-group-item {
border-width: 1px 0;
@@ -30,15 +40,19 @@
}
}
}
+// Collapse space between when there's no additional content.
+.panel-heading + .list-group {
+ .list-group-item:first-child {
+ border-top-width: 0;
+ }
+}
// Optional heading
.panel-heading {
- margin: -15px -15px 15px;
padding: 10px 15px;
background-color: @panel-heading-bg;
border-bottom: 1px solid @panel-border;
- border-top-left-radius: (@panel-border-radius - 1);
- border-top-right-radius: (@panel-border-radius - 1);
+ .border-top-radius(@panel-border-radius - 1);
}
// Within heading, strip any `h*` tag of it's default margins for spacing.
@@ -46,7 +60,6 @@
margin-top: 0;
margin-bottom: 0;
font-size: (@font-size-base * 1.25);
- font-weight: 500;
> a {
color: inherit;
}
@@ -54,52 +67,62 @@
// 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);
+ .border-bottom-radius(@panel-border-radius - 1);
}
+
+// Collapsable panels (aka, accordion)
+//
+// Wrap a series of panels in `.panel-group` to turn them into an accordion with
+// the help of our collapse JavaScript plugin.
+
+.panel-group {
+ // Tighten up margin so it's only between panels
+ .panel {
+ margin-bottom: 0;
+ border-radius: @panel-border-radius;
+ overflow: hidden; // crop contents when collapsed
+ + .panel {
+ margin-top: 5px;
+ }
+ }
+
+ .panel-heading {
+ border-bottom: 0;
+ + .panel-collapse .panel-body {
+ border-top: 1px solid @panel-border;
+ }
+ }
+ .panel-footer {
+ border-top: 0;
+ + .panel-collapse .panel-body {
+ border-bottom: 1px solid @panel-border;
+ }
+ }
+
+ // New subcomponent for wrapping collapsable content for proper animations
+ .panel-collapse {
+
+ }
+}
+
+
// Contextual variations
.panel-primary {
- border-color: @panel-primary-border;
- .panel-heading {
- color: @panel-primary-text;
- background-color: @panel-primary-heading-bg;
- border-color: @panel-primary-border;
- }
+ .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);
}
.panel-success {
- border-color: @panel-success-border;
- .panel-heading {
- color: @panel-success-text;
- background-color: @panel-success-heading-bg;
- border-color: @panel-success-border;
- }
+ .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
}
.panel-warning {
- border-color: @panel-warning-border;
- .panel-heading {
- color: @panel-warning-text;
- background-color: @panel-warning-heading-bg;
- border-color: @panel-warning-border;
- }
+ .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
}
.panel-danger {
- border-color: @panel-danger-border;
- .panel-heading {
- color: @panel-danger-text;
- background-color: @panel-danger-heading-bg;
- border-color: @panel-danger-border;
- }
+ .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
}
.panel-info {
- border-color: @panel-info-border;
- .panel-heading {
- color: @panel-info-text;
- background-color: @panel-info-heading-bg;
- border-color: @panel-info-border;
- }
+ .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
}
diff --git a/less/popovers.less b/less/popovers.less
index c07350f95a..345bb1a319 100644
--- a/less/popovers.less
+++ b/less/popovers.less
@@ -13,8 +13,6 @@
padding: 1px;
text-align: left; // Reset given new insertion method
background-color: @popover-bg;
- -webkit-bg-clip: padding-box;
- -moz-bg-clip: padding;
background-clip: padding-box;
border: 1px solid @popover-fallback-border-color;
border: 1px solid @popover-border-color;
diff --git a/less/progress-bars.less b/less/progress-bars.less
index ab98323151..d4c498c513 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -61,7 +61,7 @@
// Striped bars
.progress-striped .progress-bar {
#gradient > .striped(@progress-bar-bg);
- .background-size(40px 40px);
+ background-size: 40px 40px;
}
// Call animation for the active one
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index 38dd9639af..cec869083a 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -35,70 +35,100 @@
// Visibility utilities
-// For Phones
-.visible-sm {
+.visible-xs {
.responsive-visibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-invisibility();
+ }
+}
+.visible-sm {
+ .responsive-invisibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-invisibility();
+ }
}
.visible-md {
.responsive-invisibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-invisibility();
+ }
}
.visible-lg {
.responsive-invisibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-visibility();
+ }
}
-.hidden-sm {
+.hidden-xs {
.responsive-invisibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-visibility();
+ }
+}
+.hidden-sm {
+ .responsive-visibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-visibility();
+ }
}
.hidden-md {
.responsive-visibility();
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
+ .responsive-visibility();
+ }
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
+ .responsive-invisibility();
+ }
+ @media (min-width: @screen-large-desktop) {
+ .responsive-visibility();
+ }
}
.hidden-lg {
.responsive-visibility();
-}
-
-
-// Tablets & small desktops only
-@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
- .visible-sm {
- .responsive-invisibility();
- }
- .visible-md {
+ @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
.responsive-visibility();
}
- .visible-lg {
- .responsive-invisibility();
- }
-
- .hidden-sm {
+ @media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) {
.responsive-visibility();
}
- .hidden-md {
- .responsive-invisibility();
- }
- .hidden-lg {
- .responsive-visibility();
- }
-}
-
-// For desktops
-@media (min-width: @screen-desktop) {
- .visible-sm {
- .responsive-invisibility();
- }
- .visible-md {
- .responsive-invisibility();
- }
- .visible-lg {
- .responsive-visibility();
- }
-
- .hidden-sm {
- .responsive-visibility();
- }
- .hidden-md {
- .responsive-visibility();
- }
- .hidden-lg {
+ @media (min-width: @screen-large-desktop) {
.responsive-invisibility();
}
}
diff --git a/less/scaffolding.less b/less/scaffolding.less
index b6128dc5d1..0c1774e281 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -6,7 +6,9 @@
// Reset the box-sizing
// -------------------------
-* {
+*,
+*:before,
+*:after {
.box-sizing(border-box);
}
@@ -79,7 +81,7 @@ img {
// Perfect circle
.img-circle {
- border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
+ border-radius: 50%; // set radius in percents
}
@@ -93,3 +95,17 @@ hr {
border-top: 1px solid @hr-border;
}
+// Only display content to screen readers
+// See: http://a11yproject.com/posts/how-to-hide-content/
+// -------------------------
+
+.sr-only {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ margin: -1px;
+ padding: 0;
+ overflow: hidden;
+ clip: rect(0 0 0 0);
+ border: 0;
+}
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 1f896708d8..d209412dc7 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -10,7 +10,7 @@
// Can be `a`, `div`, or `img`
.thumbnail,
.img-thumbnail {
- padding: 4px;
+ padding: @thumbnail-padding;
line-height: @line-height-base;
background-color: @thumbnail-bg;
border: 1px solid @thumbnail-border;
@@ -37,6 +37,6 @@ a.thumbnail:focus {
margin-right: auto;
}
.thumbnail .caption {
- padding: 9px;
+ padding: @thumbnail-caption-padding;
color: @thumbnail-caption-color;
}
diff --git a/less/variables.less b/less/variables.less
index 3a9430e2e6..089f4fb193 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -133,6 +133,7 @@
@input-bg: #fff;
@input-bg-disabled: @gray-lighter;
+@input-color: @gray;
@input-border: #ccc;
@input-border-radius: @border-radius-base;
@input-border-focus: #66afe9;
@@ -143,8 +144,10 @@
@input-height-large: (floor(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+@legend-color: @gray-dark;
@legend-border-color: #e5e5e5;
+@input-group-addon-bg: @gray-lighter;
@input-group-addon-border-color: @input-border;
@@ -163,6 +166,10 @@
@dropdown-link-hover-color: #fff;
@dropdown-link-hover-bg: @dropdown-link-active-bg;
+@dropdown-link-disabled-color: @gray-light;
+
+@dropdown-header-color: @gray-light;
+
@dropdown-caret-color: #000;
@@ -202,6 +209,7 @@
@screen-large-desktop: @screen-large;
// So media queries don't overlap when required, provide a maximum
+@screen-phone-max: (@screen-small - 1);
@screen-small-max: (@screen-medium - 1);
@screen-tablet-max: (@screen-desktop - 1);
@screen-desktop-max: (@screen-large-desktop - 1);
@@ -223,10 +231,12 @@
// Basics of a navbar
@navbar-height: 50px;
+@navbar-margin-bottom: @line-height-computed;
@navbar-color: #777;
-@navbar-bg: #eee;
+@navbar-bg: #f8f8f8;
+@navbar-border: darken(@navbar-bg, 6.5%);
@navbar-border-radius: @border-radius-base;
-@navbar-padding-horizontal: floor(@grid-gutter-width / 2); // ~15px
+@navbar-padding-horizontal: floor(@grid-gutter-width / 2);
@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
// Navbar links
@@ -234,7 +244,7 @@
@navbar-link-hover-color: #333;
@navbar-link-hover-bg: transparent;
@navbar-link-active-color: #555;
-@navbar-link-active-bg: darken(@navbar-bg, 10%);
+@navbar-link-active-bg: darken(@navbar-bg, 6.5%);
@navbar-link-disabled-color: #ccc;
@navbar-link-disabled-bg: transparent;
@@ -254,6 +264,7 @@
// Reset inverted navbar basics
@navbar-inverse-color: @gray-light;
@navbar-inverse-bg: #222;
+@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
// Inverted navbar links
@navbar-inverse-link-color: @gray-light;
@@ -491,11 +502,14 @@
// Thumbnails
// -------------------------
-@thumbnail-caption-color: @text-color;
+@thumbnail-padding: 4px;
@thumbnail-bg: @body-bg;
@thumbnail-border: #ddd;
@thumbnail-border-radius: @border-radius-base;
+@thumbnail-caption-color: @text-color;
+@thumbnail-caption-padding: 9px;
+
// Wells
// -------------------------
@@ -557,7 +571,9 @@
@code-bg: #f9f2f4;
@pre-bg: #f5f5f5;
+@pre-color: @gray-dark;
@pre-border-color: #ccc;
+@pre-scrollable-max-height: 340px;
// Type
// ------------------------
@@ -582,10 +598,10 @@
// --------------------------------------------------
// Small screen / tablet
-@container-tablet: 728px;
+@container-tablet: 720px;
// Medium screen / desktop
@container-desktop: 940px;
// Large screen / wide desktop
-@container-large-desktop: 1170px;
+@container-large-desktop: 1140px;
diff --git a/package.json b/package.json
index e9e8fd29ce..efcc5af0cc 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,9 @@
, "grunt-contrib-uglify": "~0.2.2"
, "grunt-contrib-qunit": "~0.2.2"
, "grunt-contrib-watch": "~0.5.1"
+ , "grunt-html-validation": "git://github.com/praveenvijayan/grunt-html-validation.git"
+ , "grunt-jekyll": "~0.3.8"
, "grunt-recess": "~0.3.3"
+ , "browserstack-runner": "~0.0.11"
}
}