Repository: tapestry-5 Updated Branches: refs/heads/master ed93afe55 -> a90606c80
upgrade Bootstrap to 3.3.4 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/a90606c8 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/a90606c8 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/a90606c8 Branch: refs/heads/master Commit: a90606c80978be7498dc6b795159571b9d752e7a Parents: ed93afe Author: Jochen Kemnade <[email protected]> Authored: Mon Mar 16 16:50:53 2015 +0100 Committer: Jochen Kemnade <[email protected]> Committed: Mon Mar 16 16:50:53 2015 +0100 ---------------------------------------------------------------------- build.gradle | 2 +- .../tapestry5/bootstrap/css/bootstrap-theme.css | 2 +- .../tapestry5/bootstrap/css/bootstrap.css | 48 +++++++++----- .../assets/tapestry5/bootstrap/js/affix.js | 10 +-- .../assets/tapestry5/bootstrap/js/alert.js | 4 +- .../assets/tapestry5/bootstrap/js/button.js | 4 +- .../assets/tapestry5/bootstrap/js/carousel.js | 12 ++-- .../assets/tapestry5/bootstrap/js/collapse.js | 14 ++-- .../assets/tapestry5/bootstrap/js/dropdown.js | 6 +- .../assets/tapestry5/bootstrap/js/modal.js | 67 ++++++++++++-------- .../assets/tapestry5/bootstrap/js/popover.js | 11 +--- .../assets/tapestry5/bootstrap/js/scrollspy.js | 37 +++++------ .../assets/tapestry5/bootstrap/js/tab.js | 6 +- .../assets/tapestry5/bootstrap/js/tooltip.js | 30 +++++---- .../assets/tapestry5/bootstrap/js/transition.js | 2 +- .../src/test/webapp/bootstrap/js/affix.js | 10 +-- .../src/test/webapp/bootstrap/js/alert.js | 4 +- .../src/test/webapp/bootstrap/js/button.js | 4 +- .../src/test/webapp/bootstrap/js/carousel.js | 12 ++-- .../src/test/webapp/bootstrap/js/collapse.js | 14 ++-- .../src/test/webapp/bootstrap/js/dropdown.js | 6 +- .../src/test/webapp/bootstrap/js/modal.js | 67 ++++++++++++-------- .../src/test/webapp/bootstrap/js/popover.js | 11 +--- .../src/test/webapp/bootstrap/js/scrollspy.js | 37 +++++------ .../src/test/webapp/bootstrap/js/tab.js | 6 +- .../src/test/webapp/bootstrap/js/tooltip.js | 30 +++++---- .../src/test/webapp/bootstrap/js/transition.js | 2 +- .../src/test/webapp/bootstrap/less/alerts.less | 4 +- .../src/test/webapp/bootstrap/less/badges.less | 11 ++-- .../bootstrap/less/component-animations.less | 3 +- .../test/webapp/bootstrap/less/dropdowns.less | 2 +- .../src/test/webapp/bootstrap/less/forms.less | 12 +++- .../test/webapp/bootstrap/less/glyphicons.less | 4 ++ .../test/webapp/bootstrap/less/jumbotron.less | 2 +- .../src/test/webapp/bootstrap/less/modals.less | 4 +- .../src/test/webapp/bootstrap/less/navbar.less | 1 - .../src/test/webapp/bootstrap/less/navs.less | 2 - .../webapp/bootstrap/less/responsive-embed.less | 16 ++--- .../test/webapp/bootstrap/less/scaffolding.less | 12 ++++ .../src/test/webapp/bootstrap/less/tooltip.less | 1 - .../src/test/webapp/bootstrap/less/type.less | 2 +- .../test/webapp/bootstrap/less/utilities.less | 1 - .../test/webapp/bootstrap/less/variables.less | 6 +- 43 files changed, 303 insertions(+), 238 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 1396ec8..c740aa0 100755 --- a/build.gradle +++ b/build.gradle @@ -608,7 +608,7 @@ boolean checkJDK() { } task updateBootstrap << { - def bootstrapVersion = '3.3.2' + def bootstrapVersion = '3.3.4' def target = new File(temporaryDir, 'bootstrap.zip') ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip";, dest: target) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css index 37a291c..374a7e3 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.3.2 (http://getbootstrap.com) + * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css index f7c39eb..5773855 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css @@ -1,5 +1,5 @@ /*! - * Bootstrap v3.3.2 (http://getbootstrap.com) + * Bootstrap v3.3.4 (http://getbootstrap.com) * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -958,12 +958,24 @@ th { .glyphicon-bitcoin:before { content: "\e227"; } +.glyphicon-btc:before { + content: "\e227"; +} +.glyphicon-xbt:before { + content: "\e227"; +} .glyphicon-yen:before { content: "\00a5"; } +.glyphicon-jpy:before { + content: "\00a5"; +} .glyphicon-ruble:before { content: "\20bd"; } +.glyphicon-rub:before { + content: "\20bd"; +} .glyphicon-scale:before { content: "\e230"; } @@ -1161,6 +1173,9 @@ hr { overflow: visible; clip: auto; } +[role="button"] { + cursor: pointer; +} h1, h2, h3, @@ -2564,10 +2579,13 @@ output { .form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control { - cursor: not-allowed; background-color: #eee; opacity: 1; } +.form-control[disabled], +fieldset[disabled] .form-control { + cursor: not-allowed; +} textarea.form-control { height: auto; } @@ -2634,6 +2652,7 @@ input[type="search"] { } .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -2667,6 +2686,7 @@ fieldset[disabled] .checkbox label { cursor: not-allowed; } .form-control-static { + min-height: 34px; padding-top: 7px; padding-bottom: 7px; margin-bottom: 0; @@ -2708,6 +2728,7 @@ select[multiple].form-group-sm .form-control { } .form-group-sm .form-control-static { height: 30px; + min-height: 32px; padding: 5px 10px; font-size: 12px; line-height: 1.5; @@ -2744,6 +2765,7 @@ select[multiple].form-group-lg .form-control { } .form-group-lg .form-control-static { height: 46px; + min-height: 38px; padding: 10px 16px; font-size: 18px; line-height: 1.3333333; @@ -3365,11 +3387,9 @@ input[type="button"].btn-block { } .collapse { display: none; - visibility: hidden; } .collapse.in { display: block; - visibility: visible; } tr.collapse.in { display: table-row; @@ -3397,7 +3417,7 @@ tbody.collapse.in { height: 0; margin-left: 2px; vertical-align: middle; - border-top: 4px solid; + border-top: 4px dashed; border-right: 4px solid transparent; border-left: 4px solid transparent; } @@ -4037,11 +4057,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn { } .tab-content > .tab-pane { display: none; - visibility: hidden; } .tab-content > .active { display: block; - visibility: visible; } .nav-tabs .dropdown-menu { margin-top: -1px; @@ -4088,7 +4106,6 @@ select[multiple].input-group-sm > .input-group-btn > .btn { height: auto !important; padding-bottom: 0; overflow: visible !important; - visibility: visible !important; } .navbar-collapse.in { overflow-y: visible; @@ -4813,7 +4830,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } @@ -5645,10 +5663,10 @@ a.list-group-item-danger.active:focus { height: 100%; border: 0; } -.embed-responsive.embed-responsive-16by9 { +.embed-responsive-16by9 { padding-bottom: 56.25%; } -.embed-responsive.embed-responsive-4by3 { +.embed-responsive-4by3 { padding-bottom: 75%; } .well { @@ -5707,7 +5725,7 @@ button.close { right: 0; bottom: 0; left: 0; - z-index: 1040; + z-index: 1050; display: none; overflow: hidden; -webkit-overflow-scrolling: touch; @@ -5750,10 +5768,12 @@ button.close { box-shadow: 0 3px 9px rgba(0, 0, 0, .5); } .modal-backdrop { - position: absolute; + position: fixed; top: 0; right: 0; + bottom: 0; left: 0; + z-index: 1040; background-color: #000; } .modal-backdrop.fade { @@ -5828,7 +5848,6 @@ button.close { font-size: 12px; font-weight: normal; line-height: 1.4; - visibility: visible; filter: alpha(opacity=0); opacity: 0; } @@ -6348,7 +6367,6 @@ button.close { } .hidden { display: none !important; - visibility: hidden !important; } .affix { position: fixed; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js index aaebc8c..9819764 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.2 + * Bootstrap: affix.js v3.3.4 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -21,14 +21,14 @@ .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) this.$element = $(element) - this.affixed = - this.unpin = + this.affixed = null + this.unpin = null this.pinnedOffset = null this.checkPosition() } - Affix.VERSION = '3.3.2' + Affix.VERSION = '3.3.4' Affix.RESET = 'affix affix-top affix-bottom' @@ -78,7 +78,7 @@ var offset = this.options.offset var offsetTop = offset.top var offsetBottom = offset.bottom - var scrollHeight = $('body').height() + var scrollHeight = $(document.body).height() if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js index e8212ca..1925ef0 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.2 + * Bootstrap: alert.js v3.3.4 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.2' + Alert.VERSION = '3.3.4' Alert.TRANSITION_DURATION = 150 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js index 4d56901..7c7c021 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.2 + * Bootstrap: button.js v3.3.4 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.2' + Button.VERSION = '3.3.4' Button.DEFAULTS = { loadingText: 'loading...' http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js index 450e181..a38ef14 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.2 + * Bootstrap: carousel.js v3.3.4 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,10 +17,10 @@ this.$element = $(element) this.$indicators = this.$element.find('.carousel-indicators') this.options = options - this.paused = - this.sliding = - this.interval = - this.$active = + this.paused = null + this.sliding = null + this.interval = null + this.$active = null this.$items = null this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.2' + Carousel.VERSION = '3.3.4' Carousel.TRANSITION_DURATION = 600 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js index 2bc30e7..954513c 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.2 + * Bootstrap: collapse.js v3.3.4 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -16,7 +16,8 @@ var Collapse = function (element, options) { this.$element = $(element) this.options = $.extend({}, Collapse.DEFAULTS, options) - this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]') + this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + + '[data-toggle="collapse"][data-target="#' + element.id + '"]') this.transitioning = null if (this.options.parent) { @@ -28,13 +29,12 @@ if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.2' + Collapse.VERSION = '3.3.4' Collapse.TRANSITION_DURATION = 350 Collapse.DEFAULTS = { - toggle: true, - trigger: '[data-toggle="collapse"]' + toggle: true } Collapse.prototype.dimension = function () { @@ -172,7 +172,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') options.toggle = false + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) @@ -203,7 +203,7 @@ var $target = getTargetFromTrigger($this) var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this }) + var option = data ? 'toggle' : $this.data() Plugin.call($target, option) }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js index 200e1c6..9874600 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.2 + * Bootstrap: dropdown.js v3.3.4 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.2' + Dropdown.VERSION = '3.3.4' Dropdown.prototype.toggle = function (e) { var $this = $(this) @@ -72,7 +72,7 @@ return $this.trigger('click') } - var desc = ' li:not(.divider):visible a' + var desc = ' li:not(.disabled):visible a' var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) if (!$items.length) return http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js index e7704b8..c1eb2a8 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.2 + * Bootstrap: modal.js v3.3.4 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,12 +14,15 @@ // ====================== var Modal = function (element, options) { - this.options = options - this.$body = $(document.body) - this.$element = $(element) - this.$backdrop = - this.isShown = null - this.scrollbarWidth = 0 + this.options = options + this.$body = $(document.body) + this.$element = $(element) + this.$dialog = this.$element.find('.modal-dialog') + this.$backdrop = null + this.isShown = null + this.originalBodyPad = null + this.scrollbarWidth = 0 + this.ignoreBackdropClick = false if (this.options.remote) { this.$element @@ -30,7 +33,7 @@ } } - Modal.VERSION = '3.3.2' + Modal.VERSION = '3.3.4' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 @@ -64,6 +67,12 @@ this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + this.$dialog.on('mousedown.dismiss.bs.modal', function () { + that.$element.one('mouseup.dismiss.bs.modal', function (e) { + if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true + }) + }) + this.backdrop(function () { var transition = $.support.transition && that.$element.hasClass('fade') @@ -75,7 +84,6 @@ .show() .scrollTop(0) - if (that.options.backdrop) that.adjustBackdrop() that.adjustDialog() if (transition) { @@ -91,7 +99,7 @@ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) transition ? - that.$element.find('.modal-dialog') // wait for modal to slide in + that.$dialog // wait for modal to slide in .one('bsTransitionEnd', function () { that.$element.trigger('focus').trigger(e) }) @@ -120,6 +128,9 @@ .removeClass('in') .attr('aria-hidden', true) .off('click.dismiss.bs.modal') + .off('mouseup.dismiss.bs.modal') + + this.$dialog.off('mousedown.dismiss.bs.modal') $.support.transition && this.$element.hasClass('fade') ? this.$element @@ -180,13 +191,18 @@ var doAnimate = $.support.transition && animate this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') - .prependTo(this.$element) - .on('click.dismiss.bs.modal', $.proxy(function (e) { - if (e.target !== e.currentTarget) return - this.options.backdrop == 'static' - ? this.$element[0].focus.call(this.$element[0]) - : this.hide.call(this) - }, this)) + .appendTo(this.$body) + + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (this.ignoreBackdropClick) { + this.ignoreBackdropClick = false + return + } + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus() + : this.hide() + }, this)) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow @@ -221,16 +237,9 @@ // these following methods are used to handle overflowing modals Modal.prototype.handleUpdate = function () { - if (this.options.backdrop) this.adjustBackdrop() this.adjustDialog() } - Modal.prototype.adjustBackdrop = function () { - this.$backdrop - .css('height', 0) - .css('height', this.$element[0].scrollHeight) - } - Modal.prototype.adjustDialog = function () { var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight @@ -248,17 +257,23 @@ } Modal.prototype.checkScrollbar = function () { - this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight + var fullWindowWidth = window.innerWidth + if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 + var documentElementRect = document.documentElement.getBoundingClientRect() + fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) + } + this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth this.scrollbarWidth = this.measureScrollbar() } Modal.prototype.setScrollbar = function () { var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) + this.originalBodyPad = document.body.style.paddingRight || '' if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) } Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', '') + this.$body.css('padding-right', this.originalBodyPad) } Modal.prototype.measureScrollbar = function () { // thx walsh http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js index be65b11..0b0755e 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.2 + * Bootstrap: popover.js v3.3.4 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.VERSION = '3.3.2' + Popover.VERSION = '3.3.4' Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', @@ -75,11 +75,6 @@ return (this.$arrow = this.$arrow || this.tip().find('.arrow')) } - Popover.prototype.tip = function () { - if (!this.$tip) this.$tip = $(this.options.template) - return this.$tip - } - // POPOVER PLUGIN DEFINITION // ========================= @@ -90,7 +85,7 @@ var data = $this.data('bs.popover') var options = typeof option == 'object' && option - if (!data && option == 'destroy') return + if (!data && /destroy|hide/.test(option)) return if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js index 0987177..f860c1a 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.2 + * Bootstrap: scrollspy.js v3.3.4 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,10 +14,8 @@ // ========================== function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - - this.$body = $('body') - this.$scrollElement = $(element).is('body') ? $(window) : $(element) + this.$body = $(document.body) + this.$scrollElement = $(element).is(document.body) ? $(window) : $(element) this.options = $.extend({}, ScrollSpy.DEFAULTS, options) this.selector = (this.options.target || '') + ' .nav li > a' this.offsets = [] @@ -25,12 +23,12 @@ this.activeTarget = null this.scrollHeight = 0 - this.$scrollElement.on('scroll.bs.scrollspy', process) + this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)) this.refresh() this.process() } - ScrollSpy.VERSION = '3.3.2' + ScrollSpy.VERSION = '3.3.4' ScrollSpy.DEFAULTS = { offset: 10 @@ -41,20 +39,19 @@ } ScrollSpy.prototype.refresh = function () { - var offsetMethod = 'offset' - var offsetBase = 0 + var that = this + var offsetMethod = 'offset' + var offsetBase = 0 + + this.offsets = [] + this.targets = [] + this.scrollHeight = this.getScrollHeight() if (!$.isWindow(this.$scrollElement[0])) { offsetMethod = 'position' offsetBase = this.$scrollElement.scrollTop() } - this.offsets = [] - this.targets = [] - this.scrollHeight = this.getScrollHeight() - - var self = this - this.$body .find(this.selector) .map(function () { @@ -69,8 +66,8 @@ }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) + that.offsets.push(this[0]) + that.targets.push(this[1]) }) } @@ -99,7 +96,7 @@ for (i = offsets.length; i--;) { activeTarget != targets[i] && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) && this.activate(targets[i]) } } @@ -110,8 +107,8 @@ this.clear() var selector = this.selector + - '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' var active = $(selector) .parents('li') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js index ddb7fc9..935d5bc 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tab.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.2 + * Bootstrap: tab.js v3.3.4 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,7 +17,7 @@ this.element = $(element) } - Tab.VERSION = '3.3.2' + Tab.VERSION = '3.3.4' Tab.TRANSITION_DURATION = 150 @@ -88,7 +88,7 @@ element.removeClass('fade') } - if (element.parent('.dropdown-menu')) { + if (element.parent('.dropdown-menu').length) { element .closest('li.dropdown') .addClass('active') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js index 1856df5..2736788 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.2 + * Bootstrap: tooltip.js v3.3.4 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -15,17 +15,17 @@ // =============================== var Tooltip = function (element, options) { - this.type = - this.options = - this.enabled = - this.timeout = - this.hoverState = + this.type = null + this.options = null + this.enabled = null + this.timeout = null + this.hoverState = null this.$element = null this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.2' + Tooltip.VERSION = '3.3.4' Tooltip.TRANSITION_DURATION = 150 @@ -52,6 +52,10 @@ this.options = this.getOptions(options) this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + if (this.$element[0] instanceof document.constructor && !this.options.selector) { + throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') + } + var triggers = this.options.trigger.split(' ') for (var i = triggers.length; i--;) { @@ -272,10 +276,10 @@ this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) } - Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) { + Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { this.arrow() - .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isHorizontal ? 'top' : 'left', '') + .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isVertical ? 'top' : 'left', '') } Tooltip.prototype.setContent = function () { @@ -288,7 +292,7 @@ Tooltip.prototype.hide = function (callback) { var that = this - var $tip = this.tip() + var $tip = $(this.$tip) var e = $.Event('hide.bs.' + this.type) function complete() { @@ -305,7 +309,7 @@ $tip.removeClass('in') - $.support.transition && this.$tip.hasClass('fade') ? + $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : @@ -449,7 +453,7 @@ var data = $this.data('bs.tooltip') var options = typeof option == 'object' && option - if (!data && option == 'destroy') return + if (!data && /destroy|hide/.test(option)) return if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js index ec9ab68..f23e6bd 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/js/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.2 + * Bootstrap: transition.js v3.3.4 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2015 Twitter, Inc. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js b/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js index aaebc8c..9819764 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.3.2 + * Bootstrap: affix.js v3.3.4 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -21,14 +21,14 @@ .on('click.bs.affix.data-api', $.proxy(this.checkPositionWithEventLoop, this)) this.$element = $(element) - this.affixed = - this.unpin = + this.affixed = null + this.unpin = null this.pinnedOffset = null this.checkPosition() } - Affix.VERSION = '3.3.2' + Affix.VERSION = '3.3.4' Affix.RESET = 'affix affix-top affix-bottom' @@ -78,7 +78,7 @@ var offset = this.options.offset var offsetTop = offset.top var offsetBottom = offset.bottom - var scrollHeight = $('body').height() + var scrollHeight = $(document.body).height() if (typeof offset != 'object') offsetBottom = offsetTop = offset if (typeof offsetTop == 'function') offsetTop = offset.top(this.$element) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js b/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js index e8212ca..1925ef0 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.3.2 + * Bootstrap: alert.js v3.3.4 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -18,7 +18,7 @@ $(el).on('click', dismiss, this.close) } - Alert.VERSION = '3.3.2' + Alert.VERSION = '3.3.4' Alert.TRANSITION_DURATION = 150 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/button.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/button.js b/tapestry-webresources/src/test/webapp/bootstrap/js/button.js index 4d56901..7c7c021 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/button.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.3.2 + * Bootstrap: button.js v3.3.4 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ this.isLoading = false } - Button.VERSION = '3.3.2' + Button.VERSION = '3.3.4' Button.DEFAULTS = { loadingText: 'loading...' http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js b/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js index 450e181..a38ef14 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.3.2 + * Bootstrap: carousel.js v3.3.4 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,10 +17,10 @@ this.$element = $(element) this.$indicators = this.$element.find('.carousel-indicators') this.options = options - this.paused = - this.sliding = - this.interval = - this.$active = + this.paused = null + this.sliding = null + this.interval = null + this.$active = null this.$items = null this.options.keyboard && this.$element.on('keydown.bs.carousel', $.proxy(this.keydown, this)) @@ -30,7 +30,7 @@ .on('mouseleave.bs.carousel', $.proxy(this.cycle, this)) } - Carousel.VERSION = '3.3.2' + Carousel.VERSION = '3.3.4' Carousel.TRANSITION_DURATION = 600 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js b/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js index 2bc30e7..954513c 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.3.2 + * Bootstrap: collapse.js v3.3.4 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -16,7 +16,8 @@ var Collapse = function (element, options) { this.$element = $(element) this.options = $.extend({}, Collapse.DEFAULTS, options) - this.$trigger = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]') + this.$trigger = $('[data-toggle="collapse"][href="#' + element.id + '"],' + + '[data-toggle="collapse"][data-target="#' + element.id + '"]') this.transitioning = null if (this.options.parent) { @@ -28,13 +29,12 @@ if (this.options.toggle) this.toggle() } - Collapse.VERSION = '3.3.2' + Collapse.VERSION = '3.3.4' Collapse.TRANSITION_DURATION = 350 Collapse.DEFAULTS = { - toggle: true, - trigger: '[data-toggle="collapse"]' + toggle: true } Collapse.prototype.dimension = function () { @@ -172,7 +172,7 @@ var data = $this.data('bs.collapse') var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option) - if (!data && options.toggle && option == 'show') options.toggle = false + if (!data && options.toggle && /show|hide/.test(option)) options.toggle = false if (!data) $this.data('bs.collapse', (data = new Collapse(this, options))) if (typeof option == 'string') data[option]() }) @@ -203,7 +203,7 @@ var $target = getTargetFromTrigger($this) var data = $target.data('bs.collapse') - var option = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this }) + var option = data ? 'toggle' : $this.data() Plugin.call($target, option) }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js b/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js index 200e1c6..9874600 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.3.2 + * Bootstrap: dropdown.js v3.3.4 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ $(element).on('click.bs.dropdown', this.toggle) } - Dropdown.VERSION = '3.3.2' + Dropdown.VERSION = '3.3.4' Dropdown.prototype.toggle = function (e) { var $this = $(this) @@ -72,7 +72,7 @@ return $this.trigger('click') } - var desc = ' li:not(.divider):visible a' + var desc = ' li:not(.disabled):visible a' var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) if (!$items.length) return http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js b/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js index e7704b8..c1eb2a8 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.3.2 + * Bootstrap: modal.js v3.3.4 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,12 +14,15 @@ // ====================== var Modal = function (element, options) { - this.options = options - this.$body = $(document.body) - this.$element = $(element) - this.$backdrop = - this.isShown = null - this.scrollbarWidth = 0 + this.options = options + this.$body = $(document.body) + this.$element = $(element) + this.$dialog = this.$element.find('.modal-dialog') + this.$backdrop = null + this.isShown = null + this.originalBodyPad = null + this.scrollbarWidth = 0 + this.ignoreBackdropClick = false if (this.options.remote) { this.$element @@ -30,7 +33,7 @@ } } - Modal.VERSION = '3.3.2' + Modal.VERSION = '3.3.4' Modal.TRANSITION_DURATION = 300 Modal.BACKDROP_TRANSITION_DURATION = 150 @@ -64,6 +67,12 @@ this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this)) + this.$dialog.on('mousedown.dismiss.bs.modal', function () { + that.$element.one('mouseup.dismiss.bs.modal', function (e) { + if ($(e.target).is(that.$element)) that.ignoreBackdropClick = true + }) + }) + this.backdrop(function () { var transition = $.support.transition && that.$element.hasClass('fade') @@ -75,7 +84,6 @@ .show() .scrollTop(0) - if (that.options.backdrop) that.adjustBackdrop() that.adjustDialog() if (transition) { @@ -91,7 +99,7 @@ var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget }) transition ? - that.$element.find('.modal-dialog') // wait for modal to slide in + that.$dialog // wait for modal to slide in .one('bsTransitionEnd', function () { that.$element.trigger('focus').trigger(e) }) @@ -120,6 +128,9 @@ .removeClass('in') .attr('aria-hidden', true) .off('click.dismiss.bs.modal') + .off('mouseup.dismiss.bs.modal') + + this.$dialog.off('mousedown.dismiss.bs.modal') $.support.transition && this.$element.hasClass('fade') ? this.$element @@ -180,13 +191,18 @@ var doAnimate = $.support.transition && animate this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />') - .prependTo(this.$element) - .on('click.dismiss.bs.modal', $.proxy(function (e) { - if (e.target !== e.currentTarget) return - this.options.backdrop == 'static' - ? this.$element[0].focus.call(this.$element[0]) - : this.hide.call(this) - }, this)) + .appendTo(this.$body) + + this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) { + if (this.ignoreBackdropClick) { + this.ignoreBackdropClick = false + return + } + if (e.target !== e.currentTarget) return + this.options.backdrop == 'static' + ? this.$element[0].focus() + : this.hide() + }, this)) if (doAnimate) this.$backdrop[0].offsetWidth // force reflow @@ -221,16 +237,9 @@ // these following methods are used to handle overflowing modals Modal.prototype.handleUpdate = function () { - if (this.options.backdrop) this.adjustBackdrop() this.adjustDialog() } - Modal.prototype.adjustBackdrop = function () { - this.$backdrop - .css('height', 0) - .css('height', this.$element[0].scrollHeight) - } - Modal.prototype.adjustDialog = function () { var modalIsOverflowing = this.$element[0].scrollHeight > document.documentElement.clientHeight @@ -248,17 +257,23 @@ } Modal.prototype.checkScrollbar = function () { - this.bodyIsOverflowing = document.body.scrollHeight > document.documentElement.clientHeight + var fullWindowWidth = window.innerWidth + if (!fullWindowWidth) { // workaround for missing window.innerWidth in IE8 + var documentElementRect = document.documentElement.getBoundingClientRect() + fullWindowWidth = documentElementRect.right - Math.abs(documentElementRect.left) + } + this.bodyIsOverflowing = document.body.clientWidth < fullWindowWidth this.scrollbarWidth = this.measureScrollbar() } Modal.prototype.setScrollbar = function () { var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) + this.originalBodyPad = document.body.style.paddingRight || '' if (this.bodyIsOverflowing) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) } Modal.prototype.resetScrollbar = function () { - this.$body.css('padding-right', '') + this.$body.css('padding-right', this.originalBodyPad) } Modal.prototype.measureScrollbar = function () { // thx walsh http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js b/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js index be65b11..0b0755e 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.3.2 + * Bootstrap: popover.js v3.3.4 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -19,7 +19,7 @@ if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js') - Popover.VERSION = '3.3.2' + Popover.VERSION = '3.3.4' Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, { placement: 'right', @@ -75,11 +75,6 @@ return (this.$arrow = this.$arrow || this.tip().find('.arrow')) } - Popover.prototype.tip = function () { - if (!this.$tip) this.$tip = $(this.options.template) - return this.$tip - } - // POPOVER PLUGIN DEFINITION // ========================= @@ -90,7 +85,7 @@ var data = $this.data('bs.popover') var options = typeof option == 'object' && option - if (!data && option == 'destroy') return + if (!data && /destroy|hide/.test(option)) return if (!data) $this.data('bs.popover', (data = new Popover(this, options))) if (typeof option == 'string') data[option]() }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js b/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js index 0987177..f860c1a 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.3.2 + * Bootstrap: scrollspy.js v3.3.4 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -14,10 +14,8 @@ // ========================== function ScrollSpy(element, options) { - var process = $.proxy(this.process, this) - - this.$body = $('body') - this.$scrollElement = $(element).is('body') ? $(window) : $(element) + this.$body = $(document.body) + this.$scrollElement = $(element).is(document.body) ? $(window) : $(element) this.options = $.extend({}, ScrollSpy.DEFAULTS, options) this.selector = (this.options.target || '') + ' .nav li > a' this.offsets = [] @@ -25,12 +23,12 @@ this.activeTarget = null this.scrollHeight = 0 - this.$scrollElement.on('scroll.bs.scrollspy', process) + this.$scrollElement.on('scroll.bs.scrollspy', $.proxy(this.process, this)) this.refresh() this.process() } - ScrollSpy.VERSION = '3.3.2' + ScrollSpy.VERSION = '3.3.4' ScrollSpy.DEFAULTS = { offset: 10 @@ -41,20 +39,19 @@ } ScrollSpy.prototype.refresh = function () { - var offsetMethod = 'offset' - var offsetBase = 0 + var that = this + var offsetMethod = 'offset' + var offsetBase = 0 + + this.offsets = [] + this.targets = [] + this.scrollHeight = this.getScrollHeight() if (!$.isWindow(this.$scrollElement[0])) { offsetMethod = 'position' offsetBase = this.$scrollElement.scrollTop() } - this.offsets = [] - this.targets = [] - this.scrollHeight = this.getScrollHeight() - - var self = this - this.$body .find(this.selector) .map(function () { @@ -69,8 +66,8 @@ }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { - self.offsets.push(this[0]) - self.targets.push(this[1]) + that.offsets.push(this[0]) + that.targets.push(this[1]) }) } @@ -99,7 +96,7 @@ for (i = offsets.length; i--;) { activeTarget != targets[i] && scrollTop >= offsets[i] - && (!offsets[i + 1] || scrollTop <= offsets[i + 1]) + && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) && this.activate(targets[i]) } } @@ -110,8 +107,8 @@ this.clear() var selector = this.selector + - '[data-target="' + target + '"],' + - this.selector + '[href="' + target + '"]' + '[data-target="' + target + '"],' + + this.selector + '[href="' + target + '"]' var active = $(selector) .parents('li') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js b/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js index ddb7fc9..935d5bc 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.3.2 + * Bootstrap: tab.js v3.3.4 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2015 Twitter, Inc. @@ -17,7 +17,7 @@ this.element = $(element) } - Tab.VERSION = '3.3.2' + Tab.VERSION = '3.3.4' Tab.TRANSITION_DURATION = 150 @@ -88,7 +88,7 @@ element.removeClass('fade') } - if (element.parent('.dropdown-menu')) { + if (element.parent('.dropdown-menu').length) { element .closest('li.dropdown') .addClass('active') http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js b/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js index 1856df5..2736788 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.3.2 + * Bootstrap: tooltip.js v3.3.4 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== @@ -15,17 +15,17 @@ // =============================== var Tooltip = function (element, options) { - this.type = - this.options = - this.enabled = - this.timeout = - this.hoverState = + this.type = null + this.options = null + this.enabled = null + this.timeout = null + this.hoverState = null this.$element = null this.init('tooltip', element, options) } - Tooltip.VERSION = '3.3.2' + Tooltip.VERSION = '3.3.4' Tooltip.TRANSITION_DURATION = 150 @@ -52,6 +52,10 @@ this.options = this.getOptions(options) this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport) + if (this.$element[0] instanceof document.constructor && !this.options.selector) { + throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!') + } + var triggers = this.options.trigger.split(' ') for (var i = triggers.length; i--;) { @@ -272,10 +276,10 @@ this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], isVertical) } - Tooltip.prototype.replaceArrow = function (delta, dimension, isHorizontal) { + Tooltip.prototype.replaceArrow = function (delta, dimension, isVertical) { this.arrow() - .css(isHorizontal ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') - .css(isHorizontal ? 'top' : 'left', '') + .css(isVertical ? 'left' : 'top', 50 * (1 - delta / dimension) + '%') + .css(isVertical ? 'top' : 'left', '') } Tooltip.prototype.setContent = function () { @@ -288,7 +292,7 @@ Tooltip.prototype.hide = function (callback) { var that = this - var $tip = this.tip() + var $tip = $(this.$tip) var e = $.Event('hide.bs.' + this.type) function complete() { @@ -305,7 +309,7 @@ $tip.removeClass('in') - $.support.transition && this.$tip.hasClass('fade') ? + $.support.transition && $tip.hasClass('fade') ? $tip .one('bsTransitionEnd', complete) .emulateTransitionEnd(Tooltip.TRANSITION_DURATION) : @@ -449,7 +453,7 @@ var data = $this.data('bs.tooltip') var options = typeof option == 'object' && option - if (!data && option == 'destroy') return + if (!data && /destroy|hide/.test(option)) return if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options))) if (typeof option == 'string') data[option]() }) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js b/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js index ec9ab68..f23e6bd 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js +++ b/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.3.2 + * Bootstrap: transition.js v3.3.4 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2015 Twitter, Inc. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less b/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less index 5618bfc..c4199db 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less @@ -18,7 +18,7 @@ // Specified for the h4 to prevent conflicts of changing @headings-color color: inherit; } - + // Provide class for links that match alerts .alert-link { font-weight: @alert-link-font-weight; @@ -29,7 +29,7 @@ > ul { margin-bottom: 0; } - + > p + p { margin-top: 5px; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/badges.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/badges.less b/tapestry-webresources/src/test/webapp/bootstrap/less/badges.less index 4a80402..c70bb93 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/badges.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/badges.less @@ -28,8 +28,9 @@ position: relative; top: -1px; } - - .btn-xs & { + + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } @@ -50,15 +51,15 @@ color: @badge-active-color; background-color: @badge-active-bg; } - + .list-group-item > & { float: right; } - + .list-group-item > & + & { margin-right: 5px; } - + .nav-pills > li > a > & { margin-left: 3px; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/component-animations.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/component-animations.less b/tapestry-webresources/src/test/webapp/bootstrap/less/component-animations.less index 967715d..0bcee91 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/component-animations.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/component-animations.less @@ -17,9 +17,8 @@ .collapse { display: none; - visibility: hidden; - &.in { display: block; visibility: visible; } + &.in { display: block; } tr&.in { display: table-row; } tbody&.in { display: table-row-group; } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less b/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less index 0cc46df..af34460 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less @@ -10,7 +10,7 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: @caret-width-base solid; + border-top: @caret-width-base dashed; border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less b/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less index 3138c2c..e4b5062 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less @@ -141,11 +141,15 @@ output { &[disabled], &[readonly], fieldset[disabled] & { - cursor: @cursor-disabled; background-color: @input-bg-disabled; opacity: 1; // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655 } + &[disabled], + fieldset[disabled] & { + cursor: @cursor-disabled; + } + // Reset height for `textarea`s textarea& { height: auto; @@ -198,7 +202,7 @@ input[type="search"] { // horizontal forms, use the predefined grid classes. .form-group { - margin-bottom: 15px; + margin-bottom: @form-group-margin-bottom; } @@ -238,6 +242,7 @@ input[type="search"] { // Radios and checkboxes on same line .radio-inline, .checkbox-inline { + position: relative; display: inline-block; padding-left: 20px; margin-bottom: 0; @@ -294,6 +299,7 @@ input[type="checkbox"] { padding-bottom: (@padding-base-vertical + 1); // Remove default margin from `p` margin-bottom: 0; + min-height: (@line-height-computed + @font-size-base); &.input-lg, &.input-sm { @@ -323,6 +329,7 @@ input[type="checkbox"] { padding: @padding-small-vertical @padding-small-horizontal; font-size: @font-size-small; line-height: @line-height-small; + min-height: (@line-height-computed + @font-size-small); } } @@ -338,6 +345,7 @@ input[type="checkbox"] { padding: @padding-large-vertical @padding-large-horizontal; font-size: @font-size-large; line-height: @line-height-large; + min-height: (@line-height-computed + @font-size-large); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less b/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less index 8b25f89..335d80a 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less @@ -266,8 +266,12 @@ .glyphicon-piggy-bank { &:before { content: "\e225"; } } .glyphicon-scissors { &:before { content: "\e226"; } } .glyphicon-bitcoin { &:before { content: "\e227"; } } +.glyphicon-btc { &:before { content: "\e227"; } } +.glyphicon-xbt { &:before { content: "\e227"; } } .glyphicon-yen { &:before { content: "\00a5"; } } +.glyphicon-jpy { &:before { content: "\00a5"; } } .glyphicon-ruble { &:before { content: "\20bd"; } } +.glyphicon-rub { &:before { content: "\20bd"; } } .glyphicon-scale { &:before { content: "\e230"; } } .glyphicon-ice-lolly { &:before { content: "\e231"; } } .glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less b/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less index d641023..93036d3 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less @@ -13,7 +13,7 @@ .h1 { color: @jumbotron-heading-color; } - + p { margin-bottom: (@jumbotron-padding / 2); font-size: @jumbotron-font-size; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less b/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less index 032a497..1de6220 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less @@ -62,10 +62,12 @@ // Modal background .modal-backdrop { - position: absolute; + position: fixed; top: 0; right: 0; + bottom: 0; left: 0; + z-index: @zindex-modal-background; background-color: @modal-backdrop-bg; // Fade for backdrop &.fade { .opacity(0); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less b/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less index 0c83503..6d751bb 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less @@ -67,7 +67,6 @@ &.collapse { display: block !important; - visibility: visible !important; height: auto !important; padding-bottom: 0; // Override default setting overflow: visible !important; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less b/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less index f26fec7..a3d11b1 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less @@ -223,11 +223,9 @@ .tab-content { > .tab-pane { display: none; - visibility: hidden; } > .active { display: block; - visibility: visible; } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-embed.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-embed.less b/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-embed.less index c1fa8f8..080a511 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-embed.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-embed.less @@ -22,14 +22,14 @@ width: 100%; border: 0; } +} - // Modifier class for 16:9 aspect ratio - &.embed-responsive-16by9 { - padding-bottom: 56.25%; - } +// Modifier class for 16:9 aspect ratio +.embed-responsive-16by9 { + padding-bottom: 56.25%; +} - // Modifier class for 4:3 aspect ratio - &.embed-responsive-4by3 { - padding-bottom: 75%; - } +// Modifier class for 4:3 aspect ratio +.embed-responsive-4by3 { + padding-bottom: 75%; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less b/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less index 2a40fbc..47b1d5a 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less @@ -148,3 +148,15 @@ hr { clip: auto; } } + + +// iOS "clickable elements" fix for role="button" +// +// Fixes "clickability" issue (and more generally, the firing of events such as focus as well) +// for traditionally non-focusable elements with role="button" +// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile +// Upstream patch for normalize.css submitted: https://github.com/necolas/normalize.css/pull/379 - remove this fix once that is merged + +[role="button"] { + cursor: pointer; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less b/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less index 3ebfdcd..9d56847 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less @@ -8,7 +8,6 @@ position: absolute; z-index: @zindex-tooltip; display: block; - visibility: visible; // Reset font and text properties given new insertion method font-family: @font-family-base; font-size: @font-size-small; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/type.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/type.less b/tapestry-webresources/src/test/webapp/bootstrap/less/type.less index 3ec976e..68ba601 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/type.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/type.less @@ -238,7 +238,7 @@ abbr[data-original-title] { } .initialism { font-size: 90%; - text-transform: uppercase; + .text-uppercase(); } // Blockquotes http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less b/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less index a260312..7a8ca27 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less @@ -44,7 +44,6 @@ .hidden { display: none !important; - visibility: hidden !important; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/a90606c8/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less b/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less index 002be6a..b5fb9d0 100644 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less @@ -207,6 +207,9 @@ //** Small `.form-control` height @input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2); +//** `.form-group` margin +@form-group-margin-bottom: 15px; + @legend-color: @gray-dark; @legend-border-color: #e5e5e5; @@ -266,7 +269,8 @@ @zindex-popover: 1060; @zindex-tooltip: 1070; @zindex-navbar-fixed: 1030; -@zindex-modal: 1040; +@zindex-modal-background: 1040; +@zindex-modal: 1050; //== Media queries breakpoints
