diff options
| author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2013-12-24 19:13:14 +0400 |
|---|---|---|
| committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2013-12-24 19:13:14 +0400 |
| commit | 73b93295d84f9c79ab404f3ea6a112b72cfe3e5b (patch) | |
| tree | f75e0be5d7856de4f3301b6523b0bb026b73ede8 | |
| parent | 2741a634e8460257e9a9fe03ea26e43fc360994c (diff) | |
Rollback Sass to 3.0.3.0 for bower rel
37 files changed, 547 insertions, 618 deletions
diff --git a/vendor/assets/javascripts/bootstrap/affix.js b/vendor/assets/javascripts/bootstrap/affix.js index 34ee091f..552bffa3 100644 --- a/vendor/assets/javascripts/bootstrap/affix.js +++ b/vendor/assets/javascripts/bootstrap/affix.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: affix.js v3.1.0 + * Bootstrap: affix.js v3.0.3 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // AFFIX CLASS DEFINITION // ====================== diff --git a/vendor/assets/javascripts/bootstrap/alert.js b/vendor/assets/javascripts/bootstrap/alert.js index d7bbc565..695ad74d 100644 --- a/vendor/assets/javascripts/bootstrap/alert.js +++ b/vendor/assets/javascripts/bootstrap/alert.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: alert.js v3.1.0 + * Bootstrap: alert.js v3.0.3 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // ALERT CLASS DEFINITION // ====================== diff --git a/vendor/assets/javascripts/bootstrap/button.js b/vendor/assets/javascripts/bootstrap/button.js index 2cf67f6a..c9fdde5e 100644 --- a/vendor/assets/javascripts/bootstrap/button.js +++ b/vendor/assets/javascripts/bootstrap/button.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: button.js v3.1.0 + * Bootstrap: button.js v3.0.3 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // BUTTON PUBLIC CLASS DEFINITION // ============================== diff --git a/vendor/assets/javascripts/bootstrap/carousel.js b/vendor/assets/javascripts/bootstrap/carousel.js index 9ac7c6a2..6391a36d 100644 --- a/vendor/assets/javascripts/bootstrap/carousel.js +++ b/vendor/assets/javascripts/bootstrap/carousel.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.1.0 + * Bootstrap: carousel.js v3.0.3 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // CAROUSEL CLASS DEFINITION // ========================= @@ -28,9 +39,9 @@ } Carousel.DEFAULTS = { - interval: 5000, - pause: 'hover', - wrap: true + interval: 5000 + , pause: 'hover' + , wrap: true } Carousel.prototype.cycle = function (e) { @@ -130,7 +141,7 @@ that.sliding = false setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0) }) - .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000) + .emulateTransitionEnd(600) } else { this.$element.trigger(e) if (e.isDefaultPrevented()) return diff --git a/vendor/assets/javascripts/bootstrap/collapse.js b/vendor/assets/javascripts/bootstrap/collapse.js index e87ecb52..1a079938 100644 --- a/vendor/assets/javascripts/bootstrap/collapse.js +++ b/vendor/assets/javascripts/bootstrap/collapse.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.1.0 + * Bootstrap: collapse.js v3.0.3 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // COLLAPSE PUBLIC CLASS DEFINITION // ================================ diff --git a/vendor/assets/javascripts/bootstrap/dropdown.js b/vendor/assets/javascripts/bootstrap/dropdown.js index 1788b019..13352ef7 100644 --- a/vendor/assets/javascripts/bootstrap/dropdown.js +++ b/vendor/assets/javascripts/bootstrap/dropdown.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.1.0 + * Bootstrap: dropdown.js v3.0.3 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // DROPDOWN CLASS DEFINITION // ========================= @@ -74,7 +85,7 @@ if (e.keyCode == 38 && index > 0) index-- // up if (e.keyCode == 40 && index < $items.length - 1) index++ // down - if (!~index) index = 0 + if (!~index) index=0 $items.eq(index).focus() } @@ -95,7 +106,7 @@ if (!selector) { selector = $this.attr('href') - selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } var $parent = selector && $(selector) @@ -137,7 +148,7 @@ $(document) .on('click.bs.dropdown.data-api', clearMenus) .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown) + .on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(jQuery); diff --git a/vendor/assets/javascripts/bootstrap/modal.js b/vendor/assets/javascripts/bootstrap/modal.js index 794cbad8..3ead5ee8 100644 --- a/vendor/assets/javascripts/bootstrap/modal.js +++ b/vendor/assets/javascripts/bootstrap/modal.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: modal.js v3.1.0 + * Bootstrap: modal.js v3.0.3 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // MODAL CLASS DEFINITION // ====================== @@ -22,9 +33,9 @@ } Modal.DEFAULTS = { - backdrop: true, - keyboard: true, - show: true + backdrop: true + , keyboard: true + , show: true } Modal.prototype.toggle = function (_relatedTarget) { @@ -138,6 +149,7 @@ } Modal.prototype.backdrop = function (callback) { + var that = this var animate = this.$element.hasClass('fade') ? 'fade' : '' if (this.isShown && this.options.backdrop) { @@ -168,7 +180,7 @@ } else if (!this.isShown && this.$backdrop) { this.$backdrop.removeClass('in') - $.support.transition && this.$element.hasClass('fade') ? + $.support.transition && this.$element.hasClass('fade')? this.$backdrop .one($.support.transition.end, callback) .emulateTransitionEnd(150) : diff --git a/vendor/assets/javascripts/bootstrap/popover.js b/vendor/assets/javascripts/bootstrap/popover.js index adbb17ff..996962aa 100644 --- a/vendor/assets/javascripts/bootstrap/popover.js +++ b/vendor/assets/javascripts/bootstrap/popover.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: popover.js v3.1.0 + * Bootstrap: popover.js v3.0.3 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // POPOVER PUBLIC CLASS DEFINITION // =============================== @@ -18,11 +29,11 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { - placement: 'right', - trigger: 'click', - content: '', - template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' + Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, { + placement: 'right' + , trigger: 'click' + , content: '' + , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>' }) diff --git a/vendor/assets/javascripts/bootstrap/scrollspy.js b/vendor/assets/javascripts/bootstrap/scrollspy.js index 3393572b..2efe14fd 100644 --- a/vendor/assets/javascripts/bootstrap/scrollspy.js +++ b/vendor/assets/javascripts/bootstrap/scrollspy.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.1.0 + * Bootstrap: scrollspy.js v3.0.3 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // SCROLLSPY CLASS DEFINITION // ========================== @@ -88,15 +99,15 @@ .parents('.active') .removeClass('active') - var selector = this.selector + - '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' + var selector = this.selector + + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' var active = $(selector) .parents('li') .addClass('active') - if (active.parent('.dropdown-menu').length) { + if (active.parent('.dropdown-menu').length) { active = active .closest('li.dropdown') .addClass('active') diff --git a/vendor/assets/javascripts/bootstrap/tab.js b/vendor/assets/javascripts/bootstrap/tab.js index 05bcbb00..6b0f5f67 100644 --- a/vendor/assets/javascripts/bootstrap/tab.js +++ b/vendor/assets/javascripts/bootstrap/tab.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: tab.js v3.1.0 + * Bootstrap: tab.js v3.0.3 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // TAB CLASS DEFINITION // ==================== @@ -42,8 +53,8 @@ this.activate($this.parent('li'), $ul) this.activate($target, $target.parent(), function () { $this.trigger({ - type: 'shown.bs.tab', - relatedTarget: previous + type: 'shown.bs.tab' + , relatedTarget: previous }) }) } diff --git a/vendor/assets/javascripts/bootstrap/tooltip.js b/vendor/assets/javascripts/bootstrap/tooltip.js index 38d06bc5..4c848f0e 100644 --- a/vendor/assets/javascripts/bootstrap/tooltip.js +++ b/vendor/assets/javascripts/bootstrap/tooltip.js @@ -1,14 +1,25 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.1.0 + * Bootstrap: tooltip.js v3.0.3 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -25,15 +36,15 @@ } Tooltip.DEFAULTS = { - animation: true, - placement: 'top', - selector: false, - template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>', - trigger: 'hover focus', - title: '', - delay: 0, - html: false, - container: false + animation: true + , placement: 'top' + , selector: false + , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' + , trigger: 'hover focus' + , title: '' + , delay: 0 + , html: false + , container: false } Tooltip.prototype.init = function (type, element, options) { @@ -72,8 +83,8 @@ if (options.delay && typeof options.delay == 'number') { options.delay = { - show: options.delay, - hide: options.delay + show: options.delay + , hide: options.delay } } @@ -122,7 +133,7 @@ } Tooltip.prototype.show = function () { - var e = $.Event('show.bs.' + this.type) + var e = $.Event('show.bs.'+ this.type) if (this.hasContent() && this.enabled) { this.$element.trigger(e) @@ -181,7 +192,7 @@ } } - Tooltip.prototype.applyPlacement = function (offset, placement) { + Tooltip.prototype.applyPlacement = function(offset, placement) { var replace var $tip = this.tip() var width = $tip[0].offsetWidth @@ -232,8 +243,8 @@ if (replace) $tip.offset(offset) } - Tooltip.prototype.replaceArrow = function (delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') + Tooltip.prototype.replaceArrow = function(delta, dimension, position) { + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') } Tooltip.prototype.setContent = function () { @@ -284,8 +295,8 @@ Tooltip.prototype.getPosition = function () { var el = this.$element[0] return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : { - width: el.offsetWidth, - height: el.offsetHeight + width: el.offsetWidth + , height: el.offsetHeight }, this.$element.offset()) } diff --git a/vendor/assets/javascripts/bootstrap/transition.js b/vendor/assets/javascripts/bootstrap/transition.js index 26c77a86..773dbe69 100644 --- a/vendor/assets/javascripts/bootstrap/transition.js +++ b/vendor/assets/javascripts/bootstrap/transition.js @@ -1,13 +1,24 @@ /* ======================================================================== - * Bootstrap: transition.js v3.1.0 + * Bootstrap: transition.js v3.0.3 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2013 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ======================================================================== */ -+function ($) { 'use strict'; ++function ($) { "use strict"; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // ============================================================ @@ -16,10 +27,10 @@ var el = document.createElement('bootstrap') var transEndEventNames = { - 'WebkitTransition' : 'webkitTransitionEnd', - 'MozTransition' : 'transitionend', - 'OTransition' : 'oTransitionEnd otransitionend', - 'transition' : 'transitionend' + 'WebkitTransition' : 'webkitTransitionEnd' + , 'MozTransition' : 'transitionend' + , 'OTransition' : 'oTransitionEnd otransitionend' + , 'transition' : 'transitionend' } for (var name in transEndEventNames) { diff --git a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss index 3641e333..c35ef946 100644 --- a/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +++ b/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss @@ -4,22 +4,19 @@ .breadcrumb { - padding: $breadcrumb-padding-vertical $breadcrumb-padding-horizontal; + padding: 8px 15px; margin-bottom: $line-height-computed; list-style: none; background-color: $breadcrumb-bg; border-radius: $border-radius-base; - > li { display: inline-block; - + li:before { content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space padding: 0 5px; color: $breadcrumb-color; } } - > .active { color: $breadcrumb-active-color; } diff --git a/vendor/assets/stylesheets/bootstrap/_button-groups.scss b/vendor/assets/stylesheets/bootstrap/_button-groups.scss index 066b4d77..1fc6ae84 100644 --- a/vendor/assets/stylesheets/bootstrap/_button-groups.scss +++ b/vendor/assets/stylesheets/bootstrap/_button-groups.scss @@ -37,17 +37,18 @@ // Optional: Group multiple button groups together for a toolbar .btn-toolbar { - margin-left: -5px; // Offset the first child's margin @include clearfix(); - .btn-group, - .input-group { + .btn-group { float: left; } + // Space out series of button groups > .btn, - > .btn-group, - > .input-group { - margin-left: 5px; + > .btn-group { + + .btn, + + .btn-group { + margin-left: 5px; + } } } @@ -187,13 +188,13 @@ .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group-vertical > .btn-group:first-child:not(:last-child) { +.btn-group-vertical > .btn-group:first-child { > .btn:last-child, > .dropdown-toggle { @include border-bottom-radius(0); } } -.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child { +.btn-group-vertical > .btn-group:last-child > .btn:first-child { @include border-top-radius(0); } diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss index 8293b897..0e862f58 100644 --- a/vendor/assets/stylesheets/bootstrap/_buttons.scss +++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss @@ -56,10 +56,6 @@ .btn-primary { @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border); } -// Success appears as green -.btn-success { - @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border); -} // Warning appears as orange .btn-warning { @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border); @@ -68,6 +64,10 @@ .btn-danger { @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border); } +// Success appears as green +.btn-success { + @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border); +} // Info appears as blue-green .btn-info { @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border); diff --git a/vendor/assets/stylesheets/bootstrap/_code.scss b/vendor/assets/stylesheets/bootstrap/_code.scss index 89536160..240dc1d1 100644 --- a/vendor/assets/stylesheets/bootstrap/_code.scss +++ b/vendor/assets/stylesheets/bootstrap/_code.scss @@ -21,16 +21,6 @@ code { border-radius: $border-radius-base; } -// User input typically entered via keyboard -kbd { - padding: 2px 4px; - font-size: 90%; - color: $kbd-color; - background-color: $kbd-bg; - border-radius: $border-radius-small; - box-shadow: inset 0 -1px 0 rgba(0,0,0,.25); -} - // Blocks of code pre { display: block; diff --git a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss index 1a076984..74502ce6 100644 --- a/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +++ b/vendor/assets/stylesheets/bootstrap/_dropdowns.scss @@ -46,8 +46,6 @@ background-clip: padding-box; // Aligns the dropdown menu to right - // - // Deprecated as of 3.1 in favor of `.dropdown-menu-[dir]` &.pull-right { right: 0; left: auto; @@ -128,25 +126,6 @@ } } -// Menu positioning -// -// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown -// menu with the parent. -.dropdown-menu-right { - left: auto; // Reset the default from `.dropdown-menu` - right: 0; -} -// With v3, we enabled auto-flipping if you have a dropdown within a right -// aligned nav component. To enable the undoing of that, we provide an override -// to restore the default dropdown menu alignment. -// -// This is only for left-aligning a dropdown menu within a `.navbar-right` or -// `.pull-right` nav component. -.dropdown-menu-left { - left: 0; - right: auto; -} - // Dropdown section headers .dropdown-header { display: block; @@ -163,7 +142,7 @@ right: 0; bottom: 0; top: 0; - z-index: ($zindex-dropdown - 10); + z-index: $zindex-dropdown - 10; } // Right aligned dropdowns @@ -204,10 +183,6 @@ right: 0; left: auto; } - // Necessary for overrides of the default right aligned menu. - // Will remove come v4 in all likelihood. - .dropdown-menu-left {\left: 0;\right: auto; - } } } diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index 92677201..6f1383ec 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -89,6 +89,7 @@ output { font-size: $font-size-base; line-height: $line-height-base; color: $input-color; + vertical-align: middle; } @@ -122,6 +123,7 @@ output { font-size: $font-size-base; line-height: $line-height-base; color: $input-color; + vertical-align: middle; background-color: $input-bg; background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid $input-border; @@ -157,14 +159,6 @@ textarea.form-control { height: auto; } -// Special styles for iOS date input -// -// In Mobile Safari, date inputs require a pixel line-height that matches the -// given height of the input. -input[type="date"] { - line-height: $input-height-base; -} - // Form groups // @@ -187,8 +181,10 @@ input[type="date"] { margin-top: 10px; margin-bottom: 10px; padding-left: 20px; + vertical-align: middle; label { display: inline; + margin-bottom: 0; font-weight: normal; cursor: pointer; } @@ -236,11 +232,7 @@ input[type="checkbox"], } } - // Form control sizing -// -// Build on `.form-control` with modifier classes to decrease or increase the -// height and font-size of form controls. @include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small); @@ -251,35 +243,15 @@ input[type="checkbox"], // // Apply contextual and semantic states to individual form controls. -.has-feedback { - // Enable absolute positioning - position: relative; - - // Ensure icons don't overlap text - .form-control { - padding-right: ($input-height-base * 1.25); - } - - // Feedback icon (requires .glyphicon classes) - .form-control-feedback { - position: absolute; - top: ($line-height-computed + 5); // Height of the `label` and its margin - right: 0; - display: block; - width: $input-height-base; - height: $input-height-base; - line-height: $input-height-base; - text-align: center; - } -} - -// Feedback states +// Warning .has-warning { @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg); } +// Error .has-error { @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg); } +// Success .has-success { @include form-control-validation($state-success-text, $state-success-text, $state-success-bg); } @@ -325,7 +297,7 @@ input[type="checkbox"], // Kick in the inline @media (min-width: $screen-sm) { // Inline-block all the things for "inline" - .form-group { + .form-group { display: inline-block; margin-bottom: 0; vertical-align: middle; @@ -334,13 +306,11 @@ input[type="checkbox"], // In navbar-form, allow folks to *not* use `.form-group` .form-control { display: inline-block; - width: auto; // Prevent labels from stacking above inputs in `.form-group` - vertical-align: middle; } - .control-label { - margin-bottom: 0; - vertical-align: middle; + // Override `width: 100%;` when not within a `.form-group` + select.form-control { + width: auto; } // Remove default margin on radios/checkboxes that were used for stacking, and @@ -352,21 +322,12 @@ input[type="checkbox"], margin-top: 0; margin-bottom: 0; padding-left: 0; - vertical-align: middle; } .radio input[type="radio"], .checkbox input[type="checkbox"] { float: none; margin-left: 0; } - - // Validation states - // - // Reposition the icon because it's now within a grid column and columns have - // `position: relative;` on them. Also accounts for the grid gutter padding. - .has-feedback .form-control-feedback { - top: 0; - } } } @@ -392,7 +353,7 @@ input[type="checkbox"], // and other content below items .radio, .checkbox { - min-height: ($line-height-computed + ($padding-base-vertical + 1)); + min-height: $line-height-computed + ($padding-base-vertical + 1); } // Make form groups behave like rows @@ -410,13 +371,4 @@ input[type="checkbox"], text-align: right; } } - - // Validation states - // - // Reposition the icon because it's now within a grid column and columns have - // `position: relative;` on them. Also accounts for the grid gutter padding. - .has-feedback .form-control-feedback { - top: 0; - right: ($grid-gutter-width / 2); - } } diff --git a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss index 02c79f10..9ba2abd0 100644 --- a/vendor/assets/stylesheets/bootstrap/_glyphicons.scss +++ b/vendor/assets/stylesheets/bootstrap/_glyphicons.scss @@ -28,6 +28,10 @@ line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; + + &:empty { + width: 1em; + } } // Individual icons diff --git a/vendor/assets/stylesheets/bootstrap/_grid.scss b/vendor/assets/stylesheets/bootstrap/_grid.scss index 10d4a6c8..3763e024 100644 --- a/vendor/assets/stylesheets/bootstrap/_grid.scss +++ b/vendor/assets/stylesheets/bootstrap/_grid.scss @@ -2,18 +2,14 @@ // Grid system // -------------------------------------------------- - -// Container widths -// -// Set the container width, and override it for fixed navbars in media queries. - +// Set the container width, and override it for fixed navbars in media queries .container { @include container-fixed(); - @media (min-width: $screen-sm-min) { + @media (min-width: $screen-sm) { width: $container-sm; } - @media (min-width: $screen-md-min) { + @media (min-width: $screen-md) { width: $container-md; } @media (min-width: $screen-lg-min) { @@ -21,30 +17,12 @@ } } - -// Fluid container -// -// Utilizes the mixin meant for fixed width containers, but without any defined -// width for fluid, full width layouts. - -.container-fluid { - @include container-fixed(); -} - - -// Row -// -// Rows contain and clear the floats of your columns. - +// mobile first defaults .row { @include make-row(); } - -// Columns -// // Common styles for small and large grid columns - @include make-grid-columns(); @@ -98,3 +76,4 @@ @include make-grid($grid-columns, lg, push); @include make-grid($grid-columns, lg, offset); } + diff --git a/vendor/assets/stylesheets/bootstrap/_input-groups.scss b/vendor/assets/stylesheets/bootstrap/_input-groups.scss index 0455a49e..4be458aa 100644 --- a/vendor/assets/stylesheets/bootstrap/_input-groups.scss +++ b/vendor/assets/stylesheets/bootstrap/_input-groups.scss @@ -17,11 +17,6 @@ } .form-control { - // IE9 fubars the placeholder attribute in text inputs and the arrows on - // select elements in input groups. To fix it, we float the input. Details: - // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855 - float: left; - width: 100%; margin-bottom: 0; } @@ -95,10 +90,8 @@ .input-group .form-control:first-child, .input-group-addon:first-child, .input-group-btn:first-child > .btn, -.input-group-btn:first-child > .btn-group > .btn, .input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { +.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) { @include border-right-radius(0); } .input-group-addon:first-child { @@ -107,10 +100,8 @@ .input-group .form-control:last-child, .input-group-addon:last-child, .input-group-btn:last-child > .btn, -.input-group-btn:last-child > .btn-group > .btn, .input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child), -.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { +.input-group-btn:first-child > .btn:not(:first-child) { @include border-left-radius(0); } .input-group-addon:last-child { @@ -121,37 +112,25 @@ // ------------------------- .input-group-btn { position: relative; - // Jankily prevent input button groups from wrapping with `white-space` and - // `font-size` in combination with `inline-block` on buttons. - font-size: 0; white-space: nowrap; - // Negative margin for spacing, position for bringing hovered/focused/actived - // element above the siblings. - > .btn { - position: relative; - + .btn { - margin-left: -1px; - } - // Bring the "active" button to the front - &:hover, - &:focus, - &:active { - z-index: 2; - } - } - // Negative margin to only have a 1px border between the two - &:first-child { - > .btn, - > .btn-group { - margin-right: -1px; - } + &:first-child > .btn { + margin-right: -1px; + } + &:last-child > .btn { + margin-left: -1px; + } +} +.input-group-btn > .btn { + position: relative; + // Jankily prevent input button groups from wrapping + + .btn { + margin-left: -4px; } - &:last-child { - > .btn, - > .btn-group { - margin-left: -1px; - } + // Bring the "active" button to the front + &:hover, + &:active { + z-index: 2; } } diff --git a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss index 4e401e73..221a65d1 100644 --- a/vendor/assets/stylesheets/bootstrap/_jumbotron.scss +++ b/vendor/assets/stylesheets/bootstrap/_jumbotron.scss @@ -6,17 +6,19 @@ .jumbotron { padding: $jumbotron-padding; margin-bottom: $jumbotron-padding; + font-size: $jumbotron-font-size; + font-weight: 200; + line-height: ($line-height-base * 1.5); color: $jumbotron-color; background-color: $jumbotron-bg; h1, .h1 { + line-height: 1; color: $jumbotron-heading-color; } p { - margin-bottom: ($jumbotron-padding / 2); - font-size: $jumbotron-font-size; - font-weight: 200; + line-height: 1.4; } .container & { diff --git a/vendor/assets/stylesheets/bootstrap/_list-group.scss b/vendor/assets/stylesheets/bootstrap/_list-group.scss index da8289b1..19f85d44 100644 --- a/vendor/assets/stylesheets/bootstrap/_list-group.scss +++ b/vendor/assets/stylesheets/bootstrap/_list-group.scss @@ -2,21 +2,17 @@ // List groups // -------------------------------------------------- - // Base class // // Easily usable on <ul>, <ol>, or <div>. - .list-group { // No need to set list-style: none; since .list-group-item is block level margin-bottom: 20px; padding-left: 0; // reset padding because ul and ol } - // Individual list items -// -// Use on `li`s or `div`s within the `.list-group` parent. +// ------------------------- .list-group-item { position: relative; @@ -45,12 +41,7 @@ } } - // Linked list items -// -// Use anchor elements instead of `li`s or `div`s to create linked list items. -// Includes an extra `.active` modifier class for showing selected items. - a.list-group-item { color: $list-group-link-color; @@ -79,26 +70,13 @@ a.list-group-item { color: inherit; } .list-group-item-text { - color: $list-group-active-text-color; + color: lighten($list-group-active-bg, 40%); } } } - -// Contextual variants -// -// Add modifier classes to change text and background color on individual items. -// Organizationally, this must come after the `:hover` states. - -@include list-group-item-variant(success, $state-success-bg, $state-success-text); -@include list-group-item-variant(warning, $state-warning-bg, $state-warning-text); -@include list-group-item-variant(danger, $state-danger-bg, $state-danger-text); -@include list-group-item-variant(info, $state-info-bg, $state-info-text); - - // Custom content options -// -// Extra classes for creating well-formatted content within `.list-group-item`s. +// ------------------------- .list-group-item-heading { margin-top: 0; diff --git a/vendor/assets/stylesheets/bootstrap/_mixins.scss b/vendor/assets/stylesheets/bootstrap/_mixins.scss index 3195aa35..146805b3 100644 --- a/vendor/assets/stylesheets/bootstrap/_mixins.scss +++ b/vendor/assets/stylesheets/bootstrap/_mixins.scss @@ -147,17 +147,17 @@ // Transformations @mixin rotate($degrees) { -webkit-transform: rotate($degrees); - -ms-transform: rotate($degrees); // IE9 only + -ms-transform: rotate($degrees); // IE9+ transform: rotate($degrees); } -@mixin scale($ratio, $ratio-y...) { - -webkit-transform: scale($ratio, $ratio-y); - -ms-transform: scale($ratio, $ratio-y); // IE9 only - transform: scale($ratio, $ratio-y); +@mixin scale($ratio) { + -webkit-transform: scale($ratio); + -ms-transform: scale($ratio); // IE9+ + transform: scale($ratio); } @mixin translate($x, $y) { -webkit-transform: translate($x, $y); - -ms-transform: translate($x, $y); // IE9 only + -ms-transform: translate($x, $y); // IE9+ transform: translate($x, $y); } @mixin skew($x, $y) { @@ -172,12 +172,12 @@ @mixin rotateX($degrees) { -webkit-transform: rotateX($degrees); - -ms-transform: rotateX($degrees); // IE9 only + -ms-transform: rotateX($degrees); // IE9+ transform: rotateX($degrees); } @mixin rotateY($degrees) { -webkit-transform: rotateY($degrees); - -ms-transform: rotateY($degrees); // IE9 only + -ms-transform: rotateY($degrees); // IE9+ transform: rotateY($degrees); } @mixin perspective($perspective) { @@ -193,7 +193,6 @@ @mixin transform-origin($origin) { -webkit-transform-origin: $origin; -moz-transform-origin: $origin; - -ms-transform-origin: $origin; // IE9 only transform-origin: $origin; } @@ -202,30 +201,6 @@ -webkit-animation: $animation; animation: $animation; } -@mixin animation-name($name) { - -webkit-animation-name: $name; - animation-name: $name; -} -@mixin animation-duration($duration) { - -webkit-animation-duration: $duration; - animation-duration: $duration; -} -@mixin animation-timing-function($timing-function) { - -webkit-animation-timing-function: $timing-function; - animation-timing-function: $timing-function; -} -@mixin animation-delay($delay) { - -webkit-animation-delay: $delay; - animation-delay: $delay; -} -@mixin animation-iteration-count($iteration-count) { - -webkit-animation-iteration-count: $iteration-count; - animation-iteration-count: $iteration-count; -} -@mixin animation-direction($direction) { - -webkit-animation-direction: $direction; - animation-direction: $direction; -} // Backface visibility // Prevent browsers from flickering when using CSS 3D transforms. @@ -438,59 +413,29 @@ @mixin table-row-variant($state, $background) { // Exact selectors below required to override `.table-striped` and prevent // inheritance to nested tables. - .table > thead > tr, - .table > tbody > tr, - .table > tfoot > tr { - > td.#{$state}, - > th.#{$state}, - &.#{$state} > td, - &.#{$state} > th { - background-color: $background; + .table { + > thead, + > tbody, + > tfoot { + > tr > .#{$state}, + > .#{$state} > td, + > .#{$state} > th { + background-color: $background; + } } } // Hover states for `.table-hover` // Note: this is not available for cells or rows within `thead` or `tfoot`. - .table-hover > tbody > tr { - > td.#{$state}:hover, - > th.#{$state}:hover, - &.#{$state}:hover > td, - &.#{$state}:hover > th { + .table-hover > tbody { + > tr > .#{$state}:hover, + > .#{$state}:hover > td, + > .#{$state}:hover > th { background-color: darken($background, 5%); } } } -// List Groups -// ------------------------- -@mixin list-group-item-variant($state, $background, $color) { - .list-group-item-#{$state} { - color: $color; - background-color: $background; - - // [converter] extracted a& to a.list-group-item-#{$state} - } - - a.list-group-item-#{$state} { - color: $color; - - .list-group-item-heading { color: inherit; } - - &:hover, - &:focus { - color: $color; - background-color: darken($background, 5%); - } - &.active, - &.active:hover, - &.active:focus { - color: #fff; - background-color: $color; - border-color: $color; - } - } -} - // Button variants // ------------------------- // Easily pump out default styles, as well as :hover, :focus, :active, @@ -535,7 +480,7 @@ .badge { color: $background; - background-color: $color; + background-color: #fff; } } @@ -647,39 +592,30 @@ position: relative; float: left; width: percentage(($columns / $grid-columns)); + // Prevent columns from collapsing when empty min-height: 1px; + // Inner gutter via padding padding-left: ($gutter / 2); padding-right: ($gutter / 2); } -@mixin make-xs-column-offset($columns) { - @media (min-width: $screen-xs-min) { - margin-left: percentage(($columns / $grid-columns)); - } -} -@mixin make-xs-column-push($columns) { - @media (min-width: $screen-xs-min) { - left: percentage(($columns / $grid-columns)); - } -} -@mixin make-xs-column-pull($columns) { - @media (min-width: $screen-xs-min) { - right: percentage(($columns / $grid-columns)); - } -} - // Generate the small columns @mixin 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-sm-min) { float: left; width: percentage(($columns / $grid-columns)); } } + +// Generate the small column offsets @mixin make-sm-column-offset($columns) { @media (min-width: $screen-sm-min) { margin-left: percentage(($columns / $grid-columns)); @@ -696,19 +632,23 @@ } } - // Generate the medium columns @mixin 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-md-min) { float: left; width: percentage(($columns / $grid-columns)); } } + +// Generate the medium column offsets @mixin make-md-column-offset($columns) { @media (min-width: $screen-md-min) { margin-left: percentage(($columns / $grid-columns)); @@ -725,19 +665,23 @@ } } - // Generate the large columns @mixin 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-lg-min) { float: left; width: percentage(($columns / $grid-columns)); } } + +// Generate the large column offsets @mixin make-lg-column-offset($columns) { @media (min-width: $screen-lg-min) { margin-left: percentage(($columns / $grid-columns)); @@ -856,10 +800,6 @@ border-color: $border-color; background-color: $background-color; } - // Optional feedack icon - .form-control-feedback { - color: $text-color; - } } // Form control focus state diff --git a/vendor/assets/stylesheets/bootstrap/_modals.scss b/vendor/assets/stylesheets/bootstrap/_modals.scss index 83385b24..c79be928 100644 --- a/vendor/assets/stylesheets/bootstrap/_modals.scss +++ b/vendor/assets/stylesheets/bootstrap/_modals.scss @@ -22,12 +22,7 @@ right: 0; bottom: 0; left: 0; - z-index: $zindex-modal; - -webkit-overflow-scrolling: touch; - - // Prevent Chrome on Windows from adding a focus outline. For details, see - // https://github.com/twbs/bootstrap/pull/10951. - outline: 0; + z-index: $zindex-modal-background; // When fading in the modal, animate it to slide down &.fade .modal-dialog { @@ -42,6 +37,7 @@ position: relative; width: auto; margin: 10px; + z-index: ($zindex-modal-background + 10); } // Actual modal @@ -64,11 +60,11 @@ right: 0; bottom: 0; left: 0; - z-index: $zindex-modal-background; + z-index: ($zindex-modal-background - 10); background-color: $modal-backdrop-bg; // Fade for backdrop &.fade { @include opacity(0); } - &.in { @include opacity($modal-backdrop-opacity); } + &.in { @include opacity(.5); } } // Modal header @@ -120,9 +116,8 @@ } // Scale up the modal -@media (min-width: $screen-sm-min) { +@media screen and (min-width: $screen-sm-min) { - // Automatically set modal's width for larger viewports .modal-dialog { width: 600px; margin: 30px auto; @@ -131,8 +126,4 @@ @include box-shadow(0 5px 15px rgba(0,0,0,.5)); } - // Modal sizes - .modal-sm { width: $modal-sm; } - .modal-lg { width: $modal-lg; } - } diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 965356e9..c3c57ba1 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -93,17 +93,14 @@ // // When a container is present, change the behavior of the header and collapse. -.container, -.container-fluid { - > .navbar-header, - > .navbar-collapse { - margin-right: -$navbar-padding-horizontal; - margin-left: -$navbar-padding-horizontal; - - @media (min-width: $grid-float-breakpoint) { - margin-right: 0; - margin-left: 0; - } +.container > .navbar-header, +.container > .navbar-collapse { + margin-right: -$navbar-padding-horizontal; + margin-left: -$navbar-padding-horizontal; + + @media (min-width: $grid-float-breakpoint) { + margin-right: 0; + margin-left: 0; } } @@ -161,16 +158,8 @@ text-decoration: none; } - // Prevent Glyphicons from increasing height of navbar - > .glyphicon { - float: left; - margin-top: -2px; - margin-right: 5px; - } - @media (min-width: $grid-float-breakpoint) { - .navbar > .container &, - .navbar > .container-fluid & { + .navbar > .container & { margin-left: -$navbar-padding-horizontal; } } @@ -212,7 +201,7 @@ // Navbar nav links // -// Builds on top of the `.nav` components with its own modifier class to make +// 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 { @@ -340,6 +329,13 @@ @include border-bottom-radius(0); } +// Right aligned menus need alt position +.navbar-nav.pull-right > li > .dropdown-menu, +.navbar-nav > li > .dropdown-menu.pull-right { + left: auto; + right: 0; +} + // Buttons in navbars // diff --git a/vendor/assets/stylesheets/bootstrap/_navs.scss b/vendor/assets/stylesheets/bootstrap/_navs.scss index c690072b..6fa0095f 100644 --- a/vendor/assets/stylesheets/bootstrap/_navs.scss +++ b/vendor/assets/stylesheets/bootstrap/_navs.scss @@ -91,7 +91,7 @@ } } - // Active state, and its :hover to override normal :hover + // Active state, and it's :hover to override normal :hover &.active > a { &, &:hover, diff --git a/vendor/assets/stylesheets/bootstrap/_pager.scss b/vendor/assets/stylesheets/bootstrap/_pager.scss index 6531fe6f..e067a3da 100644 --- a/vendor/assets/stylesheets/bootstrap/_pager.scss +++ b/vendor/assets/stylesheets/bootstrap/_pager.scss @@ -15,15 +15,15 @@ > span { display: inline-block; padding: 5px 14px; - background-color: $pager-bg; - border: 1px solid $pager-border; + background-color: $pagination-bg; + border: 1px solid $pagination-border; border-radius: $pager-border-radius; } > a:hover, > a:focus { text-decoration: none; - background-color: $pager-hover-bg; + background-color: $pagination-hover-bg; } } @@ -47,7 +47,7 @@ > a:focus, > span { color: $pager-disabled-color; - background-color: $pager-bg; + background-color: $pagination-bg; cursor: not-allowed; } } diff --git a/vendor/assets/stylesheets/bootstrap/_pagination.scss b/vendor/assets/stylesheets/bootstrap/_pagination.scss index 44c12226..44d4c239 100644 --- a/vendor/assets/stylesheets/bootstrap/_pagination.scss +++ b/vendor/assets/stylesheets/bootstrap/_pagination.scss @@ -16,7 +16,6 @@ padding: $padding-base-vertical $padding-base-horizontal; line-height: $line-height-base; text-decoration: none; - color: $pagination-color; background-color: $pagination-bg; border: 1px solid $pagination-border; margin-left: -1px; @@ -40,9 +39,7 @@ > li > span { &:hover, &:focus { - color: $pagination-hover-color; background-color: $pagination-hover-bg; - border-color: $pagination-hover-border; } } @@ -54,7 +51,7 @@ z-index: 2; color: $pagination-active-color; background-color: $pagination-active-bg; - border-color: $pagination-active-border; + border-color: $pagination-active-bg; cursor: default; } } @@ -67,8 +64,8 @@ > a:hover, > a:focus { color: $pagination-disabled-color; - background-color: $pagination-disabled-bg; - border-color: $pagination-disabled-border; + background-color: $pagination-bg; + border-color: $pagination-border; cursor: not-allowed; } } diff --git a/vendor/assets/stylesheets/bootstrap/_panels.scss b/vendor/assets/stylesheets/bootstrap/_panels.scss index 440c0c57..6b0ec1fe 100644 --- a/vendor/assets/stylesheets/bootstrap/_panels.scss +++ b/vendor/assets/stylesheets/bootstrap/_panels.scss @@ -14,7 +14,7 @@ // Panel contents .panel-body { - padding: $panel-body-padding; + padding: 15px; @include clearfix(); } @@ -59,20 +59,6 @@ > .table, > .table-responsive > .table { margin-bottom: 0; - - > tbody:last-child, - > tfoot:last-child { - > tr:last-child { - td:first-child, - th:first-child { - border-bottom-left-radius: ($panel-border-radius - 1); - } - td:last-child, - th:last-child { - border-bottom-right-radius: ($panel-border-radius - 1); - } - } - } } > .panel-body + .table, > .panel-body + .table-responsive { @@ -116,14 +102,14 @@ .panel-heading { padding: 10px 15px; border-bottom: 1px solid transparent; - @include border-top-radius(($panel-border-radius - 1)); + @include border-top-radius($panel-border-radius - 1); > .dropdown .dropdown-toggle { color: inherit; } } -// Within heading, strip any `h*` tag of its default margins for spacing. +// Within heading, strip any `h*` tag of it's default margins for spacing. .panel-title { margin-top: 0; margin-bottom: 0; @@ -140,7 +126,7 @@ padding: 10px 15px; background-color: $panel-footer-bg; border-top: 1px solid $panel-inner-border; - @include border-bottom-radius(($panel-border-radius - 1)); + @include border-bottom-radius($panel-border-radius - 1); } diff --git a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss index e6256d32..8e65147c 100644 --- a/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +++ b/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss @@ -25,56 +25,174 @@ // Visibility utilities @include responsive-invisibility('.visible-xs'); - @media (max-width: $screen-xs-max) { @include responsive-visibility('.visible-xs'); } +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-visibility('.visible-xs.visible-sm'); +} + + +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-visibility('.visible-xs.visible-md'); +} + + +@media (min-width: $screen-lg-min) { + @include responsive-visibility('.visible-xs.visible-lg'); +} + + @include responsive-invisibility('.visible-sm'); +@media (max-width: $screen-xs-max) { + @include responsive-visibility('.visible-sm.visible-xs'); +} + @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { @include responsive-visibility('.visible-sm'); } +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-visibility('.visible-sm.visible-md'); +} + + +@media (min-width: $screen-lg-min) { + @include responsive-visibility('.visible-sm.visible-lg'); +} + + @include responsive-invisibility('.visible-md'); +@media (max-width: $screen-xs-max) { + @include responsive-visibility('.visible-md.visible-xs'); +} + + +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-visibility('.visible-md.visible-sm'); +} + @media (min-width: $screen-md-min) and (max-width: $screen-md-max) { @include responsive-visibility('.visible-md'); } +@media (min-width: $screen-lg-min) { + @include responsive-visibility('.visible-md.visible-lg'); +} + + @include responsive-invisibility('.visible-lg'); +@media (max-width: $screen-xs-max) { + @include responsive-visibility('.visible-lg.visible-xs'); +} + + +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-visibility('.visible-lg.visible-sm'); +} + + +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-visibility('.visible-lg.visible-md'); +} + @media (min-width: $screen-lg-min) { @include responsive-visibility('.visible-lg'); } +@include responsive-visibility('.hidden-xs'); @media (max-width: $screen-xs-max) { @include responsive-invisibility('.hidden-xs'); } @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-invisibility('.hidden-xs.hidden-sm'); +} + + +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-invisibility('.hidden-xs.hidden-md'); +} + + +@media (min-width: $screen-lg-min) { + @include responsive-invisibility('.hidden-xs.hidden-lg'); +} + + +@include responsive-visibility('.hidden-sm'); + +@media (max-width: $screen-xs-max) { + @include responsive-invisibility('.hidden-sm.hidden-xs'); +} + +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { @include responsive-invisibility('.hidden-sm'); } @media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-invisibility('.hidden-sm.hidden-md'); +} + + +@media (min-width: $screen-lg-min) { + @include responsive-invisibility('.hidden-sm.hidden-lg'); +} + + +@include responsive-visibility('.hidden-md'); + +@media (max-width: $screen-xs-max) { + @include responsive-invisibility('.hidden-md.hidden-xs'); +} + + +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-invisibility('.hidden-md.hidden-sm'); +} + +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { @include responsive-invisibility('.hidden-md'); } @media (min-width: $screen-lg-min) { - @include responsive-invisibility('.hidden-lg'); + @include responsive-invisibility('.hidden-md.hidden-lg'); } +@include responsive-visibility('.hidden-lg'); + +@media (max-width: $screen-xs-max) { + @include responsive-invisibility('.hidden-lg.hidden-xs'); +} + + +@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) { + @include responsive-invisibility('.hidden-lg.hidden-sm'); +} + + +@media (min-width: $screen-md-min) and (max-width: $screen-md-max) { + @include responsive-invisibility('.hidden-lg.hidden-md'); +} + +@media (min-width: $screen-lg-min) { + @include responsive-invisibility('.hidden-lg'); +} + // Print utilities -// -// Media queries are placed on the inside to be mixin-friendly. @include responsive-invisibility('.visible-print'); @media print { + @include responsive-visibility('.visible-print'); -} -@media print { + @include responsive-invisibility('.hidden-print'); + } diff --git a/vendor/assets/stylesheets/bootstrap/_tables.scss b/vendor/assets/stylesheets/bootstrap/_tables.scss index 01630fe2..8cd1506a 100644 --- a/vendor/assets/stylesheets/bootstrap/_tables.scss +++ b/vendor/assets/stylesheets/bootstrap/_tables.scss @@ -141,7 +141,6 @@ table { td, th { &[class*="col-"] { - position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623) float: none; display: table-cell; } @@ -157,9 +156,8 @@ table { // Generate the contextual variants @include table-row-variant('active', $table-bg-active); @include table-row-variant('success', $state-success-bg); -@include table-row-variant('warning', $state-warning-bg); @include table-row-variant('danger', $state-danger-bg); -@include table-row-variant('info', $state-info-bg); +@include table-row-variant('warning', $state-warning-bg); // Responsive tables diff --git a/vendor/assets/stylesheets/bootstrap/_theme.scss b/vendor/assets/stylesheets/bootstrap/_theme.scss index 73d40c94..988c37ce 100644 --- a/vendor/assets/stylesheets/bootstrap/_theme.scss +++ b/vendor/assets/stylesheets/bootstrap/_theme.scss @@ -3,8 +3,8 @@ // Load core variables and mixins // -------------------------------------------------- -@import "variables"; -@import "mixins"; +@import "bootstrap/variables"; +@import "bootstrap/mixins"; diff --git a/vendor/assets/stylesheets/bootstrap/_tooltip.scss b/vendor/assets/stylesheets/bootstrap/_tooltip.scss index dec674cb..a681adcb 100644 --- a/vendor/assets/stylesheets/bootstrap/_tooltip.scss +++ b/vendor/assets/stylesheets/bootstrap/_tooltip.scss @@ -13,7 +13,7 @@ line-height: 1.4; @include opacity(0); - &.in { @include opacity($tooltip-opacity); } + &.in { @include opacity(.9); } &.top { margin-top: -3px; padding: $tooltip-arrow-width 0; } &.right { margin-left: 3px; padding: 0 $tooltip-arrow-width; } &.bottom { margin-top: 3px; padding: $tooltip-arrow-width 0; } diff --git a/vendor/assets/stylesheets/bootstrap/_type.scss b/vendor/assets/stylesheets/bootstrap/_type.scss index 329b894e..979f5d05 100644 --- a/vendor/assets/stylesheets/bootstrap/_type.scss +++ b/vendor/assets/stylesheets/bootstrap/_type.scss @@ -21,9 +21,9 @@ h1, h2, h3, h4, h5, h6, } } -h1, .h1, -h2, .h2, -h3, .h3 { +h1, +h2, +h3 { margin-top: $line-height-computed; margin-bottom: ($line-height-computed / 2); @@ -32,9 +32,9 @@ h3, .h3 { font-size: 65%; } } -h4, .h4, -h5, .h5, -h6, .h6 { +h4, +h5, +h6 { margin-top: ($line-height-computed / 2); margin-bottom: ($line-height-computed / 2); @@ -61,7 +61,7 @@ p { .lead { margin-bottom: $line-height-computed; - font-size: floor(($font-size-base * 1.15)); + font-size: floor($font-size-base * 1.15); font-weight: 200; line-height: 1.4; @@ -81,13 +81,7 @@ small, // Undo browser default styling cite { font-style: normal; } -// Alignment -.text-left { text-align: left; } -.text-right { text-align: right; } -.text-center { text-align: center; } -.text-justify { text-align: justify; } - -// Contextual colors +// Contextual emphasis .text-muted { color: $text-muted; } @@ -122,52 +116,10 @@ cite { font-style: normal; } } } -// Contextual backgrounds -// For now we'll leave these alongside the text classes until v4 when we can -// safely shift things around (per SemVer rules). -.bg-primary { - // Given the contrast here, this is the only class to have its color inverted - // automatically. - color: #fff; - background-color: $brand-primary; - // [converter] extracted a&:hover to a.bg-primary:hover -} - -a.bg-primary:hover { - background-color: darken($brand-primary, 10%); -} -.bg-warning { - background-color: $state-warning-bg; - // [converter] extracted a&:hover to a.bg-primary:hover -} - -a.bg-primary:hover { - background-color: darken($state-warning-bg, 10%); -} -.bg-danger { - background-color: $state-danger-bg; - // [converter] extracted a&:hover to a.bg-primary:hover -} - -a.bg-primary:hover { - background-color: darken($state-danger-bg, 10%); -} -.bg-success { - background-color: $state-success-bg; - // [converter] extracted a&:hover to a.bg-primary:hover -} - -a.bg-primary:hover { - background-color: darken($state-success-bg, 10%); -} -.bg-info { - background-color: $state-info-bg; - // [converter] extracted a&:hover to a.bg-primary:hover -} - -a.bg-primary:hover { - background-color: darken($state-info-bg, 10%); -} +// Alignment +.text-left { text-align: left; } +.text-right { text-align: right; } +.text-center { text-align: center; } // Page header @@ -273,51 +225,44 @@ abbr[data-original-title] { blockquote { padding: ($line-height-computed / 2) $line-height-computed; margin: 0 0 $line-height-computed; - font-size: ($font-size-base * 1.25); border-left: 5px solid $blockquote-border-color; - - p, - ul, - ol { - &:last-child { - margin-bottom: 0; - } + p { + font-size: ($font-size-base * 1.25); + font-weight: 300; + line-height: 1.25; + } + p:last-child { + margin-bottom: 0; } - - // Deprecating small and .small for v3.1 - // Context: https://github.com/twbs/bootstrap/issues/11660 - footer, small, .small { display: block; - font-size: 80%; // back to default font-size line-height: $line-height-base; color: $blockquote-small-color; - &:before { - content: '\2014 \00A0'; // em dash, nbsp + content: '\2014 \00A0'; // EM DASH, NBSP } } -} - -// Opposite alignment of blockquote -// -// Heads up: `blockquote.pull-right` has been deprecated as of v3.1. -.blockquote-reverse, -blockquote.pull-right { - padding-right: 15px; - padding-left: 0; - border-right: 5px solid $blockquote-border-color; - border-left: 0; - text-align: right; - // Account for citation - footer, - small, - .small { - &:before { content: ''; } - &:after { - content: '\00A0 \2014'; // nbsp, em dash + // Float right with text-align: right + &.pull-right { + padding-right: 15px; + padding-left: 0; + border-right: 5px solid $blockquote-border-color; + border-left: 0; + p, + small, + .small { + text-align: right; + } + small, + .small { + &:before { + content: ''; + } + &:after { + content: '\00A0 \2014'; // NBSP, EM DASH + } } } } diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index da3c044a..5b477e9d 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -1,7 +1,5 @@ -// a flag to toggle asset pipeline / compass integration -// defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side) -// in Sass 3.3 this can be improved with: function-exists(twbs-font-path) -$bootstrap-sass-asset-helper: (twbs-font-path('') != unquote("twbs-font-path('')")) !default; +// bootstrap specific variable. set to false if not using ruby + asset pipeline / compass. +$bootstrap-sass-asset-helper: true !default; // // Variables // -------------------------------------------------- @@ -49,20 +47,20 @@ $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !def $font-family-base: $font-family-sans-serif !default; $font-size-base: 14px !default; -$font-size-large: ceil(($font-size-base * 1.25)) !default; // ~18px -$font-size-small: ceil(($font-size-base * 0.85)) !default; // ~12px +$font-size-large: ceil($font-size-base * 1.25) !default; // ~18px +$font-size-small: ceil($font-size-base * 0.85) !default; // ~12px -$font-size-h1: floor(($font-size-base * 2.6)) !default; // ~36px -$font-size-h2: floor(($font-size-base * 2.15)) !default; // ~30px -$font-size-h3: ceil(($font-size-base * 1.7)) !default; // ~24px -$font-size-h4: ceil(($font-size-base * 1.25)) !default; // ~18px +$font-size-h1: floor($font-size-base * 2.6) !default; // ~36px +$font-size-h2: floor($font-size-base * 2.15) !default; // ~30px +$font-size-h3: ceil($font-size-base * 1.7) !default; // ~24px +$font-size-h4: ceil($font-size-base * 1.25) !default; // ~18px $font-size-h5: $font-size-base !default; -$font-size-h6: ceil(($font-size-base * 0.85)) !default; // ~12px +$font-size-h6: ceil($font-size-base * 0.85) !default; // ~12px $line-height-base: 1.428571429 !default; // 20/14 -$line-height-computed: floor(($font-size-base * $line-height-base)) !default; // ~20px +$line-height-computed: floor($font-size-base * $line-height-base) !default; // ~20px -$headings-font-family: inherit !default; +$headings-font-family: $font-family-base !default; $headings-font-weight: 500 !default; $headings-line-height: 1.1 !default; $headings-color: inherit !default; @@ -193,9 +191,6 @@ $dropdown-link-disabled-color: $gray-light !default; $dropdown-header-color: $gray-light !default; -// Note: Deprecated $dropdown-caret-color as of v3.1.0 -$dropdown-caret-color: #000 !default; - // COMPONENT VARIABLES // -------------------------------------------------- @@ -270,7 +265,7 @@ $grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default; $navbar-height: 50px !default; $navbar-margin-bottom: $line-height-computed !default; $navbar-border-radius: $border-radius-base !default; -$navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; +$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default; $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; $navbar-default-color: #777 !default; @@ -293,7 +288,7 @@ $navbar-default-brand-hover-bg: transparent !default; // Navbar toggle $navbar-default-toggle-hover-bg: #ddd !default; -$navbar-default-toggle-icon-bar-bg: #888 !default; +$navbar-default-toggle-icon-bar-bg: #ccc !default; $navbar-default-toggle-border-color: #ddd !default; @@ -356,36 +351,22 @@ $nav-pills-active-link-hover-color: $component-active-color !default; // Pagination // ------------------------- -$pagination-color: $link-color !default; $pagination-bg: #fff !default; $pagination-border: #ddd !default; -$pagination-hover-color: $link-hover-color !default; $pagination-hover-bg: $gray-lighter !default; -$pagination-hover-border: #ddd !default; -$pagination-active-color: #fff !default; $pagination-active-bg: $brand-primary !default; -$pagination-active-border: $brand-primary !default; +$pagination-active-color: #fff !default; $pagination-disabled-color: $gray-light !default; -$pagination-disabled-bg: #fff !default; -$pagination-disabled-border: #ddd !default; // Pager // ------------------------- -$pager-bg: $pagination-bg !default; -$pager-border: $pagination-border !default; $pager-border-radius: 15px !default; - -$pager-hover-bg: $pagination-hover-bg !default; - -$pager-active-bg: $pagination-active-bg !default; -$pager-active-color: $pagination-active-color !default; - -$pager-disabled-color: $pagination-disabled-color !default; +$pager-disabled-color: $gray-light !default; // Jumbotron @@ -395,7 +376,7 @@ $jumbotron-padding: 30px !default; $jumbotron-color: inherit !default; $jumbotron-bg: $gray-lighter !default; $jumbotron-heading-color: inherit !default; -$jumbotron-font-size: ceil(($font-size-base * 1.5)) !default; +$jumbotron-font-size: ceil($font-size-base * 1.5) !default; // Form states and alerts @@ -423,7 +404,6 @@ $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%) ! $tooltip-max-width: 200px !default; $tooltip-color: #fff !default; $tooltip-bg: #000 !default; -$tooltip-opacity: .9 !default; $tooltip-arrow-width: 5px !default; $tooltip-arrow-color: $tooltip-bg !default; @@ -472,13 +452,9 @@ $modal-content-border-color: rgba(0,0,0,.2) !default; $modal-content-fallback-border-color: #999 !default; $modal-backdrop-bg: #000 !default; -$modal-backdrop-opacity: .5 !default; $modal-header-border-color: #e5e5e5 !default; $modal-footer-border-color: $modal-header-border-color !default; -$modal-lg: 900px !default; -$modal-sm: 300px !default; - // Alerts // ------------------------- @@ -517,26 +493,24 @@ $progress-bar-info-bg: $brand-info !default; // List group // ------------------------- -$list-group-bg: #fff !default; -$list-group-border: #ddd !default; -$list-group-border-radius: $border-radius-base !default; +$list-group-bg: #fff !default; +$list-group-border: #ddd !default; +$list-group-border-radius: $border-radius-base !default; + +$list-group-hover-bg: #f5f5f5 !default; +$list-group-active-color: $component-active-color !default; +$list-group-active-bg: $component-active-bg !default; +$list-group-active-border: $list-group-active-bg !default; -$list-group-hover-bg: #f5f5f5 !default; -$list-group-active-color: $component-active-color !default; -$list-group-active-bg: $component-active-bg !default; -$list-group-active-border: $list-group-active-bg !default; -$list-group-active-text-color: lighten($list-group-active-bg, 40%) !default; +$list-group-link-color: #555 !default; +$list-group-link-heading-color: #333 !default; -$list-group-link-color: #555 !default; -$list-group-link-heading-color: #333 !default; // Panels // ------------------------- $panel-bg: #fff !default; -$panel-body-padding: 15px !default; -$panel-border-radius: $border-radius-base !default; - $panel-inner-border: #ddd !default; +$panel-border-radius: $border-radius-base !default; $panel-footer-bg: #f5f5f5 !default; $panel-default-text: $gray-dark !default; @@ -578,7 +552,6 @@ $thumbnail-caption-padding: 9px !default; // Wells // ------------------------- $well-bg: #f5f5f5 !default; -$well-border: darken($well-bg, 7%) !default; // Badges @@ -597,12 +570,10 @@ $badge-border-radius: 10px !default; // Breadcrumbs // ------------------------- -$breadcrumb-padding-vertical: 8px !default; -$breadcrumb-padding-horizontal: 15px !default; -$breadcrumb-bg: #f5f5f5 !default; -$breadcrumb-color: #ccc !default; -$breadcrumb-active-color: $gray-light !default; -$breadcrumb-separator: "/" !default; +$breadcrumb-bg: #f5f5f5 !default; +$breadcrumb-color: #ccc !default; +$breadcrumb-active-color: $gray-light !default; +$breadcrumb-separator: "/" !default; // Carousel @@ -633,9 +604,6 @@ $close-text-shadow: 0 1px 0 #fff !default; $code-color: #c7254e !default; $code-bg: #f9f2f4 !default; -$kbd-color: #fff !default; -$kbd-bg: #333 !default; - $pre-bg: #f5f5f5 !default; $pre-color: $gray-dark !default; $pre-border-color: #ccc !default; diff --git a/vendor/assets/stylesheets/bootstrap/_wells.scss b/vendor/assets/stylesheets/bootstrap/_wells.scss index b8657118..882c083e 100644 --- a/vendor/assets/stylesheets/bootstrap/_wells.scss +++ b/vendor/assets/stylesheets/bootstrap/_wells.scss @@ -9,7 +9,7 @@ padding: 19px; margin-bottom: 20px; background-color: $well-bg; - border: 1px solid $well-border; + border: 1px solid darken($well-bg, 7%); border-radius: $border-radius-base; @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05)); blockquote { |