You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2015/12/29 15:37:21 UTC
tapestry-5 git commit: TAP5-2522: Upgrade Bootstrap to 3.3.6
Repository: tapestry-5
Updated Branches:
refs/heads/master 831128791 -> 0a62aae22
TAP5-2522: Upgrade Bootstrap to 3.3.6
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0a62aae2
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0a62aae2
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0a62aae2
Branch: refs/heads/master
Commit: 0a62aae22d58cbffe74d485c3679eaaaae280db1
Parents: 8311287
Author: Jochen Kemnade <jo...@eddyson.de>
Authored: Tue Dec 29 15:36:49 2015 +0100
Committer: Jochen Kemnade <jo...@eddyson.de>
Committed: Tue Dec 29 15:36:49 2015 +0100
----------------------------------------------------------------------
.../src/test/webapp/bootstrap/js/affix.js | 4 ++--
.../src/test/webapp/bootstrap/js/alert.js | 4 ++--
.../src/test/webapp/bootstrap/js/button.js | 4 ++--
.../src/test/webapp/bootstrap/js/carousel.js | 4 ++--
.../src/test/webapp/bootstrap/js/collapse.js | 4 ++--
.../src/test/webapp/bootstrap/js/dropdown.js | 8 ++++----
.../src/test/webapp/bootstrap/js/modal.js | 4 ++--
.../src/test/webapp/bootstrap/js/popover.js | 4 ++--
.../src/test/webapp/bootstrap/js/scrollspy.js | 4 ++--
.../src/test/webapp/bootstrap/js/tab.js | 4 ++--
.../src/test/webapp/bootstrap/js/tooltip.js | 4 ++--
.../src/test/webapp/bootstrap/js/transition.js | 2 +-
.../src/test/webapp/bootstrap/less/bootstrap.less | 2 +-
.../src/test/webapp/bootstrap/less/button-groups.less | 4 ++--
.../src/test/webapp/bootstrap/less/carousel.less | 13 +++++++------
.../src/test/webapp/bootstrap/less/forms.less | 12 +++++++++---
.../src/test/webapp/bootstrap/less/glyphicons.less | 4 ++--
.../src/test/webapp/bootstrap/less/input-groups.less | 10 +++++++---
.../src/test/webapp/bootstrap/less/jumbotron.less | 2 ++
.../src/test/webapp/bootstrap/less/mixins/buttons.less | 5 +----
.../src/test/webapp/bootstrap/less/mixins/grid.less | 4 ++--
.../test/webapp/bootstrap/less/mixins/hide-text.less | 2 +-
.../webapp/bootstrap/less/mixins/vendor-prefixes.less | 4 ++--
.../src/test/webapp/bootstrap/less/modals.less | 2 +-
.../src/test/webapp/bootstrap/less/pagination.less | 4 ++--
.../src/test/webapp/bootstrap/less/theme.less | 2 +-
.../src/test/webapp/bootstrap/less/type.less | 2 +-
.../src/test/webapp/bootstrap/less/variables.less | 2 ++
28 files changed, 68 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 11a3d39..2c5d5d6 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.5
+ * Bootstrap: affix.js v3.3.6
* http://getbootstrap.com/javascript/#affix
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
this.checkPosition()
}
- Affix.VERSION = '3.3.5'
+ Affix.VERSION = '3.3.6'
Affix.RESET = 'affix affix-top affix-bottom'
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 a7787cb..5536755 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.5
+ * Bootstrap: alert.js v3.3.6
* http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -18,7 +18,7 @@
$(el).on('click', dismiss, this.close)
}
- Alert.VERSION = '3.3.5'
+ Alert.VERSION = '3.3.6'
Alert.TRANSITION_DURATION = 150
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 15d7dca..0f36e41 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.5
+ * Bootstrap: button.js v3.3.6
* http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
this.isLoading = false
}
- Button.VERSION = '3.3.5'
+ Button.VERSION = '3.3.6'
Button.DEFAULTS = {
loadingText: 'loading...'
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 6b2f1c4..6cdbc79 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.5
+ * Bootstrap: carousel.js v3.3.6
* http://getbootstrap.com/javascript/#carousel
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -30,7 +30,7 @@
.on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
}
- Carousel.VERSION = '3.3.5'
+ Carousel.VERSION = '3.3.6'
Carousel.TRANSITION_DURATION = 600
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 329e535..9e26465 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.5
+ * Bootstrap: collapse.js v3.3.6
* http://getbootstrap.com/javascript/#collapse
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -29,7 +29,7 @@
if (this.options.toggle) this.toggle()
}
- Collapse.VERSION = '3.3.5'
+ Collapse.VERSION = '3.3.6'
Collapse.TRANSITION_DURATION = 350
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 bc4d373..df6be86 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.5
+ * Bootstrap: dropdown.js v3.3.6
* 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.5'
+ Dropdown.VERSION = '3.3.6'
function getParent($this) {
var selector = $this.attr('data-target')
@@ -51,7 +51,7 @@
if (e.isDefaultPrevented()) return
$this.attr('aria-expanded', 'false')
- $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
+ $parent.removeClass('open').trigger($.Event('hidden.bs.dropdown', relatedTarget))
})
}
@@ -85,7 +85,7 @@
$parent
.toggleClass('open')
- .trigger('shown.bs.dropdown', relatedTarget)
+ .trigger($.Event('shown.bs.dropdown', relatedTarget))
}
return false
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 d50a856..5049ccc 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.5
+ * Bootstrap: modal.js v3.3.6
* http://getbootstrap.com/javascript/#modals
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -33,7 +33,7 @@
}
}
- Modal.VERSION = '3.3.5'
+ Modal.VERSION = '3.3.6'
Modal.TRANSITION_DURATION = 300
Modal.BACKDROP_TRANSITION_DURATION = 150
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 aef22d1..f2362e0 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.5
+ * Bootstrap: popover.js v3.3.6
* 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.5'
+ Popover.VERSION = '3.3.6'
Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
placement: 'right',
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 7208e25..5970b06 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.5
+ * Bootstrap: scrollspy.js v3.3.6
* http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -28,7 +28,7 @@
this.process()
}
- ScrollSpy.VERSION = '3.3.5'
+ ScrollSpy.VERSION = '3.3.6'
ScrollSpy.DEFAULTS = {
offset: 10
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 8d5361f..7d533e8 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.5
+ * Bootstrap: tab.js v3.3.6
* http://getbootstrap.com/javascript/#tabs
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
@@ -19,7 +19,7 @@
// jscs:enable requireDollarBeforejQueryAssignment
}
- Tab.VERSION = '3.3.5'
+ Tab.VERSION = '3.3.6'
Tab.TRANSITION_DURATION = 150
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 c3fe4b0..7094b34 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.5
+ * Bootstrap: tooltip.js v3.3.6
* http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
@@ -26,7 +26,7 @@
this.init('tooltip', element, options)
}
- Tooltip.VERSION = '3.3.5'
+ Tooltip.VERSION = '3.3.6'
Tooltip.TRANSITION_DURATION = 150
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 cd89fc4..fae36ed 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.5
+ * Bootstrap: transition.js v3.3.6
* http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2011-2015 Twitter, Inc.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less b/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
index 4b9916e..1c04778 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.6 (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/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less b/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
index 6a0c5a8..293245a 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
@@ -173,12 +173,12 @@
border-radius: 0;
}
&:first-child:not(:last-child) {
- border-top-right-radius: @btn-border-radius-base;
+ .border-top-radius(@btn-border-radius-base);
.border-bottom-radius(0);
}
&:last-child:not(:first-child) {
- border-bottom-left-radius: @btn-border-radius-base;
.border-top-radius(0);
+ .border-bottom-radius(@btn-border-radius-base);
}
}
.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less b/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
index 87ed696..252011e 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
@@ -101,6 +101,7 @@
color: @carousel-control-color;
text-align: center;
text-shadow: @carousel-text-shadow;
+ background-color: rgba(0, 0, 0, 0); // Fix IE9 click-thru bug
// We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation.
@@ -240,18 +241,18 @@
.glyphicon-chevron-right,
.icon-prev,
.icon-next {
- width: 30px;
- height: 30px;
- margin-top: -15px;
- font-size: 30px;
+ width: (@carousel-control-font-size * 1.5);
+ height: (@carousel-control-font-size * 1.5);
+ margin-top: (@carousel-control-font-size / -2);
+ font-size: (@carousel-control-font-size * 1.5);
}
.glyphicon-chevron-left,
.icon-prev {
- margin-left: -15px;
+ margin-left: (@carousel-control-font-size / -2);
}
.glyphicon-chevron-right,
.icon-next {
- margin-right: -15px;
+ margin-right: (@carousel-control-font-size / -2);
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 b064ede..e8b071a 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less
@@ -132,6 +132,12 @@ output {
// Placeholder
.placeholder();
+ // Unstyle the caret on `<select>`s in IE10+.
+ &::-ms-expand {
+ border: 0;
+ background-color: transparent;
+ }
+
// Disabled and read-only inputs
//
// HTML5 says that controls under a fieldset > legend:first-child won't be
@@ -433,10 +439,10 @@ input[type="checkbox"] {
.has-feedback label {
& ~ .form-control-feedback {
- top: (@line-height-computed + 5); // Height of the `label` and its margin
+ top: (@line-height-computed + 5); // Height of the `label` and its margin
}
&.sr-only ~ .form-control-feedback {
- top: 0;
+ top: 0;
}
}
@@ -591,7 +597,7 @@ input[type="checkbox"] {
.form-group-lg {
@media (min-width: @screen-sm-min) {
.control-label {
- padding-top: ((@padding-large-vertical * @line-height-large) + 1);
+ padding-top: (@padding-large-vertical + 1);
font-size: @font-size-large;
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 335d80a..7bc5852 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less
@@ -32,8 +32,8 @@
}
// Individual icons
-.glyphicon-asterisk { &:before { content: "\2a"; } }
-.glyphicon-plus { &:before { content: "\2b"; } }
+.glyphicon-asterisk { &:before { content: "\002a"; } }
+.glyphicon-plus { &:before { content: "\002b"; } }
.glyphicon-euro,
.glyphicon-eur { &:before { content: "\20ac"; } }
.glyphicon-minus { &:before { content: "\2212"; } }
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less b/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
index 457ea60..5f73eec 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
@@ -29,6 +29,10 @@
width: 100%;
margin-bottom: 0;
+
+ &:focus {
+ z-index: 3;
+ }
}
}
@@ -79,18 +83,18 @@
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
- border-radius: @border-radius-base;
+ border-radius: @input-border-radius;
// Sizing
&.input-sm {
padding: @padding-small-vertical @padding-small-horizontal;
font-size: @font-size-small;
- border-radius: @border-radius-small;
+ border-radius: @input-border-radius-small;
}
&.input-lg {
padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large;
- border-radius: @border-radius-large;
+ border-radius: @input-border-radius-large;
}
// Nuke default margins from checkboxes and radios to vertically center within.
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 fa80a38..1d9b515 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less
@@ -28,6 +28,8 @@
.container &,
.container-fluid & {
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
+ padding-left: (@grid-gutter-width / 2);
+ padding-right: (@grid-gutter-width / 2);
}
.container {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/buttons.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/buttons.less b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/buttons.less
index 6875a97..b294d8c 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/buttons.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/buttons.less
@@ -42,12 +42,9 @@
&.disabled,
&[disabled],
fieldset[disabled] & {
- &,
&:hover,
&:focus,
- &.focus,
- &:active,
- &.active {
+ &.focus {
background-color: @background;
border-color: @border;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/grid.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/grid.less b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/grid.less
index f144c15..df496d0 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/grid.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/grid.less
@@ -6,8 +6,8 @@
.container-fixed(@gutter: @grid-gutter-width) {
margin-right: auto;
margin-left: auto;
- padding-left: (@gutter / 2);
- padding-right: (@gutter / 2);
+ padding-left: floor((@gutter / 2));
+ padding-right: ceil((@gutter / 2));
&:extend(.clearfix all);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/hide-text.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/hide-text.less b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/hide-text.less
index bc70118..2bb84a3 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/hide-text.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/hide-text.less
@@ -6,7 +6,7 @@
//
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-// Deprecated as of v3.0.1 (will be removed in v4)
+// Deprecated as of v3.0.1 (has been removed in v4)
.hide-text() {
font: ~"0/0" a;
color: transparent;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/vendor-prefixes.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/vendor-prefixes.less b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/vendor-prefixes.less
index afd3331..2b5e74b 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/vendor-prefixes.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins/vendor-prefixes.less
@@ -1,7 +1,7 @@
// Vendor Prefixes
//
// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
-// Autoprefixer in our Gruntfile. They will be removed in v4.
+// Autoprefixer in our Gruntfile. They have been removed in v4.
// - Animations
// - Backface visibility
@@ -54,7 +54,7 @@
// Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden`
-.backface-visibility(@visibility){
+.backface-visibility(@visibility) {
-webkit-backface-visibility: @visibility;
-moz-backface-visibility: @visibility;
backface-visibility: @visibility;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 1de6220..767ce36 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less
@@ -79,7 +79,7 @@
.modal-header {
padding: @modal-title-padding;
border-bottom: 1px solid @modal-header-border-color;
- min-height: (@modal-title-padding + @modal-title-line-height);
+ &:extend(.clearfix all);
}
// Close icon
.modal-header .close {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less b/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
index 31a23bf..31f77aa 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
@@ -40,7 +40,7 @@
> li > span {
&:hover,
&:focus {
- z-index: 3;
+ z-index: 2;
color: @pagination-hover-color;
background-color: @pagination-hover-bg;
border-color: @pagination-hover-border;
@@ -52,7 +52,7 @@
&,
&:hover,
&:focus {
- z-index: 2;
+ z-index: 3;
color: @pagination-active-color;
background-color: @pagination-active-bg;
border-color: @pagination-active-border;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less b/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less
index 8371872..8f51d91 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v3.3.5 (http://getbootstrap.com)
+ * Bootstrap v3.3.6 (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/0a62aae2/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 68ba601..0d4fee4 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/type.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/type.less
@@ -211,7 +211,7 @@ dd {
&:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
}
- @media (min-width: @grid-float-breakpoint) {
+ @media (min-width: @dl-horizontal-breakpoint) {
dt {
float: left;
width: (@dl-horizontal-offset - 20);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0a62aae2/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 c1861a8..b057ef5 100644
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less
@@ -863,5 +863,7 @@
@page-header-border-color: @gray-lighter;
//** Width of horizontal description list titles
@dl-horizontal-offset: @component-offset-horizontal;
+//** Point at which .dl-horizontal becomes horizontal
+@dl-horizontal-breakpoint: @grid-float-breakpoint;
//** Horizontal line color.
@hr-border: @gray-lighter;