Upgrade Bootstrap to 3.3.2
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/360177b9 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/360177b9 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/360177b9 Branch: refs/heads/master Commit: 360177b9cfbe46d44d292e6aec94870fe6e9da36 Parents: b81fea5 Author: Jochen Kemnade <[email protected]> Authored: Tue Jan 20 08:51:18 2015 +0100 Committer: Jochen Kemnade <[email protected]> Committed: Tue Jan 20 08:52:34 2015 +0100 ---------------------------------------------------------------------- 54_RELEASE_NOTES.md | 4 +- build.gradle | 2 +- .../tapestry5/bootstrap/css/bootstrap-theme.css | 10 +- .../tapestry5/bootstrap/css/bootstrap.css | 280 ++++++++++- .../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 487 +++++++++++-------- .../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../assets/tapestry5/bootstrap/js/affix.js | 8 +- .../assets/tapestry5/bootstrap/js/alert.js | 6 +- .../assets/tapestry5/bootstrap/js/button.js | 6 +- .../assets/tapestry5/bootstrap/js/carousel.js | 17 +- .../assets/tapestry5/bootstrap/js/collapse.js | 8 +- .../assets/tapestry5/bootstrap/js/dropdown.js | 6 +- .../assets/tapestry5/bootstrap/js/modal.js | 6 +- .../assets/tapestry5/bootstrap/js/popover.js | 20 +- .../assets/tapestry5/bootstrap/js/scrollspy.js | 6 +- .../assets/tapestry5/bootstrap/js/tab.js | 6 +- .../assets/tapestry5/bootstrap/js/tooltip.js | 26 +- .../assets/tapestry5/bootstrap/js/transition.js | 4 +- .../fonts/glyphicons-halflings-regular.eot | Bin 20335 -> 20127 bytes .../fonts/glyphicons-halflings-regular.svg | 487 +++++++++++-------- .../fonts/glyphicons-halflings-regular.ttf | Bin 41280 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23320 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes .../src/test/webapp/bootstrap/js/affix.js | 8 +- .../src/test/webapp/bootstrap/js/alert.js | 6 +- .../src/test/webapp/bootstrap/js/button.js | 6 +- .../src/test/webapp/bootstrap/js/carousel.js | 17 +- .../src/test/webapp/bootstrap/js/collapse.js | 8 +- .../src/test/webapp/bootstrap/js/dropdown.js | 6 +- .../src/test/webapp/bootstrap/js/modal.js | 6 +- .../src/test/webapp/bootstrap/js/popover.js | 20 +- .../src/test/webapp/bootstrap/js/scrollspy.js | 6 +- .../src/test/webapp/bootstrap/js/tab.js | 6 +- .../src/test/webapp/bootstrap/js/tooltip.js | 26 +- .../src/test/webapp/bootstrap/js/transition.js | 4 +- .../src/test/webapp/bootstrap/less/alerts.less | 5 + .../src/test/webapp/bootstrap/less/badges.less | 4 + .../webapp/bootstrap/less/button-groups.less | 4 +- .../src/test/webapp/bootstrap/less/buttons.less | 2 +- .../test/webapp/bootstrap/less/carousel.less | 14 +- .../src/test/webapp/bootstrap/less/close.less | 1 + .../test/webapp/bootstrap/less/dropdowns.less | 3 +- .../src/test/webapp/bootstrap/less/forms.less | 62 ++- .../test/webapp/bootstrap/less/glyphicons.less | 67 +++ .../test/webapp/bootstrap/less/jumbotron.less | 1 + .../src/test/webapp/bootstrap/less/media.less | 14 + .../bootstrap/less/mixins/vendor-prefixes.less | 2 +- .../src/test/webapp/bootstrap/less/navbar.less | 1 + .../src/test/webapp/bootstrap/less/panels.less | 6 +- .../test/webapp/bootstrap/less/popovers.less | 2 +- .../src/test/webapp/bootstrap/less/tables.less | 6 +- .../src/test/webapp/bootstrap/less/theme.less | 5 +- .../src/test/webapp/bootstrap/less/tooltip.less | 2 +- .../test/webapp/bootstrap/less/variables.less | 5 +- 57 files changed, 1082 insertions(+), 632 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/54_RELEASE_NOTES.md ---------------------------------------------------------------------- diff --git a/54_RELEASE_NOTES.md b/54_RELEASE_NOTES.md index b3186bd..8dc74df 100644 --- a/54_RELEASE_NOTES.md +++ b/54_RELEASE_NOTES.md @@ -300,7 +300,7 @@ a new page. ## Bootstrap 3 -Tapestry now includes a default copy of Bootstrap 3.3.1, in addition to its own default set of CSS rules. +Tapestry now includes a default copy of Bootstrap 3.3.2, in addition to its own default set of CSS rules. The Tapestry CSS from prior releases has been largely eliminated; instead components now refer to standard Bootstrap CSS classes. @@ -487,4 +487,4 @@ interfaces that used a String content type have been changed to use the ContentT The FormInjector component was removed; it was intended for use only inside the AjaxFormLoop component (which was rewritten in 5.4 and no longer uses FormInjector). FormInjector was not widely used elsewhere, if -is was used at all. \ No newline at end of file +is was used at all. http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 6c0882b..45dbcc2 100755 --- a/build.gradle +++ b/build.gradle @@ -585,7 +585,7 @@ boolean checkJDK() { } task updateBootstrap << { - def bootstrapVersion = '3.3.1' + def bootstrapVersion = '3.3.2' def target = new File(temporaryDir, 'bootstrap.zip') ant.get(src: "https://github.com/twbs/bootstrap/archive/v${bootstrapVersion}.zip";, dest: target) http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css index 997efef..37a291c 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap-theme.css @@ -1,6 +1,6 @@ /*! - * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -63,6 +63,7 @@ background-color: #e0e0e0; border-color: #dbdbdb; } +.btn-default.disabled, .btn-default:disabled, .btn-default[disabled] { background-color: #e0e0e0; @@ -88,6 +89,7 @@ background-color: #265a88; border-color: #245580; } +.btn-primary.disabled, .btn-primary:disabled, .btn-primary[disabled] { background-color: #265a88; @@ -113,6 +115,7 @@ background-color: #419641; border-color: #3e8f3e; } +.btn-success.disabled, .btn-success:disabled, .btn-success[disabled] { background-color: #419641; @@ -138,6 +141,7 @@ background-color: #2aabd2; border-color: #28a4c9; } +.btn-info.disabled, .btn-info:disabled, .btn-info[disabled] { background-color: #2aabd2; @@ -163,6 +167,7 @@ background-color: #eb9316; border-color: #e38d13; } +.btn-warning.disabled, .btn-warning:disabled, .btn-warning[disabled] { background-color: #eb9316; @@ -188,6 +193,7 @@ background-color: #c12e2a; border-color: #b92c28; } +.btn-danger.disabled, .btn-danger:disabled, .btn-danger[disabled] { background-color: #c12e2a; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css index bb0ecfa..f7c39eb 100644 --- a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css +++ b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/css/bootstrap.css @@ -1,6 +1,6 @@ /*! - * Bootstrap v3.3.1 (http://getbootstrap.com) - * Copyright 2011-2014 Twitter, Inc. + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -268,7 +268,7 @@ th { font-family: 'Glyphicons Halflings'; src: url('../fonts/glyphicons-halflings-regular.eot'); - src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); + src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff2') format('woff2'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg'); } .glyphicon { position: relative; @@ -883,6 +883,180 @@ th { .glyphicon-tree-deciduous:before { content: "\e200"; } +.glyphicon-cd:before { + content: "\e201"; +} +.glyphicon-save-file:before { + content: "\e202"; +} +.glyphicon-open-file:before { + content: "\e203"; +} +.glyphicon-level-up:before { + content: "\e204"; +} +.glyphicon-copy:before { + content: "\e205"; +} +.glyphicon-paste:before { + content: "\e206"; +} +.glyphicon-alert:before { + content: "\e209"; +} +.glyphicon-equalizer:before { + content: "\e210"; +} +.glyphicon-king:before { + content: "\e211"; +} +.glyphicon-queen:before { + content: "\e212"; +} +.glyphicon-pawn:before { + content: "\e213"; +} +.glyphicon-bishop:before { + content: "\e214"; +} +.glyphicon-knight:before { + content: "\e215"; +} +.glyphicon-baby-formula:before { + content: "\e216"; +} +.glyphicon-tent:before { + content: "\26fa"; +} +.glyphicon-blackboard:before { + content: "\e218"; +} +.glyphicon-bed:before { + content: "\e219"; +} +.glyphicon-apple:before { + content: "\f8ff"; +} +.glyphicon-erase:before { + content: "\e221"; +} +.glyphicon-hourglass:before { + content: "\231b"; +} +.glyphicon-lamp:before { + content: "\e223"; +} +.glyphicon-duplicate:before { + content: "\e224"; +} +.glyphicon-piggy-bank:before { + content: "\e225"; +} +.glyphicon-scissors:before { + content: "\e226"; +} +.glyphicon-bitcoin:before { + content: "\e227"; +} +.glyphicon-yen:before { + content: "\00a5"; +} +.glyphicon-ruble:before { + content: "\20bd"; +} +.glyphicon-scale:before { + content: "\e230"; +} +.glyphicon-ice-lolly:before { + content: "\e231"; +} +.glyphicon-ice-lolly-tasted:before { + content: "\e232"; +} +.glyphicon-education:before { + content: "\e233"; +} +.glyphicon-option-horizontal:before { + content: "\e234"; +} +.glyphicon-option-vertical:before { + content: "\e235"; +} +.glyphicon-menu-hamburger:before { + content: "\e236"; +} +.glyphicon-modal-window:before { + content: "\e237"; +} +.glyphicon-oil:before { + content: "\e238"; +} +.glyphicon-grain:before { + content: "\e239"; +} +.glyphicon-sunglasses:before { + content: "\e240"; +} +.glyphicon-text-size:before { + content: "\e241"; +} +.glyphicon-text-color:before { + content: "\e242"; +} +.glyphicon-text-background:before { + content: "\e243"; +} +.glyphicon-object-align-top:before { + content: "\e244"; +} +.glyphicon-object-align-bottom:before { + content: "\e245"; +} +.glyphicon-object-align-horizontal:before { + content: "\e246"; +} +.glyphicon-object-align-left:before { + content: "\e247"; +} +.glyphicon-object-align-vertical:before { + content: "\e248"; +} +.glyphicon-object-align-right:before { + content: "\e249"; +} +.glyphicon-triangle-right:before { + content: "\e250"; +} +.glyphicon-triangle-left:before { + content: "\e251"; +} +.glyphicon-triangle-bottom:before { + content: "\e252"; +} +.glyphicon-triangle-top:before { + content: "\e253"; +} +.glyphicon-console:before { + content: "\e254"; +} +.glyphicon-superscript:before { + content: "\e255"; +} +.glyphicon-subscript:before { + content: "\e256"; +} +.glyphicon-menu-left:before { + content: "\e257"; +} +.glyphicon-menu-right:before { + content: "\e258"; +} +.glyphicon-menu-down:before { + content: "\e259"; +} +.glyphicon-menu-up:before { + content: "\e260"; +} * { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; @@ -2123,7 +2297,7 @@ th { .table-bordered > thead > tr > td { border-bottom-width: 2px; } -.table-striped > tbody > tr:nth-child(odd) { +.table-striped > tbody > tr:nth-of-type(odd) { background-color: #f9f9f9; } .table-hover > tbody > tr:hover { @@ -2410,13 +2584,21 @@ input[type="search"] { input[type="date"].input-sm, input[type="time"].input-sm, input[type="datetime-local"].input-sm, - input[type="month"].input-sm { + input[type="month"].input-sm, + .input-group-sm input[type="date"], + .input-group-sm input[type="time"], + .input-group-sm input[type="datetime-local"], + .input-group-sm input[type="month"] { line-height: 30px; } input[type="date"].input-lg, input[type="time"].input-lg, input[type="datetime-local"].input-lg, - input[type="month"].input-lg { + input[type="month"].input-lg, + .input-group-lg input[type="date"], + .input-group-lg input[type="time"], + .input-group-lg input[type="datetime-local"], + .input-group-lg input[type="month"] { line-height: 46px; } } @@ -2494,7 +2676,21 @@ fieldset[disabled] .checkbox label { padding-right: 0; padding-left: 0; } -.input-sm, +.input-sm { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; + border-radius: 3px; +} +select.input-sm { + height: 30px; + line-height: 30px; +} +textarea.input-sm, +select[multiple].input-sm { + height: auto; +} .form-group-sm .form-control { height: 30px; padding: 5px 10px; @@ -2502,36 +2698,56 @@ fieldset[disabled] .checkbox label { line-height: 1.5; border-radius: 3px; } -select.input-sm, select.form-group-sm .form-control { height: 30px; line-height: 30px; } -textarea.input-sm, textarea.form-group-sm .form-control, -select[multiple].input-sm, select[multiple].form-group-sm .form-control { height: auto; } -.input-lg, +.form-group-sm .form-control-static { + height: 30px; + padding: 5px 10px; + font-size: 12px; + line-height: 1.5; +} +.input-lg { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; + border-radius: 6px; +} +select.input-lg { + height: 46px; + line-height: 46px; +} +textarea.input-lg, +select[multiple].input-lg { + height: auto; +} .form-group-lg .form-control { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } -select.input-lg, select.form-group-lg .form-control { height: 46px; line-height: 46px; } -textarea.input-lg, textarea.form-group-lg .form-control, -select[multiple].input-lg, select[multiple].form-group-lg .form-control { height: auto; } +.form-group-lg .form-control-static { + height: 46px; + padding: 10px 16px; + font-size: 18px; + line-height: 1.3333333; +} .has-feedback { position: relative; } @@ -2740,7 +2956,7 @@ select[multiple].form-group-lg .form-control { } @media (min-width: 768px) { .form-horizontal .form-group-lg .control-label { - padding-top: 14.3px; + padding-top: 14.333333px; } } @media (min-width: 768px) { @@ -3109,7 +3325,7 @@ fieldset[disabled] .btn-link:focus { .btn-group-lg > .btn { padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } .btn-sm, @@ -3185,6 +3401,7 @@ tbody.collapse.in { border-right: 4px solid transparent; border-left: 4px solid transparent; } +.dropup, .dropdown { position: relative; } @@ -3303,7 +3520,7 @@ tbody.collapse.in { .navbar-fixed-bottom .dropdown .dropdown-menu { top: auto; bottom: 100%; - margin-bottom: 1px; + margin-bottom: 2px; } @media (min-width: 768px) { .navbar-right .dropdown-menu { @@ -3375,12 +3592,12 @@ tbody.collapse.in { .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { border-radius: 0; } -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { +.btn-group > .btn-group:first-child:not(:last-child) > .btn:last-child, +.btn-group > .btn-group:first-child:not(:last-child) > .dropdown-toggle { border-top-right-radius: 0; border-bottom-right-radius: 0; } -.btn-group > .btn-group:last-child > .btn:first-child { +.btn-group > .btn-group:last-child:not(:first-child) > .btn:first-child { border-top-left-radius: 0; border-bottom-left-radius: 0; } @@ -3506,7 +3723,7 @@ tbody.collapse.in { height: 46px; padding: 10px 16px; font-size: 18px; - line-height: 1.33; + line-height: 1.3333333; border-radius: 6px; } select.input-group-lg > .form-control, @@ -4120,6 +4337,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn { border-top-right-radius: 0; } .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu { + margin-bottom: 0; border-top-left-radius: 4px; border-top-right-radius: 4px; border-bottom-right-radius: 0; @@ -4859,6 +5077,17 @@ a.thumbnail.active { .media:first-child { margin-top: 0; } +.media, +.media-body { + overflow: hidden; + zoom: 1; +} +.media-body { + width: 10000px; +} +.media-object { + display: block; +} .media-right, .media > .pull-right { padding-left: 10px; @@ -5083,7 +5312,11 @@ a.list-group-item-danger.active:focus { font-size: 16px; color: inherit; } -.panel-title > a { +.panel-title > a, +.panel-title > small, +.panel-title > .small, +.panel-title > small > a, +.panel-title > .small > a { color: inherit; } .panel-footer { @@ -5957,6 +6190,7 @@ button.close { height: 20px; margin-top: -10px; font-family: serif; + line-height: 1; } .carousel-control .icon-prev:before { content: '\2039'; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/360177b9/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.eot ---------------------------------------------------------------------- diff --git a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.eot b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.eot index 4a4ca86..b93a495 100644 Binary files a/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.eot and b/tapestry-core/src/main/resources/META-INF/assets/tapestry5/bootstrap/fonts/glyphicons-halflings-regular.eot differ
