You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/19 20:42:09 UTC
[2/4] TAP5-2227: Update Less4J to version 1.2.1 for compatibility
with Bootstrap 3.0.2
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf
index be784dc..a498ef4 100755
Binary files a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf and b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.ttf differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff
index 2cc3e48..d83c539 100755
Binary files a/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff and b/tapestry-webresources/src/test/webapp/bootstrap/fonts/glyphicons-halflings-regular.woff differ
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 c7be96e..7d111ec 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/affix.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: affix.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#affix
+ * Bootstrap: affix.js v3.0.2
+ * http://getbootstrap.com/javascript/#affix
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -123,4 +123,4 @@
})
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 663029e..031d72a 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/alert.js
@@ -1,6 +1,6 @@
/* ========================================================================
- * Bootstrap: alert.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#alerts
+ * Bootstrap: alert.js v3.0.2
+ * http://getbootstrap.com/javascript/#alerts
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
@@ -95,4 +95,4 @@
$(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 fc73b55..0145689 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/button.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/button.js
@@ -1,6 +1,6 @@
/* ========================================================================
- * Bootstrap: button.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#buttons
+ * Bootstrap: button.js v3.0.2
+ * http://getbootstrap.com/javascript/#buttons
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
@@ -106,4 +106,4 @@
e.preventDefault()
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 d8c4c24..902d4d7 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/carousel.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: carousel.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#carousel
+ * Bootstrap: carousel.js v3.0.2
+ * http://getbootstrap.com/javascript/#carousel
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -214,4 +214,4 @@
})
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 92cc0bc..9967b16 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/collapse.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: collapse.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#collapse
+ * Bootstrap: collapse.js v3.0.2
+ * http://getbootstrap.com/javascript/#collapse
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -176,4 +176,4 @@
$target.collapse(option)
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 6093f11..d5da638 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/dropdown.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: dropdown.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#dropdowns
+ * Bootstrap: dropdown.js v3.0.2
+ * http://getbootstrap.com/javascript/#dropdowns
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -151,4 +151,4 @@
.on('click.bs.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
.on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 65eba48..dac50c6 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/modal.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: modal.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#modals
+ * Bootstrap: modal.js v3.0.2
+ * http://getbootstrap.com/javascript/#modals
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -243,4 +243,4 @@
.on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
.on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 ecd37ac..35b4885 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/popover.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: popover.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#popovers
+ * Bootstrap: popover.js v3.0.2
+ * http://getbootstrap.com/javascript/#popovers
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -114,4 +114,4 @@
return this
}
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 10f95f2..1d2fc78 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/scrollspy.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: scrollspy.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#scrollspy
+ * Bootstrap: scrollspy.js v3.0.2
+ * http://getbootstrap.com/javascript/#scrollspy
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -155,4 +155,4 @@
})
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 e1c1559..c803b89 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/tab.js
@@ -1,8 +1,8 @@
/* ========================================================================
- * Bootstrap: tab.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tabs
+ * Bootstrap: tab.js v3.0.2
+ * http://getbootstrap.com/javascript/#tabs
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@
Tab.prototype.show = function () {
var $this = this.element
var $ul = $this.closest('ul:not(.dropdown-menu)')
- var selector = $this.attr('data-target')
+ var selector = $this.data('target')
if (!selector) {
selector = $this.attr('href')
@@ -132,4 +132,4 @@
$(this).tab('show')
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 8980228..9e61775 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/tooltip.js
@@ -1,9 +1,9 @@
/* ========================================================================
- * Bootstrap: tooltip.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#tooltip
+ * Bootstrap: tooltip.js v3.0.2
+ * http://getbootstrap.com/javascript/#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
- * Copyright 2012 Twitter, Inc.
+ * Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -383,4 +383,4 @@
return this
}
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 e8f318b..a692dfd 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js
+++ b/tapestry-webresources/src/test/webapp/bootstrap/js/transition.js
@@ -1,6 +1,6 @@
/* ========================================================================
- * Bootstrap: transition.js v3.0.0
- * http://twbs.github.com/bootstrap/javascript.html#transitions
+ * Bootstrap: transition.js v3.0.2
+ * http://getbootstrap.com/javascript/#transitions
* ========================================================================
* Copyright 2013 Twitter, Inc.
*
@@ -53,4 +53,4 @@
$.support.transition = transitionEnd()
})
-}(window.jQuery);
+}(jQuery);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 be09d18..3eab066 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/alerts.less
@@ -15,7 +15,7 @@
// Headings for larger alerts
h4 {
margin-top: 0;
- // Specified for the h4 to prevent conflicts of changing @headingsColor
+ // Specified for the h4 to prevent conflicts of changing @headings-color
color: inherit;
}
// Provide class for links that match alerts
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 1344b46..b368b87 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/bootstrap.less
@@ -1,13 +1,3 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
// Core variables and mixins
@import "variables.less";
@import "mixins.less";
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/breadcrumbs.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/breadcrumbs.less b/tapestry-webresources/src/test/webapp/bootstrap/less/breadcrumbs.less
index 92643d1..60b33ea 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/breadcrumbs.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/breadcrumbs.less
@@ -11,8 +11,8 @@
border-radius: @border-radius-base;
> li {
display: inline-block;
- &+li:before {
- content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
+ + li:before {
+ content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
padding: 0 5px;
color: @breadcrumb-color;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 43ada11..c253576 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/button-groups.less
@@ -19,7 +19,7 @@
}
}
.dropup {
- & .btn-default .caret {
+ .btn-default .caret {
border-bottom-color: @btn-default-color;
}
.btn-primary,
@@ -150,6 +150,11 @@
// Remove the gradient and set the same inset shadow as the :active state
.btn-group.open .dropdown-toggle {
.box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+
+ // Show no shadow for `.btn-link` since it has no other button styles.
+ &.btn-link {
+ .box-shadow(none);
+ }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/buttons.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/buttons.less b/tapestry-webresources/src/test/webapp/bootstrap/less/buttons.less
index 5d60d39..a090960 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/buttons.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/buttons.less
@@ -9,17 +9,15 @@
// Core styles
.btn {
display: inline-block;
- padding: @padding-base-vertical @padding-base-horizontal;
margin-bottom: 0; // For input.btn
- font-size: @font-size-base;
font-weight: @btn-font-weight;
- line-height: @line-height-base;
text-align: center;
vertical-align: middle;
cursor: pointer;
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid transparent;
- border-radius: @border-radius-base;
white-space: nowrap;
+ .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
.user-select(none);
&:focus {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 c468d43..317963b 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/carousel.less
@@ -75,7 +75,7 @@
color: @carousel-control-color;
text-align: center;
text-shadow: @carousel-text-shadow;
- // We can't have this transition here because webkit cancels the carousel
+ // We can't have this transition here because WebKit cancels the carousel
// animation if you trip this while in the middle of another animation.
// Set gradients for backgrounds
@@ -103,11 +103,18 @@
.glyphicon-chevron-right {
position: absolute;
top: 50%;
- left: 50%;
z-index: 5;
display: inline-block;
}
.icon-prev,
+ .glyphicon-chevron-left {
+ left: 50%;
+ }
+ .icon-next,
+ .glyphicon-chevron-right {
+ right: 50%;
+ }
+ .icon-prev,
.icon-next {
width: 20px;
height: 20px;
@@ -153,6 +160,17 @@
border: 1px solid @carousel-indicator-border-color;
border-radius: 10px;
cursor: pointer;
+
+ // IE8-9 hack for event handling
+ //
+ // Internet Explorer 8-9 does not support clicks on elements without a set
+ // `background-color`. We cannot use `filter` since that's not viewed as a
+ // background color by the browser. Thus, a hack is needed.
+ //
+ // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
+ // set alpha transparency for the best results possible.
+ background-color: #000 \9; // IE8
+ background-color: rgba(0,0,0,0); // IE9
}
.active {
margin: 0;
@@ -183,16 +201,20 @@
// Scale up controls for tablets and up
-@media screen and (min-width: @screen-tablet) {
+@media screen and (min-width: @screen-sm-min) {
// Scale up the controls a smidge
- .carousel-control .icon-prev,
- .carousel-control .icon-next {
- width: 30px;
- height: 30px;
- margin-top: -15px;
- margin-left: -15px;
- font-size: 30px;
+ .carousel-control {
+ .glyphicons-chevron-left,
+ .glyphicons-chevron-right,
+ .icon-prev,
+ .icon-next {
+ width: 30px;
+ height: 30px;
+ margin-top: -15px;
+ margin-left: -15px;
+ font-size: 30px;
+ }
}
// Show and left align the captions
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/code.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/code.less b/tapestry-webresources/src/test/webapp/bootstrap/less/code.less
index d6661d2..44e9e89 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/code.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/code.less
@@ -1,11 +1,13 @@
//
-// Code (inline and blocK)
+// Code (inline and block)
// --------------------------------------------------
// Inline and block code styles
code,
-pre {
+kbd,
+pre,
+samp {
font-family: @font-family-monospace;
}
@@ -33,11 +35,6 @@ pre {
border: 1px solid @pre-border-color;
border-radius: @border-radius-base;
- // Make prettyprint styles more spaced out for readability
- &.prettyprint {
- margin-bottom: @line-height-computed;
- }
-
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;
@@ -45,7 +42,7 @@ pre {
color: inherit;
white-space: pre-wrap;
background-color: transparent;
- border: 0;
+ border-radius: 0;
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 96af127..5d7e0fb 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/dropdowns.less
@@ -16,7 +16,6 @@
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
// we can just straight up remove this.
border-bottom: 0 dotted;
- content: "";
}
// The dropdown wrapper (div)
@@ -167,7 +166,7 @@
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
// gets fixed, restore `border-top: 0;`.
border-top: 0 dotted;
- border-bottom: 4px solid @dropdown-caret-color;
+ border-bottom: @caret-width-base solid @dropdown-caret-color;
content: "";
}
// Different positioning for bottom up menu
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 f87b602..a74babd 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/forms.less
@@ -82,13 +82,14 @@ input[type="number"] {
}
}
-
-// Placeholder
-//
-// Placeholder text gets special styles because when browsers invalidate entire
-// lines if it doesn't understand a selector/
-.form-control {
- .placeholder();
+// Adjust output element
+output {
+ display: block;
+ padding-top: (@padding-base-vertical + 1);
+ font-size: @font-size-base;
+ line-height: @line-height-base;
+ color: @input-color;
+ vertical-align: middle;
}
@@ -124,6 +125,7 @@ input[type="number"] {
color: @input-color;
vertical-align: middle;
background-color: @input-bg;
+ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
border: 1px solid @input-border;
border-radius: @input-border-radius;
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
@@ -132,6 +134,12 @@ input[type="number"] {
// Customize the `:focus` state to imitate native WebKit styles.
.form-control-focus();
+ // Placeholder
+ //
+ // Placeholder text gets special styles because when browsers invalidate entire
+ // lines if it doesn't understand a selector/
+ .placeholder();
+
// Disabled and read-only inputs
// Note: HTML5 says that controls under a fieldset > legend:first-child won't
// be disabled if the fieldset is disabled. Due to implementation difficulty,
@@ -257,7 +265,6 @@ input[type="checkbox"],
.form-control-static {
margin-bottom: 0; // Remove default margin from `p`
- padding-top: (@padding-base-vertical + 1);
}
@@ -289,7 +296,7 @@ input[type="checkbox"],
.form-inline {
// Kick in the inline
- @media (min-width: @screen-tablet) {
+ @media (min-width: @screen-sm) {
// Inline-block all the things for "inline"
.form-group {
display: inline-block;
@@ -344,8 +351,12 @@ input[type="checkbox"],
.make-row();
}
+ .form-control-static {
+ padding-top: (@padding-base-vertical + 1);
+ }
+
// Only right align form labels here when the columns stop stacking
- @media (min-width: @screen-tablet) {
+ @media (min-width: @screen-sm-min) {
.control-label {
text-align: right;
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 0e0ba98..9de2dd3 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/glyphicons.less
@@ -14,7 +14,7 @@
src: url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype'),
url('@{icon-font-path}@{icon-font-name}.woff') format('woff'),
url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype'),
- url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg');
+ url('@{icon-font-path}@{icon-font-name}.svg#glyphicons_halflingsregular') format('svg');
}
// Catchall baseclass
@@ -27,6 +27,11 @@
font-weight: normal;
line-height: 1;
-webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+
+ &:empty {
+ width: 1em;
+ }
}
// Individual icons
@@ -68,6 +73,7 @@
.glyphicon-repeat { &:before { content: "\e030"; } }
.glyphicon-refresh { &:before { content: "\e031"; } }
.glyphicon-list-alt { &:before { content: "\e032"; } }
+.glyphicon-lock { &:before { content: "\e033"; } }
.glyphicon-flag { &:before { content: "\e034"; } }
.glyphicon-headphones { &:before { content: "\e035"; } }
.glyphicon-volume-off { &:before { content: "\e036"; } }
@@ -78,7 +84,9 @@
.glyphicon-tag { &:before { content: "\e041"; } }
.glyphicon-tags { &:before { content: "\e042"; } }
.glyphicon-book { &:before { content: "\e043"; } }
+.glyphicon-bookmark { &:before { content: "\e044"; } }
.glyphicon-print { &:before { content: "\e045"; } }
+.glyphicon-camera { &:before { content: "\e046"; } }
.glyphicon-font { &:before { content: "\e047"; } }
.glyphicon-bold { &:before { content: "\e048"; } }
.glyphicon-italic { &:before { content: "\e049"; } }
@@ -132,10 +140,12 @@
.glyphicon-exclamation-sign { &:before { content: "\e101"; } }
.glyphicon-gift { &:before { content: "\e102"; } }
.glyphicon-leaf { &:before { content: "\e103"; } }
+.glyphicon-fire { &:before { content: "\e104"; } }
.glyphicon-eye-open { &:before { content: "\e105"; } }
.glyphicon-eye-close { &:before { content: "\e106"; } }
.glyphicon-warning-sign { &:before { content: "\e107"; } }
.glyphicon-plane { &:before { content: "\e108"; } }
+.glyphicon-calendar { &:before { content: "\e109"; } }
.glyphicon-random { &:before { content: "\e110"; } }
.glyphicon-comment { &:before { content: "\e111"; } }
.glyphicon-magnet { &:before { content: "\e112"; } }
@@ -149,6 +159,7 @@
.glyphicon-resize-horizontal { &:before { content: "\e120"; } }
.glyphicon-hdd { &:before { content: "\e121"; } }
.glyphicon-bullhorn { &:before { content: "\e122"; } }
+.glyphicon-bell { &:before { content: "\e123"; } }
.glyphicon-certificate { &:before { content: "\e124"; } }
.glyphicon-thumbs-up { &:before { content: "\e125"; } }
.glyphicon-thumbs-down { &:before { content: "\e126"; } }
@@ -161,13 +172,17 @@
.glyphicon-circle-arrow-up { &:before { content: "\e133"; } }
.glyphicon-circle-arrow-down { &:before { content: "\e134"; } }
.glyphicon-globe { &:before { content: "\e135"; } }
+.glyphicon-wrench { &:before { content: "\e136"; } }
.glyphicon-tasks { &:before { content: "\e137"; } }
.glyphicon-filter { &:before { content: "\e138"; } }
+.glyphicon-briefcase { &:before { content: "\e139"; } }
.glyphicon-fullscreen { &:before { content: "\e140"; } }
.glyphicon-dashboard { &:before { content: "\e141"; } }
+.glyphicon-paperclip { &:before { content: "\e142"; } }
.glyphicon-heart-empty { &:before { content: "\e143"; } }
.glyphicon-link { &:before { content: "\e144"; } }
.glyphicon-phone { &:before { content: "\e145"; } }
+.glyphicon-pushpin { &:before { content: "\e146"; } }
.glyphicon-usd { &:before { content: "\e148"; } }
.glyphicon-gbp { &:before { content: "\e149"; } }
.glyphicon-sort { &:before { content: "\e150"; } }
@@ -220,13 +235,3 @@
.glyphicon-cloud-upload { &:before { content: "\e198"; } }
.glyphicon-tree-conifer { &:before { content: "\e199"; } }
.glyphicon-tree-deciduous { &:before { content: "\e200"; } }
-.glyphicon-briefcase { &:before { content: "\1f4bc"; } }
-.glyphicon-calendar { &:before { content: "\1f4c5"; } }
-.glyphicon-pushpin { &:before { content: "\1f4cc"; } }
-.glyphicon-paperclip { &:before { content: "\1f4ce"; } }
-.glyphicon-camera { &:before { content: "\1f4f7"; } }
-.glyphicon-lock { &:before { content: "\1f512"; } }
-.glyphicon-bell { &:before { content: "\1f514"; } }
-.glyphicon-bookmark { &:before { content: "\1f516"; } }
-.glyphicon-fire { &:before { content: "\1f525"; } }
-.glyphicon-wrench { &:before { content: "\1f527"; } }
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/grid.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/grid.less b/tapestry-webresources/src/test/webapp/bootstrap/less/grid.less
index 44e3899..67e78f7 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/grid.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/grid.less
@@ -2,7 +2,6 @@
// Grid system
// --------------------------------------------------
-
// Set the container width, and override it for fixed navbars in media queries
.container {
.container-fixed();
@@ -14,61 +13,7 @@
}
// Common styles for small and large grid columns
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11,
-.col-xs-12,
-.col-sm-1,
-.col-sm-2,
-.col-sm-3,
-.col-sm-4,
-.col-sm-5,
-.col-sm-6,
-.col-sm-7,
-.col-sm-8,
-.col-sm-9,
-.col-sm-10,
-.col-sm-11,
-.col-sm-12,
-.col-md-1,
-.col-md-2,
-.col-md-3,
-.col-md-4,
-.col-md-5,
-.col-md-6,
-.col-md-7,
-.col-md-8,
-.col-md-9,
-.col-md-10,
-.col-md-11,
-.col-md-12,
-.col-lg-1,
-.col-lg-2,
-.col-lg-3,
-.col-lg-4,
-.col-lg-5,
-.col-lg-6,
-.col-lg-7,
-.col-lg-8,
-.col-lg-9,
-.col-lg-10,
-.col-lg-11,
-.col-lg-12 {
- position: relative;
- // Prevent columns from collapsing when empty
- min-height: 1px;
- // Inner gutter via padding
- padding-left: (@grid-gutter-width / 2);
- padding-right: (@grid-gutter-width / 2);
-}
+.make-grid-columns();
// Extra small grid
@@ -76,34 +21,14 @@
// Grid classes for extra small devices like smartphones. No offset, push, or
// pull classes are present here due to the size of the target.
//
-// Note that `.col-xs-12` doesn't get floated on purpose—there's no need since
+// Note that `.col-xs-12` doesn't get floated on purpose--there's no need since
// it's full-width.
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11 {
- float: left;
-}
-.col-xs-1 { width: percentage((1 / @grid-columns)); }
-.col-xs-2 { width: percentage((2 / @grid-columns)); }
-.col-xs-3 { width: percentage((3 / @grid-columns)); }
-.col-xs-4 { width: percentage((4 / @grid-columns)); }
-.col-xs-5 { width: percentage((5 / @grid-columns)); }
-.col-xs-6 { width: percentage((6 / @grid-columns)); }
-.col-xs-7 { width: percentage((7 / @grid-columns)); }
-.col-xs-8 { width: percentage((8 / @grid-columns)); }
-.col-xs-9 { width: percentage((9 / @grid-columns)); }
-.col-xs-10 { width: percentage((10/ @grid-columns)); }
-.col-xs-11 { width: percentage((11/ @grid-columns)); }
-.col-xs-12 { width: 100%; }
+.make-grid-columns-float(xs);
+.make-grid(@grid-columns, xs, width);
+.make-grid(@grid-columns, xs, pull);
+.make-grid(@grid-columns, xs, push);
+.make-grid(@grid-columns, xs, offset);
// Small grid
@@ -111,77 +36,19 @@
// Columns, offsets, pushes, and pulls for the small device range, from phones
// to tablets.
//
-// Note that `.col-sm-12` doesn't get floated on purpose—there's no need since
+// Note that `.col-sm-12` doesn't get floated on purpose--there's no need since
// it's full-width.
-@media (min-width: @screen-tablet) {
+@media (min-width: @screen-sm-min) {
.container {
- max-width: @container-tablet;
- }
-
- .col-sm-1,
- .col-sm-2,
- .col-sm-3,
- .col-sm-4,
- .col-sm-5,
- .col-sm-6,
- .col-sm-7,
- .col-sm-8,
- .col-sm-9,
- .col-sm-10,
- .col-sm-11 {
- float: left;
+ width: @container-sm;
}
- .col-sm-1 { width: percentage((1 / @grid-columns)); }
- .col-sm-2 { width: percentage((2 / @grid-columns)); }
- .col-sm-3 { width: percentage((3 / @grid-columns)); }
- .col-sm-4 { width: percentage((4 / @grid-columns)); }
- .col-sm-5 { width: percentage((5 / @grid-columns)); }
- .col-sm-6 { width: percentage((6 / @grid-columns)); }
- .col-sm-7 { width: percentage((7 / @grid-columns)); }
- .col-sm-8 { width: percentage((8 / @grid-columns)); }
- .col-sm-9 { width: percentage((9 / @grid-columns)); }
- .col-sm-10 { width: percentage((10/ @grid-columns)); }
- .col-sm-11 { width: percentage((11/ @grid-columns)); }
- .col-sm-12 { width: 100%; }
-
- // Push and pull columns for source order changes
- .col-sm-push-1 { left: percentage((1 / @grid-columns)); }
- .col-sm-push-2 { left: percentage((2 / @grid-columns)); }
- .col-sm-push-3 { left: percentage((3 / @grid-columns)); }
- .col-sm-push-4 { left: percentage((4 / @grid-columns)); }
- .col-sm-push-5 { left: percentage((5 / @grid-columns)); }
- .col-sm-push-6 { left: percentage((6 / @grid-columns)); }
- .col-sm-push-7 { left: percentage((7 / @grid-columns)); }
- .col-sm-push-8 { left: percentage((8 / @grid-columns)); }
- .col-sm-push-9 { left: percentage((9 / @grid-columns)); }
- .col-sm-push-10 { left: percentage((10/ @grid-columns)); }
- .col-sm-push-11 { left: percentage((11/ @grid-columns)); }
- .col-sm-pull-1 { right: percentage((1 / @grid-columns)); }
- .col-sm-pull-2 { right: percentage((2 / @grid-columns)); }
- .col-sm-pull-3 { right: percentage((3 / @grid-columns)); }
- .col-sm-pull-4 { right: percentage((4 / @grid-columns)); }
- .col-sm-pull-5 { right: percentage((5 / @grid-columns)); }
- .col-sm-pull-6 { right: percentage((6 / @grid-columns)); }
- .col-sm-pull-7 { right: percentage((7 / @grid-columns)); }
- .col-sm-pull-8 { right: percentage((8 / @grid-columns)); }
- .col-sm-pull-9 { right: percentage((9 / @grid-columns)); }
- .col-sm-pull-10 { right: percentage((10/ @grid-columns)); }
- .col-sm-pull-11 { right: percentage((11/ @grid-columns)); }
-
- // Offsets
- .col-sm-offset-1 { margin-left: percentage((1 / @grid-columns)); }
- .col-sm-offset-2 { margin-left: percentage((2 / @grid-columns)); }
- .col-sm-offset-3 { margin-left: percentage((3 / @grid-columns)); }
- .col-sm-offset-4 { margin-left: percentage((4 / @grid-columns)); }
- .col-sm-offset-5 { margin-left: percentage((5 / @grid-columns)); }
- .col-sm-offset-6 { margin-left: percentage((6 / @grid-columns)); }
- .col-sm-offset-7 { margin-left: percentage((7 / @grid-columns)); }
- .col-sm-offset-8 { margin-left: percentage((8 / @grid-columns)); }
- .col-sm-offset-9 { margin-left: percentage((9 / @grid-columns)); }
- .col-sm-offset-10 { margin-left: percentage((10/ @grid-columns)); }
- .col-sm-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+ .make-grid-columns-float(sm);
+ .make-grid(@grid-columns, sm, width);
+ .make-grid(@grid-columns, sm, pull);
+ .make-grid(@grid-columns, sm, push);
+ .make-grid(@grid-columns, sm, offset);
}
@@ -189,79 +56,19 @@
//
// Columns, offsets, pushes, and pulls for the desktop device range.
//
-// Note that `.col-md-12` doesn't get floated on purpose—there's no need since
+// Note that `.col-md-12` doesn't get floated on purpose--there's no need since
// it's full-width.
-@media (min-width: @screen-desktop) {
+@media (min-width: @screen-md-min) {
.container {
- max-width: @container-desktop;
- }
- .col-md-1,
- .col-md-2,
- .col-md-3,
- .col-md-4,
- .col-md-5,
- .col-md-6,
- .col-md-7,
- .col-md-8,
- .col-md-9,
- .col-md-10,
- .col-md-11 {
- float: left;
+ width: @container-md;
}
- .col-md-1 { width: percentage((1 / @grid-columns)); }
- .col-md-2 { width: percentage((2 / @grid-columns)); }
- .col-md-3 { width: percentage((3 / @grid-columns)); }
- .col-md-4 { width: percentage((4 / @grid-columns)); }
- .col-md-5 { width: percentage((5 / @grid-columns)); }
- .col-md-6 { width: percentage((6 / @grid-columns)); }
- .col-md-7 { width: percentage((7 / @grid-columns)); }
- .col-md-8 { width: percentage((8 / @grid-columns)); }
- .col-md-9 { width: percentage((9 / @grid-columns)); }
- .col-md-10 { width: percentage((10/ @grid-columns)); }
- .col-md-11 { width: percentage((11/ @grid-columns)); }
- .col-md-12 { width: 100%; }
- // Push and pull columns for source order changes
- .col-md-push-0 { left: auto; }
- .col-md-push-1 { left: percentage((1 / @grid-columns)); }
- .col-md-push-2 { left: percentage((2 / @grid-columns)); }
- .col-md-push-3 { left: percentage((3 / @grid-columns)); }
- .col-md-push-4 { left: percentage((4 / @grid-columns)); }
- .col-md-push-5 { left: percentage((5 / @grid-columns)); }
- .col-md-push-6 { left: percentage((6 / @grid-columns)); }
- .col-md-push-7 { left: percentage((7 / @grid-columns)); }
- .col-md-push-8 { left: percentage((8 / @grid-columns)); }
- .col-md-push-9 { left: percentage((9 / @grid-columns)); }
- .col-md-push-10 { left: percentage((10/ @grid-columns)); }
- .col-md-push-11 { left: percentage((11/ @grid-columns)); }
-
- .col-md-pull-0 { right: auto; }
- .col-md-pull-1 { right: percentage((1 / @grid-columns)); }
- .col-md-pull-2 { right: percentage((2 / @grid-columns)); }
- .col-md-pull-3 { right: percentage((3 / @grid-columns)); }
- .col-md-pull-4 { right: percentage((4 / @grid-columns)); }
- .col-md-pull-5 { right: percentage((5 / @grid-columns)); }
- .col-md-pull-6 { right: percentage((6 / @grid-columns)); }
- .col-md-pull-7 { right: percentage((7 / @grid-columns)); }
- .col-md-pull-8 { right: percentage((8 / @grid-columns)); }
- .col-md-pull-9 { right: percentage((9 / @grid-columns)); }
- .col-md-pull-10 { right: percentage((10/ @grid-columns)); }
- .col-md-pull-11 { right: percentage((11/ @grid-columns)); }
-
- // Offsets
- .col-md-offset-0 { margin-left: 0; }
- .col-md-offset-1 { margin-left: percentage((1 / @grid-columns)); }
- .col-md-offset-2 { margin-left: percentage((2 / @grid-columns)); }
- .col-md-offset-3 { margin-left: percentage((3 / @grid-columns)); }
- .col-md-offset-4 { margin-left: percentage((4 / @grid-columns)); }
- .col-md-offset-5 { margin-left: percentage((5 / @grid-columns)); }
- .col-md-offset-6 { margin-left: percentage((6 / @grid-columns)); }
- .col-md-offset-7 { margin-left: percentage((7 / @grid-columns)); }
- .col-md-offset-8 { margin-left: percentage((8 / @grid-columns)); }
- .col-md-offset-9 { margin-left: percentage((9 / @grid-columns)); }
- .col-md-offset-10 { margin-left: percentage((10/ @grid-columns)); }
- .col-md-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+ .make-grid-columns-float(md);
+ .make-grid(@grid-columns, md, width);
+ .make-grid(@grid-columns, md, pull);
+ .make-grid(@grid-columns, md, push);
+ .make-grid(@grid-columns, md, offset);
}
@@ -269,78 +76,18 @@
//
// Columns, offsets, pushes, and pulls for the large desktop device range.
//
-// Note that `.col-lg-12` doesn't get floated on purpose—there's no need since
+// Note that `.col-lg-12` doesn't get floated on purpose--there's no need since
// it's full-width.
-@media (min-width: @screen-lg-desktop) {
+@media (min-width: @screen-lg-min) {
.container {
- max-width: @container-lg-desktop;
- }
-
- .col-lg-1,
- .col-lg-2,
- .col-lg-3,
- .col-lg-4,
- .col-lg-5,
- .col-lg-6,
- .col-lg-7,
- .col-lg-8,
- .col-lg-9,
- .col-lg-10,
- .col-lg-11 {
- float: left;
+ width: @container-lg;
}
- .col-lg-1 { width: percentage((1 / @grid-columns)); }
- .col-lg-2 { width: percentage((2 / @grid-columns)); }
- .col-lg-3 { width: percentage((3 / @grid-columns)); }
- .col-lg-4 { width: percentage((4 / @grid-columns)); }
- .col-lg-5 { width: percentage((5 / @grid-columns)); }
- .col-lg-6 { width: percentage((6 / @grid-columns)); }
- .col-lg-7 { width: percentage((7 / @grid-columns)); }
- .col-lg-8 { width: percentage((8 / @grid-columns)); }
- .col-lg-9 { width: percentage((9 / @grid-columns)); }
- .col-lg-10 { width: percentage((10/ @grid-columns)); }
- .col-lg-11 { width: percentage((11/ @grid-columns)); }
- .col-lg-12 { width: 100%; }
- // Push and pull columns for source order changes
- .col-lg-push-0 { left: auto; }
- .col-lg-push-1 { left: percentage((1 / @grid-columns)); }
- .col-lg-push-2 { left: percentage((2 / @grid-columns)); }
- .col-lg-push-3 { left: percentage((3 / @grid-columns)); }
- .col-lg-push-4 { left: percentage((4 / @grid-columns)); }
- .col-lg-push-5 { left: percentage((5 / @grid-columns)); }
- .col-lg-push-6 { left: percentage((6 / @grid-columns)); }
- .col-lg-push-7 { left: percentage((7 / @grid-columns)); }
- .col-lg-push-8 { left: percentage((8 / @grid-columns)); }
- .col-lg-push-9 { left: percentage((9 / @grid-columns)); }
- .col-lg-push-10 { left: percentage((10/ @grid-columns)); }
- .col-lg-push-11 { left: percentage((11/ @grid-columns)); }
-
- .col-lg-pull-0 { right: auto; }
- .col-lg-pull-1 { right: percentage((1 / @grid-columns)); }
- .col-lg-pull-2 { right: percentage((2 / @grid-columns)); }
- .col-lg-pull-3 { right: percentage((3 / @grid-columns)); }
- .col-lg-pull-4 { right: percentage((4 / @grid-columns)); }
- .col-lg-pull-5 { right: percentage((5 / @grid-columns)); }
- .col-lg-pull-6 { right: percentage((6 / @grid-columns)); }
- .col-lg-pull-7 { right: percentage((7 / @grid-columns)); }
- .col-lg-pull-8 { right: percentage((8 / @grid-columns)); }
- .col-lg-pull-9 { right: percentage((9 / @grid-columns)); }
- .col-lg-pull-10 { right: percentage((10/ @grid-columns)); }
- .col-lg-pull-11 { right: percentage((11/ @grid-columns)); }
-
- // Offsets
- .col-lg-offset-0 { margin-left: 0; }
- .col-lg-offset-1 { margin-left: percentage((1 / @grid-columns)); }
- .col-lg-offset-2 { margin-left: percentage((2 / @grid-columns)); }
- .col-lg-offset-3 { margin-left: percentage((3 / @grid-columns)); }
- .col-lg-offset-4 { margin-left: percentage((4 / @grid-columns)); }
- .col-lg-offset-5 { margin-left: percentage((5 / @grid-columns)); }
- .col-lg-offset-6 { margin-left: percentage((6 / @grid-columns)); }
- .col-lg-offset-7 { margin-left: percentage((7 / @grid-columns)); }
- .col-lg-offset-8 { margin-left: percentage((8 / @grid-columns)); }
- .col-lg-offset-9 { margin-left: percentage((9 / @grid-columns)); }
- .col-lg-offset-10 { margin-left: percentage((10/ @grid-columns)); }
- .col-lg-offset-11 { margin-left: percentage((11/ @grid-columns)); }
+ .make-grid-columns-float(lg);
+ .make-grid(@grid-columns, lg, width);
+ .make-grid(@grid-columns, lg, pull);
+ .make-grid(@grid-columns, lg, push);
+ .make-grid(@grid-columns, lg, offset);
}
+
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 570f03f..8516a79 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/input-groups.less
@@ -61,6 +61,7 @@
font-size: @font-size-base;
font-weight: normal;
line-height: 1;
+ color: @input-color;
text-align: center;
background-color: @input-group-addon-bg;
border: 1px solid @input-group-addon-border-color;
@@ -112,6 +113,14 @@
.input-group-btn {
position: relative;
white-space: nowrap;
+
+ // Negative margin to only have a 1px border between the two
+ &:first-child > .btn {
+ margin-right: -1px;
+ }
+ &:last-child > .btn {
+ margin-left: -1px;
+ }
}
.input-group-btn > .btn {
position: relative;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 8f482af..22c2978 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/jumbotron.less
@@ -6,7 +6,7 @@
.jumbotron {
padding: @jumbotron-padding;
margin-bottom: @jumbotron-padding;
- font-size: (@font-size-base * 1.5);
+ font-size: @jumbotron-font-size;
font-weight: 200;
line-height: (@line-height-base * 1.5);
color: @jumbotron-color;
@@ -24,7 +24,7 @@
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container
}
- @media screen and (min-width: @screen-tablet) {
+ @media screen and (min-width: @screen-sm-min) {
padding-top: (@jumbotron-padding * 1.6);
padding-bottom: (@jumbotron-padding * 1.6);
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/list-group.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/list-group.less b/tapestry-webresources/src/test/webapp/bootstrap/less/list-group.less
index 46cda40..2cee529 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/list-group.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/list-group.less
@@ -39,21 +39,21 @@
> .badge + .badge {
margin-right: 5px;
}
+}
- // Linked list items
- a& {
- color: @list-group-link-color;
+// Linked list items
+a.list-group-item {
+ color: @list-group-link-color;
- .list-group-item-heading {
- color: @list-group-link-heading-color;
- }
+ .list-group-item-heading {
+ color: @list-group-link-heading-color;
+ }
- // Hover state
- &:hover,
- &:focus {
- text-decoration: none;
- background-color: @list-group-hover-bg;
- }
+ // Hover state
+ &:hover,
+ &:focus {
+ text-decoration: none;
+ background-color: @list-group-hover-bg;
}
// Active class on item itself, not parent
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less
index 3f23020..3d24e66 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less
@@ -27,11 +27,11 @@
}
}
-// Webkit-style focus
+// WebKit-style focus
.tab-focus() {
// Default
outline: thin dotted #333;
- // Webkit
+ // WebKit
outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px;
}
@@ -69,7 +69,15 @@
}
// CSS image replacement
+//
+// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// mixins being reused as classes with the same name, this doesn't hold up. As
+// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note
+// that we cannot chain the mixins together in Less, so they are repeated.
+//
// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+
+// Deprecated as of v3.0.1 (will be removed in v4)
.hide-text() {
font: ~"0/0" a;
color: transparent;
@@ -77,6 +85,14 @@
background-color: transparent;
border: 0;
}
+// New mixin to use as of v3.0.1
+.text-hide() {
+ font: ~"0/0" a;
+ color: transparent;
+ text-shadow: none;
+ background-color: transparent;
+ border: 0;
+}
@@ -112,6 +128,10 @@
-webkit-transition: @transition;
transition: @transition;
}
+.transition-property(@transition-property) {
+ -webkit-transition-property: @transition-property;
+ transition-property: @transition-property;
+}
.transition-delay(@transition-delay) {
-webkit-transition-delay: @transition-delay;
transition-delay: @transition-delay;
@@ -153,10 +173,41 @@
transform: translate3d(@x, @y, @z);
}
+.rotateX(@degrees) {
+ -webkit-transform: rotateX(@degrees);
+ -ms-transform: rotateX(@degrees); // IE9+
+ transform: rotateX(@degrees);
+}
+.rotateY(@degrees) {
+ -webkit-transform: rotateY(@degrees);
+ -ms-transform: rotateY(@degrees); // IE9+
+ transform: rotateY(@degrees);
+}
+.perspective(@perspective) {
+ -webkit-perspective: @perspective;
+ -moz-perspective: @perspective;
+ perspective: @perspective;
+}
+.perspective-origin(@perspective) {
+ -webkit-perspective-origin: @perspective;
+ -moz-perspective-origin: @perspective;
+ perspective-origin: @perspective;
+}
+.transform-origin(@origin) {
+ -webkit-transform-origin: @origin;
+ -moz-transform-origin: @origin;
+ transform-origin: @origin;
+}
+
+// Animations
+.animation(@animation) {
+ -webkit-animation: @animation;
+ animation: @animation;
+}
+
// Backface visibility
// Prevent browsers from flickering when using CSS 3D transforms.
// Default value is `visible`, but can be changed to `hidden`
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
.backface-visibility(@visibility){
-webkit-backface-visibility: @visibility;
-moz-backface-visibility: @visibility;
@@ -240,7 +291,7 @@
// Color stops are not available in IE9 and below.
.vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {
background-image: -webkit-gradient(linear, left @start-percent, left @end-percent, from(@start-color), to(@end-color)); // Safari 4+, Chrome 2+
- background-image: -webkit-linear-gradient(top, @start-color, @start-percent, @end-color, @end-percent); // Safari 5.1+, Chrome 10+
+ background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1+, Chrome 10+
background-image: -moz-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // FF 3.6+
background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10
background-repeat: repeat-x;
@@ -276,11 +327,11 @@
background-image: radial-gradient(circle, @inner-color, @outer-color);
background-repeat: no-repeat;
}
- .striped(@color: #555; @angle: 45deg) {
- background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
- background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
- background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
- background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
+ .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {
+ background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, @color), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, @color), color-stop(.75, @color), color-stop(.75, transparent), to(transparent));
+ background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
+ background-image: -moz-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
+ background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);
}
}
@@ -342,13 +393,18 @@
// -------------------------
.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
border-color: @border;
+
& > .panel-heading {
color: @heading-text-color;
background-color: @heading-bg-color;
border-color: @heading-border;
+
+ .panel-collapse .panel-body {
border-top-color: @border;
}
+ & > .dropdown .caret {
+ border-color: @heading-text-color transparent;
+ }
}
& > .panel-footer {
+ .panel-collapse .panel-body {
@@ -363,6 +419,7 @@
background-color: @background;
border-color: @border;
color: @text-color;
+
hr {
border-top-color: darken(@border, 5%);
}
@@ -384,7 +441,6 @@
&.@{state} > td,
&.@{state} > th {
background-color: @background;
- border-color: @border;
}
}
@@ -393,9 +449,9 @@
.table-hover > tbody > tr {
> td.@{state}:hover,
> th.@{state}:hover,
- &.@{state}:hover > td {
+ &.@{state}:hover > td,
+ &.@{state}:hover > th {
background-color: darken(@background, 5%);
- border-color: darken(@border, 5%);
}
}
}
@@ -432,7 +488,7 @@
&:active,
&.active {
background-color: @background;
- border-color: @border
+ border-color: @border;
}
}
}
@@ -496,7 +552,7 @@
.progress-bar-variant(@color) {
background-color: @color;
.progress-striped & {
- #gradient > .striped(@color);
+ #gradient > .striped();
}
}
@@ -511,12 +567,13 @@
}
.responsive-invisibility() {
- display: none !important;
- tr& { display: none !important; }
+ &,
+ tr&,
th&,
td& { display: none !important; }
}
+
// Grid System
// -----------
@@ -558,7 +615,7 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-sm) {
+ @media (min-width: @screen-sm-min) {
float: left;
width: percentage((@columns / @grid-columns));
}
@@ -566,17 +623,17 @@
// Generate the small column offsets
.make-sm-column-offset(@columns) {
- @media (min-width: @screen-sm) {
+ @media (min-width: @screen-sm-min) {
margin-left: percentage((@columns / @grid-columns));
}
}
.make-sm-column-push(@columns) {
- @media (min-width: @screen-sm) {
+ @media (min-width: @screen-sm-min) {
left: percentage((@columns / @grid-columns));
}
}
.make-sm-column-pull(@columns) {
- @media (min-width: @screen-sm) {
+ @media (min-width: @screen-sm-min) {
right: percentage((@columns / @grid-columns));
}
}
@@ -591,15 +648,15 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-md) {
+ @media (min-width: @screen-md-min) {
float: left;
width: percentage((@columns / @grid-columns));
}
}
-// Generate the large column offsets
+// Generate the medium column offsets
.make-md-column-offset(@columns) {
- @media (min-width: @screen-md) {
+ @media (min-width: @screen-md-min) {
margin-left: percentage((@columns / @grid-columns));
}
}
@@ -609,7 +666,7 @@
}
}
.make-md-column-pull(@columns) {
- @media (min-width: @screen-md) {
+ @media (min-width: @screen-md-min) {
right: percentage((@columns / @grid-columns));
}
}
@@ -624,7 +681,7 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
float: left;
width: percentage((@columns / @grid-columns));
}
@@ -632,22 +689,96 @@
// Generate the large column offsets
.make-lg-column-offset(@columns) {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
margin-left: percentage((@columns / @grid-columns));
}
}
.make-lg-column-push(@columns) {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
left: percentage((@columns / @grid-columns));
}
}
.make-lg-column-pull(@columns) {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
right: percentage((@columns / @grid-columns));
}
}
+// Framework grid generation
+//
+// Used only by Bootstrap to generate the correct number of grid classes given
+// any value of `@grid-columns`.
+
+.make-grid-columns() {
+ // Common styles for all sizes of grid columns, widths 1-12
+ .col(@index) when (@index = 1) { // initial
+ @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
+ .col(@index + 1, @item);
+ }
+ .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
+ @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
+ .col(@index + 1, ~"@{list}, @{item}");
+ }
+ .col(@index, @list) when (@index > @grid-columns) { // terminal
+ @{list} {
+ position: relative;
+ // Prevent columns from collapsing when empty
+ min-height: 1px;
+ // Inner gutter via padding
+ padding-left: (@grid-gutter-width / 2);
+ padding-right: (@grid-gutter-width / 2);
+ }
+ }
+ .col(1); // kickstart it
+}
+
+.make-grid-columns-float(@class) {
+ .col(@index) when (@index = 1) { // initial
+ @item: ~".col-@{class}-@{index}";
+ .col(@index + 1, @item);
+ }
+ .col(@index, @list) when (@index < @grid-columns) { // general
+ @item: ~".col-@{class}-@{index}";
+ .col(@index + 1, ~"@{list}, @{item}");
+ }
+ .col(@index, @list) when (@index = @grid-columns) { // terminal
+ @{list} {
+ float: left;
+ }
+ }
+ .col(1); // kickstart it
+}
+
+.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {
+ .col-@{class}-@{index} {
+ width: percentage((@index / @grid-columns));
+ }
+}
+.calc-grid(@index, @class, @type) when (@type = push) {
+ .col-@{class}-push-@{index} {
+ left: percentage((@index / @grid-columns));
+ }
+}
+.calc-grid(@index, @class, @type) when (@type = pull) {
+ .col-@{class}-pull-@{index} {
+ right: percentage((@index / @grid-columns));
+ }
+}
+.calc-grid(@index, @class, @type) when (@type = offset) {
+ .col-@{class}-offset-@{index} {
+ margin-left: percentage((@index / @grid-columns));
+ }
+}
+
+// Basic looping in LESS
+.make-grid(@index, @class, @type) when (@index >= 0) {
+ .calc-grid(@index, @class, @type);
+ // next iteration
+ .make-grid(@index - 1, @class, @type);
+}
+
+
// Form validation states
//
// Used in forms.less to generate the form validation CSS for warnings, errors,
@@ -656,7 +787,11 @@
.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {
// Color the label and help text
.help-block,
- .control-label {
+ .control-label,
+ .radio,
+ .checkbox,
+ .radio-inline,
+ .checkbox-inline {
color: @text-color;
}
// Set the border and box shadow on specific inputs to match
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 7bc6c31..99cf764 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less
@@ -10,14 +10,6 @@
// Kill the scroll on the body
.modal-open {
overflow: hidden;
-
-
- // Account for hiding of scrollbar
- body&,
- .navbar-fixed-top,
- .navbar-fixed-bottom {
- margin-right: 15px
- }
}
// Container that the modal scrolls within
@@ -42,6 +34,7 @@
// Shell div to position the modal with bottom padding
.modal-dialog {
+ position: relative;
margin-left: auto;
margin-right: auto;
width: auto;
@@ -125,11 +118,9 @@
}
// Scale up the modal
-@media screen and (min-width: @screen-tablet) {
+@media screen and (min-width: @screen-sm-min) {
.modal-dialog {
- left: 50%;
- right: auto;
width: 600px;
padding-top: 30px;
padding-bottom: 30px;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 351e204..987cde6 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less
@@ -10,7 +10,6 @@
.navbar {
position: relative;
- z-index: @zindex-navbar;
min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
margin-bottom: @navbar-margin-bottom;
border: 1px solid transparent;
@@ -75,7 +74,7 @@
}
&.in {
- overflow-y: visible;
+ overflow-y: auto;
}
// Account for first and last children spacing
@@ -111,12 +110,14 @@
//
// Navbar alignment options
//
-// Display the navbar across the entirity of the page or fixed it to the top or
+// Display the navbar across the entirety of the page or fixed it to the top or
// bottom of the page.
// Static top (unfixed, but 100% wide) navbar
.navbar-static-top {
+ z-index: @zindex-navbar;
border-width: 0 0 1px;
+
@media (min-width: @grid-float-breakpoint) {
border-radius: 0;
}
@@ -128,7 +129,7 @@
position: fixed;
right: 0;
left: 0;
- border-width: 0 0 1px;
+ z-index: @zindex-navbar-fixed;
// Undo the rounded corners
@media (min-width: @grid-float-breakpoint) {
@@ -136,12 +137,13 @@
}
}
.navbar-fixed-top {
- z-index: @zindex-navbar-fixed;
top: 0;
+ border-width: 0 0 1px;
}
.navbar-fixed-bottom {
bottom: 0;
margin-bottom: 0; // override .navbar defaults
+ border-width: 1px 0 0;
}
@@ -152,6 +154,7 @@
padding: @navbar-padding-vertical @navbar-padding-horizontal;
font-size: @font-size-large;
line-height: @line-height-computed;
+
&:hover,
&:focus {
text-decoration: none;
@@ -254,7 +257,7 @@
// Component alignment
//
-// Repurpose the pull utilities as their own navbar utilities to avoid specifity
+// Repurpose the pull utilities as their own navbar utilities to avoid specificity
// issues with parents and chaining. Only do this when the navbar is uncollapsed
// though so that navbar contents properly stack and align in mobile.
@@ -408,7 +411,7 @@
.navbar-collapse,
.navbar-form {
- border-color: darken(@navbar-default-bg, 7%);
+ border-color: @navbar-default-border;
}
// Dropdown menu items and carets
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 6002a8c..6cddcd4 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/navs.less
@@ -48,15 +48,25 @@
&:focus {
background-color: @nav-link-hover-bg;
border-color: @link-color;
+
+ .caret {
+ border-top-color: @link-hover-color;
+ border-bottom-color: @link-hover-color;
+ }
}
}
- // Dividers (basically an hr) within the dropdown
+ // Nav dividers (deprecated with v3.0.1)
+ //
+ // This should have been removed in v3 with the dropping of `.nav-list`, but
+ // we missed it. We don't currently support this anywhere, but in the interest
+ // of maintaining backward compatibility in case you use it, it's deprecated.
.nav-divider {
.nav-divider();
}
// Prevent IE8 from misplacing imgs
+ //
// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
> li > a > img {
max-width: none;
@@ -115,7 +125,7 @@
// Links rendered as pills
> a {
- border-radius: 5px;
+ border-radius: @nav-pills-border-radius;
}
+ li {
margin-left: 2px;
@@ -128,6 +138,11 @@
&:focus {
color: @nav-pills-active-link-hover-color;
background-color: @nav-pills-active-link-hover-bg;
+
+ .caret {
+ border-top-color: @nav-pills-active-link-hover-color;
+ border-bottom-color: @nav-pills-active-link-hover-color;
+ }
}
}
}
@@ -159,28 +174,54 @@
float: none;
> a {
text-align: center;
+ margin-bottom: 5px;
}
}
- @media (min-width: @screen-sm) {
+ > .dropdown .dropdown-menu {
+ top: auto;
+ left: auto;
+ }
+
+ @media (min-width: @screen-sm-min) {
> li {
display: table-cell;
width: 1%;
+ > a {
+ margin-bottom: 0;
+ }
}
}
}
// Move borders to anchors instead of bottom of list
+//
+// Mixin for adding on top the shared `.nav-justified` styles for our tabs
.nav-tabs-justified {
border-bottom: 0;
- > li > a {
- border-bottom: 1px solid @nav-tabs-justified-link-border-color;
+ > li > a {
// Override margin from .nav-tabs
margin-right: 0;
+ border-radius: @border-radius-base;
}
- > .active > a {
- border-bottom-color: @nav-tabs-justified-active-link-border-color;
+
+ > .active > a,
+ > .active > a:hover,
+ > .active > a:focus {
+ border: 1px solid @nav-tabs-justified-link-border-color;
+ }
+
+ @media (min-width: @screen-sm-min) {
+ > li > a {
+ border-bottom: 1px solid @nav-tabs-justified-link-border-color;
+ border-radius: @border-radius-base @border-radius-base 0 0;
+ }
+ > .active > a,
+ > .active > a:hover,
+ > .active > a:focus {
+ border-bottom-color: @nav-tabs-justified-active-link-border-color;
+ }
}
}
@@ -188,25 +229,17 @@
// Tabbable tabs
// -------------------------
-// Clear any floats
-.tabbable {
- .clearfix();
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
- display: none;
-}
-.tab-content,
-.pill-content {
+// Hide tabbable panes to start, show them when `.active`
+.tab-content {
+ > .tab-pane {
+ display: none;
+ }
> .active {
display: block;
}
}
-
// Dropdowns
// -------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/normalize.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/normalize.less b/tapestry-webresources/src/test/webapp/bootstrap/less/normalize.less
index a2e9c64..42a393f 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/normalize.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/normalize.less
@@ -1,4 +1,4 @@
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
// ==========================================================================
// HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
}
//
-// Address styling not present in IE 8/9.
+// Address `[hidden]` styling not present in IE 8/9.
+// Hide the `template` element in IE, Safari, and Firefox < 22.
//
-[hidden] {
+[hidden],
+template {
display: none;
}
@@ -63,8 +65,8 @@ audio:not([controls]) {
html {
font-family: sans-serif; // 1
- -webkit-text-size-adjust: 100%; // 2
-ms-text-size-adjust: 100%; // 2
+ -webkit-text-size-adjust: 100%; // 2
}
//
@@ -80,6 +82,14 @@ body {
// ==========================================================================
//
+// Remove the gray background color from active links in IE 10.
+//
+
+a {
+ background: transparent;
+}
+
+//
// Address `outline` inconsistency between Chrome and other browsers.
//
@@ -329,8 +339,8 @@ html input[disabled] {
}
//
-// 1. Address box sizing set to `content-box` in IE 8/9.
-// 2. Remove excess padding in IE 8/9.
+// 1. Address box sizing set to `content-box` in IE 8/9/10.
+// 2. Remove excess padding in IE 8/9/10.
//
input[type="checkbox"],
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 b480b38..5c68b8b 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/pagination.less
@@ -58,6 +58,8 @@
> .disabled {
> span,
+ > span:hover,
+ > span:focus,
> a,
> a:hover,
> a:focus {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less b/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less
index 2343b25..a107ff1 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less
@@ -56,12 +56,37 @@
// watch it go full width.
.panel {
- > .table {
+ > .table,
+ > .table-responsive {
margin-bottom: 0;
}
- > .panel-body + .table {
+ > .panel-body + .table,
+ > .panel-body + .table-responsive {
border-top: 1px solid @table-border-color;
}
+ > .table-bordered,
+ > .table-responsive > .table-bordered {
+ border: 0;
+ > thead,
+ > tbody,
+ > tfoot {
+ > tr {
+ > th:first-child,
+ > td:first-child {
+ border-left: 0;
+ }
+ > th:last-child,
+ > td:last-child {
+ border-right: 0;
+ }
+
+ &:last-child > th,
+ &:last-child > td {
+ border-bottom: 0;
+ }
+ }
+ }
+ }
}
@@ -70,6 +95,10 @@
padding: 10px 15px;
border-bottom: 1px solid transparent;
.border-top-radius(@panel-border-radius - 1);
+
+ > .dropdown .dropdown-toggle {
+ color: inherit;
+ }
}
// Within heading, strip any `h*` tag of it's default margins for spacing.
@@ -119,11 +148,6 @@
border-bottom: 1px solid @panel-inner-border;
}
}
-
- // New subcomponent for wrapping collapsable content for proper animations
- .panel-collapse {
-
- }
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/print.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/print.less b/tapestry-webresources/src/test/webapp/bootstrap/less/print.less
index 1e4bffe..07277a3 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/print.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/print.less
@@ -26,7 +26,6 @@
}
// Don't show links for images, or javascript/internal links
- .ir a:after,
a[href^="javascript:"]:after,
a[href^="#"]:after {
content: "";
@@ -67,6 +66,12 @@
page-break-after: avoid;
}
+ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
+ // Once fixed, we can just straight up remove this.
+ select {
+ background: #fff !important;
+ }
+
// Bootstrap components
.navbar {
display: none;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/progress-bars.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/progress-bars.less b/tapestry-webresources/src/test/webapp/bootstrap/less/progress-bars.less
index 49e5df8..507c82d 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/progress-bars.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/progress-bars.less
@@ -6,7 +6,7 @@
// Bar animations
// -------------------------
-// Webkit
+// WebKit
@-webkit-keyframes progress-bar-stripes {
from { background-position: 40px 0; }
to { background-position: 0 0; }
@@ -51,6 +51,7 @@
width: 0%;
height: 100%;
font-size: @font-size-small;
+ line-height: @line-height-computed;
color: @progress-bar-color;
text-align: center;
background-color: @progress-bar-bg;
@@ -60,17 +61,13 @@
// Striped bars
.progress-striped .progress-bar {
- #gradient > .striped(@progress-bar-bg);
+ #gradient > .striped();
background-size: 40px 40px;
}
// Call animation for the active one
.progress.active .progress-bar {
- -webkit-animation: progress-bar-stripes 2s linear infinite;
- -moz-animation: progress-bar-stripes 2s linear infinite;
- -ms-animation: progress-bar-stripes 2s linear infinite;
- -o-animation: progress-bar-stripes 2s linear infinite;
- animation: progress-bar-stripes 2s linear infinite;
+ .animation(progress-bar-stripes 2s linear infinite);
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less
----------------------------------------------------------------------
diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less b/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less
index c756b23..df53e47 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less
@@ -3,36 +3,25 @@
// --------------------------------------------------
-// IE10 Metro responsive
-// Required for Windows 8 Metro split-screen snapping with IE10
+// IE10 in Windows (Phone) 8
//
-// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-@-ms-viewport{
- width: device-width;
-}
-
-// IE10 on Windows Phone 8
-// IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In
-// other words, say on a Lumia, you'll get 768px as the device width,
-// meaning users will see the tablet styles and not phone styles.
+// Support for responsive views via media queries is kind of borked in IE10, for
+// Surface/desktop in split view and for Windows Phone 8. This particular fix
+// must be accompanied by a snippet of JavaScript to sniff the user agent and
+// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at
+// our Getting Started page for more information on this bug.
//
-// Alternatively you can override this with JS (see source below), but
-// we won't be doing that here given our limited scope.
+// For more information, see the following:
//
-// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
-@media screen and (max-width: 400px) {
- @-ms-viewport{
- width: 320px;
- }
-}
+// Issue: https://github.com/twbs/bootstrap/issues/10497
+// Docs: http://getbootstrap.com/getting-started/#browsers
+// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden {
- display: none !important;
- visibility: hidden !important;
+@-ms-viewport {
+ width: device-width;
}
+
// Visibility utilities
.visible-xs {
@@ -41,19 +30,19 @@
.responsive-visibility();
}
&.visible-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-visibility();
}
}
&.visible-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-visibility();
- }
+ }
}
&.visible-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-visibility();
- }
+ }
}
}
.visible-sm {
@@ -61,20 +50,20 @@
&.visible-xs {
@media (max-width: @screen-xs-max) {
.responsive-visibility();
- }
+ }
}
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-visibility();
}
&.visible-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-visibility();
- }
+ }
}
&.visible-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-visibility();
- }
+ }
}
}
.visible-md {
@@ -82,20 +71,20 @@
&.visible-xs {
@media (max-width: @screen-xs-max) {
.responsive-visibility();
- }
+ }
}
&.visible-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-visibility();
}
}
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-visibility();
}
&.visible-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-visibility();
- }
+ }
}
}
.visible-lg {
@@ -103,19 +92,19 @@
&.visible-xs {
@media (max-width: @screen-xs-max) {
.responsive-visibility();
- }
+ }
}
&.visible-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-visibility();
}
}
&.visible-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-visibility();
- }
+ }
}
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-visibility();
}
}
@@ -126,19 +115,19 @@
.responsive-invisibility();
}
&.hidden-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-invisibility();
- }
+ }
}
}
.hidden-sm {
@@ -148,18 +137,18 @@
.responsive-invisibility();
}
}
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-invisibility();
}
&.hidden-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-invisibility();
- }
+ }
}
}
.hidden-md {
@@ -167,20 +156,20 @@
&.hidden-xs {
@media (max-width: @screen-xs-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-invisibility();
- }
+ }
}
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-invisibility();
}
&.hidden-lg {
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-invisibility();
- }
+ }
}
}
.hidden-lg {
@@ -188,19 +177,19 @@
&.hidden-xs {
@media (max-width: @screen-xs-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-sm {
- @media (min-width: @screen-sm) and (max-width: @screen-sm-max) {
+ @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
.responsive-invisibility();
- }
+ }
}
&.hidden-md {
- @media (min-width: @screen-md) and (max-width: @screen-md-max) {
+ @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
.responsive-invisibility();
- }
+ }
}
- @media (min-width: @screen-lg) {
+ @media (min-width: @screen-lg-min) {
.responsive-invisibility();
}
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b9c756cd/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 53e1be5..976b4e3 100755
--- a/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less
+++ b/tapestry-webresources/src/test/webapp/bootstrap/less/scaffolding.less
@@ -37,17 +37,6 @@ textarea {
line-height: inherit;
}
-// Reset unusual Firefox-on-Android default style.
-//
-// See https://github.com/necolas/normalize.css/issues/214
-
-button,
-input,
-select[multiple],
-textarea {
- background-image: none;
-}
-
// Links
@@ -125,6 +114,6 @@ hr {
margin: -1px;
padding: 0;
overflow: hidden;
- clip: rect(0 0 0 0);
+ clip: rect(0,0,0,0);
border: 0;
}