http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 index ae746d8..71723db --- a/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/mixins.less @@ -54,8 +54,7 @@ // Placeholder text .placeholder(@color: @input-color-placeholder) { - &:-moz-placeholder { color: @color; } // Firefox 4-18 - &::-moz-placeholder { color: @color; // Firefox 19+ + &::-moz-placeholder { color: @color; // Firefox opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526 &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome @@ -253,7 +252,6 @@ -webkit-user-select: @select; -moz-user-select: @select; -ms-user-select: @select; // IE10+ - -o-user-select: @select; user-select: @select; } @@ -629,10 +627,7 @@ } .responsive-invisibility() { - &, - tr&, - th&, - td& { display: none !important; } + display: none !important; } @@ -796,7 +791,7 @@ .col(1); // kickstart it } -.make-grid-columns-float(@class) { +.float-grid-columns(@class) { .col(@index) when (@index = 1) { // initial @item: ~".col-@{class}-@{index}"; .col((@index + 1), @item); @@ -813,34 +808,42 @@ .col(1); // kickstart it } -.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) { +.calc-grid-column(@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) { +.calc-grid-column(@index, @class, @type) when (@type = push) { .col-@{class}-push-@{index} { left: percentage((@index / @grid-columns)); } } -.calc-grid(@index, @class, @type) when (@type = pull) { +.calc-grid-column(@index, @class, @type) when (@type = pull) { .col-@{class}-pull-@{index} { right: percentage((@index / @grid-columns)); } } -.calc-grid(@index, @class, @type) when (@type = offset) { +.calc-grid-column(@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); +.loop-grid-columns(@index, @class, @type) when (@index >= 0) { + .calc-grid-column(@index, @class, @type); // next iteration - .make-grid((@index - 1), @class, @type); + .loop-grid-columns((@index - 1), @class, @type); } +// Create grid for specific class +.make-grid(@class) { + .float-grid-columns(@class); + .loop-grid-columns(@grid-columns, @class, width); + .loop-grid-columns(@grid-columns, @class, pull); + .loop-grid-columns(@grid-columns, @class, push); + .loop-grid-columns(@grid-columns, @class, offset); +} // Form validation states //
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 index e7f3d72..21cdee0 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/modals.less @@ -121,7 +121,6 @@ // Scale up the modal @media (min-width: @screen-sm-min) { - // Automatically set modal's width for larger viewports .modal-dialog { width: @modal-md; @@ -133,6 +132,8 @@ // Modal sizes .modal-sm { width: @modal-sm; } - .modal-lg { width: @modal-lg; } +} +@media (min-width: @screen-md-min) { + .modal-lg { width: @modal-lg; } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 index ddb67b9..8c4c210 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/navbar.less @@ -155,7 +155,7 @@ padding: @navbar-padding-vertical @navbar-padding-horizontal; font-size: @font-size-large; line-height: @line-height-computed; - height: @line-height-computed; + height: @navbar-height; &:hover, &:focus { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/pager.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/pager.less b/tapestry-webresources/src/test/webapp/bootstrap/less/pager.less old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 index e677d2b..20dd149 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/panels.less @@ -18,6 +18,37 @@ &:extend(.clearfix all); } +// Optional heading +.panel-heading { + 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 its default margins for spacing. +.panel-title { + margin-top: 0; + margin-bottom: 0; + font-size: ceil((@font-size-base * 1.125)); + color: inherit; + + > a { + color: inherit; + } +} + +// Optional footer (stays gray in every modifier class) +.panel-footer { + padding: 10px 15px; + background-color: @panel-footer-bg; + border-top: 1px solid @panel-inner-border; + .border-bottom-radius((@panel-border-radius - 1)); +} + // List groups in panels // @@ -27,25 +58,23 @@ .panel { > .list-group { margin-bottom: 0; + .list-group-item { border-width: 1px 0; border-radius: 0; - &:first-child { - border-top: 0; - } - &:last-child { - border-bottom: 0; - } } + // Add border top radius for first one &:first-child { .list-group-item:first-child { + border-top: 0; .border-top-radius((@panel-border-radius - 1)); } } // Add border bottom radius for last one &:last-child { .list-group-item:last-child { + border-bottom: 0; .border-bottom-radius((@panel-border-radius - 1)); } } @@ -72,6 +101,8 @@ // Add border top radius for first one > .table:first-child, > .table-responsive:first-child > .table:first-child { + .border-top-radius((@panel-border-radius - 1)); + > thead:first-child, > tbody:first-child { > tr:first-child { @@ -89,6 +120,8 @@ // Add border bottom radius for last one > .table:last-child, > .table-responsive:last-child > .table:last-child { + .border-bottom-radius((@panel-border-radius - 1)); + > tbody:last-child, > tfoot:last-child { > tr:last-child { @@ -126,12 +159,22 @@ > td:last-child { border-right: 0; } - &:first-child > th, - &:first-child > td { - border-top: 0; + } + } + > thead, + > tbody { + > tr:first-child { + > td, + > th { + border-bottom: 0; } - &:last-child > th, - &:last-child > td { + } + } + > tbody, + > tfoot { + > tr:last-child { + > td, + > th { border-bottom: 0; } } @@ -144,38 +187,6 @@ } -// Optional heading -.panel-heading { - 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 its default margins for spacing. -.panel-title { - margin-top: 0; - margin-bottom: 0; - font-size: ceil((@font-size-base * 1.125)); - color: inherit; - - > a { - color: inherit; - } -} - -// Optional footer (stays gray in every modifier class) -.panel-footer { - padding: 10px 15px; - background-color: @panel-footer-bg; - border-top: 1px solid @panel-inner-border; - .border-bottom-radius((@panel-border-radius - 1)); -} - - // Collapsable panels (aka, accordion) // // Wrap a series of panels in `.panel-group` to turn them into an accordion with http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/popovers.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/popovers.less b/tapestry-webresources/src/test/webapp/bootstrap/less/popovers.less old mode 100755 new mode 100644 index 345bb1a..696d74c --- a/tapestry-webresources/src/test/webapp/bootstrap/less/popovers.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/popovers.less @@ -23,10 +23,10 @@ white-space: normal; // Offset the popover to account for the popover arrow - &.top { margin-top: -10px; } - &.right { margin-left: 10px; } - &.bottom { margin-top: 10px; } - &.left { margin-left: -10px; } + &.top { margin-top: -@popover-arrow-width; } + &.right { margin-left: @popover-arrow-width; } + &.bottom { margin-top: @popover-arrow-width; } + &.left { margin-left: -@popover-arrow-width; } } .popover-title { @@ -48,7 +48,7 @@ // // .arrow is outer, .arrow:after is inner -.popover .arrow { +.popover > .arrow { &, &:after { position: absolute; @@ -59,16 +59,16 @@ border-style: solid; } } -.popover .arrow { +.popover > .arrow { border-width: @popover-arrow-outer-width; } -.popover .arrow:after { +.popover > .arrow:after { border-width: @popover-arrow-width; content: ""; } .popover { - &.top .arrow { + &.top > .arrow { left: 50%; margin-left: -@popover-arrow-outer-width; border-bottom-width: 0; @@ -83,7 +83,7 @@ border-top-color: @popover-arrow-color; } } - &.right .arrow { + &.right > .arrow { top: 50%; left: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width; @@ -98,7 +98,7 @@ border-right-color: @popover-arrow-color; } } - &.bottom .arrow { + &.bottom > .arrow { left: 50%; margin-left: -@popover-arrow-outer-width; border-top-width: 0; @@ -114,7 +114,7 @@ } } - &.left .arrow { + &.left > .arrow { top: 50%; right: -@popover-arrow-outer-width; margin-top: -@popover-arrow-outer-width; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 index 5a31816..027a264 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/responsive-utilities.less @@ -23,30 +23,29 @@ // Visibility utilities -.visible-xs { +.visible-xs, +.visible-sm, +.visible-md, +.visible-lg { .responsive-invisibility(); +} +.visible-xs { @media (max-width: @screen-xs-max) { .responsive-visibility(); } } .visible-sm { - .responsive-invisibility(); - @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) { .responsive-visibility(); } } .visible-md { - .responsive-invisibility(); - @media (min-width: @screen-md-min) and (max-width: @screen-md-max) { .responsive-visibility(); } } .visible-lg { - .responsive-invisibility(); - @media (min-width: @screen-lg-min) { .responsive-visibility(); } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/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 old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/tables.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/tables.less b/tapestry-webresources/src/test/webapp/bootstrap/less/tables.less old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less b/tapestry-webresources/src/test/webapp/bootstrap/less/theme.less old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/thumbnails.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/thumbnails.less b/tapestry-webresources/src/test/webapp/bootstrap/less/thumbnails.less old mode 100755 new mode 100644 index 11aa283..c428920 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/thumbnails.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/thumbnails.less @@ -16,7 +16,7 @@ > img, a > img { - .img-responsive(); + &:extend(.img-responsive); margin-left: auto; margin-right: auto; } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less b/tapestry-webresources/src/test/webapp/bootstrap/less/tooltip.less old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/type.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/type.less b/tapestry-webresources/src/test/webapp/bootstrap/less/type.less old mode 100755 new mode 100644 index a55730d..5e2a219 --- a/tapestry-webresources/src/test/webapp/bootstrap/less/type.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/type.less @@ -165,15 +165,12 @@ ol { // Inline turns list items into inline-block .list-inline { .list-unstyled(); + margin-left: -5px; > li { display: inline-block; padding-left: 5px; padding-right: 5px; - - &:first-child { - padding-left: 0; - } } } @@ -233,7 +230,7 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; - font-size: (@font-size-base * 1.25); + font-size: @blockquote-font-size; border-left: 5px solid @blockquote-border-color; p, http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less b/tapestry-webresources/src/test/webapp/bootstrap/less/utilities.less old mode 100755 new mode 100644 http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less b/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less old mode 100755 new mode 100644 index ebc72c0..3846adc --- a/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less +++ b/tapestry-webresources/src/test/webapp/bootstrap/less/variables.less @@ -74,7 +74,7 @@ @icon-font-path: "../fonts/"; @icon-font-name: "glyphicons-halflings-regular"; -@icon-font-svg-id: "glyphicons_halflingsregular"; +@icon-font-svg-id: "glyphicons_halflingsregular"; //== Components // @@ -301,6 +301,26 @@ @grid-float-breakpoint-max: (@grid-float-breakpoint - 1); +//== Container sizes +// +//## Define the maximum width of `.container` for different screen sizes. + +// Small screen / tablet +@container-tablet: ((720px + @grid-gutter-width)); +//** For `@screen-sm-min` and up. +@container-sm: @container-tablet; + +// Medium screen / desktop +@container-desktop: ((940px + @grid-gutter-width)); +//** For `@screen-md-min` and up. +@container-md: @container-desktop; + +// Large screen / wide desktop +@container-large-desktop: ((1140px + @grid-gutter-width)); +//** For `@screen-lg-min` and up. +@container-lg: @container-large-desktop; + + //== Navbar // //## @@ -505,9 +525,9 @@ //** Popover outer arrow width @popover-arrow-outer-width: (@popover-arrow-width + 1); //** Popover outer arrow color -@popover-arrow-outer-color: rgba(0,0,0,.25); +@popover-arrow-outer-color: fadein(@popover-border-color, 5%); //** Popover outer arrow fallback color -@popover-arrow-outer-fallback-color: #999; +@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%); //== Labels @@ -790,6 +810,8 @@ @headings-small-color: @gray-light; //** Blockquote small color @blockquote-small-color: @gray-light; +//** Blockquote font size +@blockquote-font-size: (@font-size-base * 1.25); //** Blockquote border color @blockquote-border-color: @gray-lighter; //** Page header border color @@ -805,23 +827,3 @@ //** Horizontal offset for forms and lists. @component-offset-horizontal: 180px; - - -//== Container sizes -// -//## Define the maximum width of `.container` for different screen sizes. - -// Small screen / tablet -@container-tablet: ((720px + @grid-gutter-width)); -//** For `@screen-sm-min` and up. -@container-sm: @container-tablet; - -// Medium screen / desktop -@container-desktop: ((940px + @grid-gutter-width)); -//** For `@screen-md-min` and up. -@container-md: @container-desktop; - -// Large screen / wide desktop -@container-large-desktop: ((1140px + @grid-gutter-width)); -//** For `@screen-lg-min` and up. -@container-lg: @container-large-desktop; http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7202a3bb/tapestry-webresources/src/test/webapp/bootstrap/less/wells.less ---------------------------------------------------------------------- diff --git a/tapestry-webresources/src/test/webapp/bootstrap/less/wells.less b/tapestry-webresources/src/test/webapp/bootstrap/less/wells.less old mode 100755 new mode 100644