diff --git a/resources/less/bootstrap/mixins.less b/resources/less/bootstrap/mixins.less index 2cc39ad07da38e982fc4a5cedfdb3c9242547374..bd0d9c91c39eafb79127db18c716e186ba85c651 100644 --- a/resources/less/bootstrap/mixins.less +++ b/resources/less/bootstrap/mixins.less @@ -2,39 +2,12 @@ // -------------------------------------------------- // Utilities -@import "mixins/hide-text.less"; -//@import "mixins/opacity.less"; -//@import "mixins/image.less"; -//@import "mixins/labels.less"; -//@import "mixins/reset-filter.less"; -//@import "mixins/resize.less"; -//@import "mixins/responsive-visibility.less"; -@import "mixins/size.less"; -//@import "mixins/tab-focus.less"; -//@import "mixins/reset-text.less"; +@import "mixins/tab-focus.less"; @import "mixins/text-emphasis.less"; -@import "mixins/text-overflow.less"; -//@import "mixins/vendor-prefixes.less"; +@import "mixins/vendor-prefixes.less"; // Components -//@import "mixins/alerts.less"; -//@import "mixins/buttons.less"; -//@import "mixins/panels.less"; -//@import "mixins/pagination.less"; -//@import "mixins/list-group.less"; -//@import "mixins/nav-divider.less"; @import "mixins/forms.less"; -//@import "mixins/progress-bar.less"; -//@import "mixins/table-row.less"; - -// Skins -//@import "mixins/background-variant.less"; -//@import "mixins/border-radius.less"; -//@import "mixins/gradients.less"; // Layout -//@import "mixins/clearfix.less"; -//@import "mixins/center-block.less"; -//@import "mixins/nav-vertical-align.less"; -//@import "mixins/grid-framework.less"; -//@import "mixins/grid.less"; +@import "mixins/grid.less"; diff --git a/resources/less/bootstrap/mixins/alerts.less b/resources/less/bootstrap/mixins/alerts.less deleted file mode 100644 index 396196f438fd31e7757a0874ece4a99fe0cf9fd9..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/alerts.less +++ /dev/null @@ -1,14 +0,0 @@ -// Alerts - -.alert-variant(@background; @border; @text-color) { - background-color: @background; - border-color: @border; - color: @text-color; - - hr { - border-top-color: darken(@border, 5%); - } - .alert-link { - color: darken(@text-color, 10%); - } -} diff --git a/resources/less/bootstrap/mixins/background-variant.less b/resources/less/bootstrap/mixins/background-variant.less deleted file mode 100644 index a85c22b745302f42c8282c0f9b7dce8a2f1384d7..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/background-variant.less +++ /dev/null @@ -1,9 +0,0 @@ -// Contextual backgrounds - -.bg-variant(@color) { - background-color: @color; - a&:hover, - a&:focus { - background-color: darken(@color, 10%); - } -} diff --git a/resources/less/bootstrap/mixins/border-radius.less b/resources/less/bootstrap/mixins/border-radius.less deleted file mode 100644 index ca05dbf457000d122a3b8afcc3847e44cffea421..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/border-radius.less +++ /dev/null @@ -1,18 +0,0 @@ -// Single side border-radius - -.border-top-radius(@radius) { - border-top-right-radius: @radius; - border-top-left-radius: @radius; -} -.border-right-radius(@radius) { - border-bottom-right-radius: @radius; - border-top-right-radius: @radius; -} -.border-bottom-radius(@radius) { - border-bottom-right-radius: @radius; - border-bottom-left-radius: @radius; -} -.border-left-radius(@radius) { - border-bottom-left-radius: @radius; - border-top-left-radius: @radius; -} diff --git a/resources/less/bootstrap/mixins/buttons.less b/resources/less/bootstrap/mixins/buttons.less deleted file mode 100644 index b294d8c210e07ad3e1293863c3ab0c8a45c960c7..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/buttons.less +++ /dev/null @@ -1,65 +0,0 @@ -// Button variants -// -// Easily pump out default styles, as well as :hover, :focus, :active, -// and disabled options for all buttons - -.button-variant(@color; @background; @border) { - color: @color; - background-color: @background; - border-color: @border; - - &:focus, - &.focus { - color: @color; - background-color: darken(@background, 10%); - border-color: darken(@border, 25%); - } - &:hover { - color: @color; - background-color: darken(@background, 10%); - border-color: darken(@border, 12%); - } - &:active, - &.active, - .open > .dropdown-toggle& { - color: @color; - background-color: darken(@background, 10%); - border-color: darken(@border, 12%); - - &:hover, - &:focus, - &.focus { - color: @color; - background-color: darken(@background, 17%); - border-color: darken(@border, 25%); - } - } - &:active, - &.active, - .open > .dropdown-toggle& { - background-image: none; - } - &.disabled, - &[disabled], - fieldset[disabled] & { - &:hover, - &:focus, - &.focus { - background-color: @background; - border-color: @border; - } - } - - .badge { - color: @background; - background-color: @color; - } -} - -// Button sizes -.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { - padding: @padding-vertical @padding-horizontal; - font-size: @font-size; - line-height: @line-height; - border-radius: @border-radius; -} diff --git a/resources/less/bootstrap/mixins/center-block.less b/resources/less/bootstrap/mixins/center-block.less deleted file mode 100644 index d18d6de9ed6a7af49415277cb72e57b7dbd42d0f..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/center-block.less +++ /dev/null @@ -1,7 +0,0 @@ -// Center-align a block level element - -.center-block() { - display: block; - margin-left: auto; - margin-right: auto; -} diff --git a/resources/less/bootstrap/mixins/clearfix.less b/resources/less/bootstrap/mixins/clearfix.less deleted file mode 100644 index 3f7a3820c1cf7756322917982646352e77119f46..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/clearfix.less +++ /dev/null @@ -1,22 +0,0 @@ -// Clearfix -// -// For modern browsers -// 1. The space content is one way to avoid an Opera bug when the -// contenteditable attribute is included anywhere else in the document. -// Otherwise it causes space to appear at the top and bottom of elements -// that are clearfixed. -// 2. The use of `table` rather than `block` is only necessary if using -// `:before` to contain the top-margins of child elements. -// -// Source: http://nicolasgallagher.com/micro-clearfix-hack/ - -.clearfix() { - &:before, - &:after { - content: " "; // 1 - display: table; // 2 - } - &:after { - clear: both; - } -} diff --git a/resources/less/bootstrap/mixins/forms.less b/resources/less/bootstrap/mixins/forms.less index 6f55ed967082caf4ef515f88c9d591f95036a470..9541b7f5d72b5ebed42abeddd79ea527bca588b3 100644 --- a/resources/less/bootstrap/mixins/forms.less +++ b/resources/less/bootstrap/mixins/forms.less @@ -4,38 +4,11 @@ // and successes. .form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { - // Color the label and help text - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline, - &.radio label, - &.checkbox label, - &.radio-inline label, - &.checkbox-inline label { - color: @text-color; - } - // Set the border and box shadow on specific inputs to match + // Set the border and box shadow on specific inputs to match .form-control { border-color: @border-color; .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work - &:focus { - border-color: darken(@border-color, 10%); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); - .box-shadow(@shadow); - } - } - // Set validation states also for addons - .input-group-addon { - color: @text-color; - border-color: @border-color; - background-color: @background-color; - } - // Optional feedback icon - .form-control-feedback { - color: @text-color; + } } @@ -54,11 +27,6 @@ // contrast against a dark gray background. .form-control-focus(@color: @input-border-focus) { @color-rgba: rgba(red(@color), green(@color), blue(@color), .6); - &:focus { - border-color: @color; - outline: 0; - .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}"); - } } // Form control sizing @@ -72,14 +40,4 @@ font-size: @font-size; line-height: @line-height; border-radius: @border-radius; - - select& { - height: @input-height; - line-height: @input-height; - } - - textarea&, - select[multiple]& { - height: auto; - } } diff --git a/resources/less/bootstrap/mixins/gradients.less b/resources/less/bootstrap/mixins/gradients.less deleted file mode 100644 index 0b88a89cc56a63effe45558845122b077de03979..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/gradients.less +++ /dev/null @@ -1,59 +0,0 @@ -// Gradients - -#gradient { - - // Horizontal gradient, from left to right - // - // Creates two color stops, start and end, by specifying a color and position for each color stop. - // Color stops are not available in IE9 and below. - .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) { - background-image: -webkit-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+ - background-image: -o-linear-gradient(left, @start-color @start-percent, @end-color @end-percent); // Opera 12 - background-image: linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down - } - - // Vertical gradient, from top to bottom - // - // Creates two color stops, start and end, by specifying a color and position for each color stop. - // 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-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Safari 5.1-6, Chrome 10+ - background-image: -o-linear-gradient(top, @start-color @start-percent, @end-color @end-percent); // Opera 12 - background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down - } - - .directional(@start-color: #555; @end-color: #333; @deg: 45deg) { - background-repeat: repeat-x; - background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+ - background-image: -o-linear-gradient(@deg, @start-color, @end-color); // Opera 12 - background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+ - } - .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { - background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); - background-image: -o-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color); - background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color); - background-repeat: no-repeat; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback - } - .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) { - background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color); - background-image: -o-linear-gradient(@start-color, @mid-color @color-stop, @end-color); - background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color); - background-repeat: no-repeat; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback - } - .radial(@inner-color: #555; @outer-color: #333) { - background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color); - background-image: radial-gradient(circle, @inner-color, @outer-color); - background-repeat: no-repeat; - } - .striped(@color: rgba(255,255,255,.15); @angle: 45deg) { - background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent); - background-image: -o-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); - } -} diff --git a/resources/less/bootstrap/mixins/grid-framework.less b/resources/less/bootstrap/mixins/grid-framework.less deleted file mode 100644 index 8c23eed24e60e5fca7d991d2de47019892530323..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/grid-framework.less +++ /dev/null @@ -1,91 +0,0 @@ -// 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) { // 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: ceil((@grid-gutter-width / 2)); - padding-right: floor((@grid-gutter-width / 2)); - } - } - .col(1); // kickstart it -} - -.float-grid-columns(@class) { - .col(@index) { // 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-column(@index, @class, @type) when (@type = width) and (@index > 0) { - .col-@{class}-@{index} { - width: percentage((@index / @grid-columns)); - } -} -.calc-grid-column(@index, @class, @type) when (@type = push) and (@index > 0) { - .col-@{class}-push-@{index} { - left: percentage((@index / @grid-columns)); - } -} -.calc-grid-column(@index, @class, @type) when (@type = push) and (@index = 0) { - .col-@{class}-push-0 { - left: auto; - } -} -.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index > 0) { - .col-@{class}-pull-@{index} { - right: percentage((@index / @grid-columns)); - } -} -.calc-grid-column(@index, @class, @type) when (@type = pull) and (@index = 0) { - .col-@{class}-pull-0 { - right: auto; - } -} -.calc-grid-column(@index, @class, @type) when (@type = offset) { - .col-@{class}-offset-@{index} { - margin-left: percentage((@index / @grid-columns)); - } -} - -// Basic looping in LESS -.loop-grid-columns(@index, @class, @type) when (@index >= 0) { - .calc-grid-column(@index, @class, @type); - // next iteration - .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); -} diff --git a/resources/less/bootstrap/mixins/grid.less b/resources/less/bootstrap/mixins/grid.less index df496d0b3c1a96f60ad996870bba4fd2cf388d33..251c347c0ce85e54c71b1492c486c7543f9fe62b 100644 --- a/resources/less/bootstrap/mixins/grid.less +++ b/resources/less/bootstrap/mixins/grid.less @@ -1,15 +1,3 @@ -// Grid system -// -// Generate semantic grid columns with these mixins. - -// Centered container element -.container-fixed(@gutter: @grid-gutter-width) { - margin-right: auto; - margin-left: auto; - padding-left: floor((@gutter / 2)); - padding-right: ceil((@gutter / 2)); - &:extend(.clearfix all); -} // Creates a wrapper for a series of columns .make-row(@gutter: @grid-gutter-width) { @@ -18,105 +6,3 @@ &:extend(.clearfix all); } -// Generate the extra small columns -.make-xs-column(@columns; @gutter: @grid-gutter-width) { - position: relative; - float: left; - width: percentage((@columns / @grid-columns)); - min-height: 1px; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); -} -.make-xs-column-offset(@columns) { - margin-left: percentage((@columns / @grid-columns)); -} -.make-xs-column-push(@columns) { - left: percentage((@columns / @grid-columns)); -} -.make-xs-column-pull(@columns) { - right: percentage((@columns / @grid-columns)); -} - -// Generate the small columns -.make-sm-column(@columns; @gutter: @grid-gutter-width) { - position: relative; - min-height: 1px; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); - - @media (min-width: @screen-sm-min) { - float: left; - width: percentage((@columns / @grid-columns)); - } -} -.make-sm-column-offset(@columns) { - @media (min-width: @screen-sm-min) { - margin-left: percentage((@columns / @grid-columns)); - } -} -.make-sm-column-push(@columns) { - @media (min-width: @screen-sm-min) { - left: percentage((@columns / @grid-columns)); - } -} -.make-sm-column-pull(@columns) { - @media (min-width: @screen-sm-min) { - right: percentage((@columns / @grid-columns)); - } -} - -// Generate the medium columns -.make-md-column(@columns; @gutter: @grid-gutter-width) { - position: relative; - min-height: 1px; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); - - @media (min-width: @screen-md-min) { - float: left; - width: percentage((@columns / @grid-columns)); - } -} -.make-md-column-offset(@columns) { - @media (min-width: @screen-md-min) { - margin-left: percentage((@columns / @grid-columns)); - } -} -.make-md-column-push(@columns) { - @media (min-width: @screen-md-min) { - left: percentage((@columns / @grid-columns)); - } -} -.make-md-column-pull(@columns) { - @media (min-width: @screen-md-min) { - right: percentage((@columns / @grid-columns)); - } -} - -// Generate the large columns -.make-lg-column(@columns; @gutter: @grid-gutter-width) { - position: relative; - min-height: 1px; - padding-left: (@gutter / 2); - padding-right: (@gutter / 2); - - @media (min-width: @screen-lg-min) { - float: left; - width: percentage((@columns / @grid-columns)); - } -} -.make-lg-column-offset(@columns) { - @media (min-width: @screen-lg-min) { - margin-left: percentage((@columns / @grid-columns)); - } -} -.make-lg-column-push(@columns) { - @media (min-width: @screen-lg-min) { - left: percentage((@columns / @grid-columns)); - } -} -.make-lg-column-pull(@columns) { - @media (min-width: @screen-lg-min) { - right: percentage((@columns / @grid-columns)); - } -} diff --git a/resources/less/bootstrap/mixins/hide-text.less b/resources/less/bootstrap/mixins/hide-text.less deleted file mode 100644 index 2bb84a3b444fc158cd24ef77789c624d989fa8ed..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/hide-text.less +++ /dev/null @@ -1,21 +0,0 @@ -// CSS image replacement -// -// Heads up! v3 launched 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()`. -// -// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757 - -// Deprecated as of v3.0.1 (has been removed in v4) -.hide-text() { - font: ~"0/0" a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -// New mixin to use as of v3.0.1 -.text-hide() { - .hide-text(); -} diff --git a/resources/less/bootstrap/mixins/image.less b/resources/less/bootstrap/mixins/image.less deleted file mode 100644 index f233cb3e199f21ac194212e10ebb1e12feb0682b..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/image.less +++ /dev/null @@ -1,33 +0,0 @@ -// Image Mixins -// - Responsive image -// - Retina image - - -// Responsive image -// -// Keep images from scaling beyond the width of their parents. -.img-responsive(@display: block) { - display: @display; - max-width: 100%; // Part 1: Set a maximum relative to the parent - height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching -} - - -// Retina image -// -// Short retina mixin for setting background-image and -size. Note that the -// spelling of `min--moz-device-pixel-ratio` is intentional. -.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) { - background-image: url("@{file-1x}"); - - @media - only screen and (-webkit-min-device-pixel-ratio: 2), - only screen and ( min--moz-device-pixel-ratio: 2), - only screen and ( -o-min-device-pixel-ratio: 2/1), - only screen and ( min-device-pixel-ratio: 2), - only screen and ( min-resolution: 192dpi), - only screen and ( min-resolution: 2dppx) { - background-image: url("@{file-2x}"); - background-size: @width-1x @height-1x; - } -} diff --git a/resources/less/bootstrap/mixins/labels.less b/resources/less/bootstrap/mixins/labels.less deleted file mode 100644 index 9f7a67ee3d08a03ad10277d703805d315cd43d54..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/labels.less +++ /dev/null @@ -1,12 +0,0 @@ -// Labels - -.label-variant(@color) { - background-color: @color; - - &[href] { - &:hover, - &:focus { - background-color: darken(@color, 10%); - } - } -} diff --git a/resources/less/bootstrap/mixins/list-group.less b/resources/less/bootstrap/mixins/list-group.less deleted file mode 100644 index 03aa19069d954a3db712462f17d073eca6a9498f..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/list-group.less +++ /dev/null @@ -1,30 +0,0 @@ -// List Groups - -.list-group-item-variant(@state; @background; @color) { - .list-group-item-@{state} { - color: @color; - background-color: @background; - - a&, - button& { - color: @color; - - .list-group-item-heading { - color: inherit; - } - - &:hover, - &:focus { - color: @color; - background-color: darken(@background, 5%); - } - &.active, - &.active:hover, - &.active:focus { - color: #fff; - background-color: @color; - border-color: @color; - } - } - } -} diff --git a/resources/less/bootstrap/mixins/nav-divider.less b/resources/less/bootstrap/mixins/nav-divider.less deleted file mode 100644 index feb1e9ed0dad8d0db00ebb93b175591a88abf707..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/nav-divider.less +++ /dev/null @@ -1,10 +0,0 @@ -// Horizontal dividers -// -// Dividers (basically an hr) within dropdowns and nav lists - -.nav-divider(@color: #e5e5e5) { - height: 1px; - margin: ((@line-height-computed / 2) - 1) 0; - overflow: hidden; - background-color: @color; -} diff --git a/resources/less/bootstrap/mixins/nav-vertical-align.less b/resources/less/bootstrap/mixins/nav-vertical-align.less deleted file mode 100644 index d458c78613e6dc082141783ef45d56a5a7d601c3..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/nav-vertical-align.less +++ /dev/null @@ -1,9 +0,0 @@ -// Navbar vertical align -// -// Vertically center elements in the navbar. -// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin. - -.navbar-vertical-align(@element-height) { - margin-top: ((@navbar-height - @element-height) / 2); - margin-bottom: ((@navbar-height - @element-height) / 2); -} diff --git a/resources/less/bootstrap/mixins/opacity.less b/resources/less/bootstrap/mixins/opacity.less deleted file mode 100644 index 33ed25ce6763de7f8ae195628c1eb168379d8435..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/opacity.less +++ /dev/null @@ -1,8 +0,0 @@ -// Opacity - -.opacity(@opacity) { - opacity: @opacity; - // IE8 filter - @opacity-ie: (@opacity * 100); - filter: ~"alpha(opacity=@{opacity-ie})"; -} diff --git a/resources/less/bootstrap/mixins/pagination.less b/resources/less/bootstrap/mixins/pagination.less deleted file mode 100644 index 618804f2dee3e87612261f10dc934e618d4af0b2..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/pagination.less +++ /dev/null @@ -1,24 +0,0 @@ -// Pagination - -.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { - > li { - > a, - > span { - padding: @padding-vertical @padding-horizontal; - font-size: @font-size; - line-height: @line-height; - } - &:first-child { - > a, - > span { - .border-left-radius(@border-radius); - } - } - &:last-child { - > a, - > span { - .border-right-radius(@border-radius); - } - } - } -} diff --git a/resources/less/bootstrap/mixins/panels.less b/resources/less/bootstrap/mixins/panels.less deleted file mode 100644 index 49ee10d4ad39de45e0983d01cbbc50949a1dac2e..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/panels.less +++ /dev/null @@ -1,24 +0,0 @@ -// Panels - -.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; - } - .badge { - color: @heading-bg-color; - background-color: @heading-text-color; - } - } - & > .panel-footer { - + .panel-collapse > .panel-body { - border-bottom-color: @border; - } - } -} diff --git a/resources/less/bootstrap/mixins/progress-bar.less b/resources/less/bootstrap/mixins/progress-bar.less deleted file mode 100644 index f07996a34dbc19a1acc1c024a2410eb2b1b25271..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/progress-bar.less +++ /dev/null @@ -1,10 +0,0 @@ -// Progress bars - -.progress-bar-variant(@color) { - background-color: @color; - - // Deprecated parent class requirement as of v3.2.0 - .progress-striped & { - #gradient > .striped(); - } -} diff --git a/resources/less/bootstrap/mixins/reset-filter.less b/resources/less/bootstrap/mixins/reset-filter.less deleted file mode 100644 index 68cdb5e18602af3ab8e3ddba57a06045ef1c65bb..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/reset-filter.less +++ /dev/null @@ -1,8 +0,0 @@ -// Reset filters for IE -// -// When you need to remove a gradient background, do not forget to use this to reset -// the IE filter for IE9 and below. - -.reset-filter() { - filter: e(%("progid:DXImageTransform.Microsoft.gradient(enabled = false)")); -} diff --git a/resources/less/bootstrap/mixins/reset-text.less b/resources/less/bootstrap/mixins/reset-text.less deleted file mode 100644 index 58dd4d19b4d1f6c6731ae2dadd512eb62d9e7e81..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/reset-text.less +++ /dev/null @@ -1,18 +0,0 @@ -.reset-text() { - font-family: @font-family-base; - // We deliberately do NOT reset font-size. - font-style: normal; - font-weight: normal; - letter-spacing: normal; - line-break: auto; - line-height: @line-height-base; - text-align: left; // Fallback for where `start` is not supported - text-align: start; - text-decoration: none; - text-shadow: none; - text-transform: none; - white-space: normal; - word-break: normal; - word-spacing: normal; - word-wrap: normal; -} diff --git a/resources/less/bootstrap/mixins/resize.less b/resources/less/bootstrap/mixins/resize.less deleted file mode 100644 index 3acd3afdbacbb7f642e04f7ff434c18107faad69..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/resize.less +++ /dev/null @@ -1,6 +0,0 @@ -// Resize anything - -.resizable(@direction) { - resize: @direction; // Options: horizontal, vertical, both - overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible` -} diff --git a/resources/less/bootstrap/mixins/responsive-visibility.less b/resources/less/bootstrap/mixins/responsive-visibility.less deleted file mode 100644 index ecf1e979fd25c27674d75e1ec6089ee53549dea5..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/responsive-visibility.less +++ /dev/null @@ -1,15 +0,0 @@ -// Responsive utilities - -// -// More easily include all the states for responsive-utilities.less. -.responsive-visibility() { - display: block !important; - table& { display: table !important; } - tr& { display: table-row !important; } - th&, - td& { display: table-cell !important; } -} - -.responsive-invisibility() { - display: none !important; -} diff --git a/resources/less/bootstrap/mixins/size.less b/resources/less/bootstrap/mixins/size.less deleted file mode 100644 index a8be65089606863ad878173e951b62fb387daf52..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/size.less +++ /dev/null @@ -1,10 +0,0 @@ -// Sizing shortcuts - -.size(@width; @height) { - width: @width; - height: @height; -} - -.square(@size) { - .size(@size; @size); -} diff --git a/resources/less/bootstrap/mixins/table-row.less b/resources/less/bootstrap/mixins/table-row.less deleted file mode 100644 index 0f287f1a8bdf51607e91d0c8aa6a5be51d6df36e..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/table-row.less +++ /dev/null @@ -1,28 +0,0 @@ -// Tables - -.table-row-variant(@state; @background) { - // Exact selectors below required to override `.table-striped` and prevent - // inheritance to nested tables. - .table > thead > tr, - .table > tbody > tr, - .table > tfoot > tr { - > td.@{state}, - > th.@{state}, - &.@{state} > td, - &.@{state} > th { - background-color: @background; - } - } - - // Hover states for `.table-hover` - // Note: this is not available for cells or rows within `thead` or `tfoot`. - .table-hover > tbody > tr { - > td.@{state}:hover, - > th.@{state}:hover, - &.@{state}:hover > td, - &:hover > .@{state}, - &.@{state}:hover > th { - background-color: darken(@background, 5%); - } - } -} diff --git a/resources/less/bootstrap/mixins/text-overflow.less b/resources/less/bootstrap/mixins/text-overflow.less deleted file mode 100644 index c11ad2fb7471dd29ae781f1aefdfb8bb5e4a7d6c..0000000000000000000000000000000000000000 --- a/resources/less/bootstrap/mixins/text-overflow.less +++ /dev/null @@ -1,8 +0,0 @@ -// Text overflow -// Requires inline-block or block for proper styling - -.text-overflow() { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} diff --git a/resources/less/bootstrap/mixins/vendor-prefixes.less b/resources/less/bootstrap/mixins/vendor-prefixes.less index 2b5e74b99ed685f4d5e780a9694b9903a59f257b..1d01fcc997eec4bf7a7166bc607cd9a4d2767dc8 100644 --- a/resources/less/bootstrap/mixins/vendor-prefixes.less +++ b/resources/less/bootstrap/mixins/vendor-prefixes.less @@ -3,63 +3,13 @@ // All vendor mixins are deprecated as of v3.2.0 due to the introduction of // Autoprefixer in our Gruntfile. They have been removed in v4. -// - Animations -// - Backface visibility // - Box shadow // - Box sizing -// - Content columns -// - Hyphens // - Placeholder text -// - Transformations // - Transitions // - User Select -// Animations -.animation(@animation) { - -webkit-animation: @animation; - -o-animation: @animation; - animation: @animation; -} -.animation-name(@name) { - -webkit-animation-name: @name; - animation-name: @name; -} -.animation-duration(@duration) { - -webkit-animation-duration: @duration; - animation-duration: @duration; -} -.animation-timing-function(@timing-function) { - -webkit-animation-timing-function: @timing-function; - animation-timing-function: @timing-function; -} -.animation-delay(@delay) { - -webkit-animation-delay: @delay; - animation-delay: @delay; -} -.animation-iteration-count(@iteration-count) { - -webkit-animation-iteration-count: @iteration-count; - animation-iteration-count: @iteration-count; -} -.animation-direction(@direction) { - -webkit-animation-direction: @direction; - animation-direction: @direction; -} -.animation-fill-mode(@fill-mode) { - -webkit-animation-fill-mode: @fill-mode; - animation-fill-mode: @fill-mode; -} - -// Backface visibility -// Prevent browsers from flickering when using CSS 3D transforms. -// Default value is `visible`, but can be changed to `hidden` - -.backface-visibility(@visibility) { - -webkit-backface-visibility: @visibility; - -moz-backface-visibility: @visibility; - backface-visibility: @visibility; -} - // Drop shadows // // Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's @@ -77,25 +27,6 @@ box-sizing: @boxmodel; } -// CSS3 Content Columns -.content-columns(@column-count; @column-gap: @grid-gutter-width) { - -webkit-column-count: @column-count; - -moz-column-count: @column-count; - column-count: @column-count; - -webkit-column-gap: @column-gap; - -moz-column-gap: @column-gap; - column-gap: @column-gap; -} - -// Optional hyphenation -.hyphens(@mode: auto) { - word-wrap: break-word; - -webkit-hyphens: @mode; - -moz-hyphens: @mode; - -ms-hyphens: @mode; // IE10+ - -o-hyphens: @mode; - hyphens: @mode; -} // Placeholder text .placeholder(@color: @input-color-placeholder) { @@ -108,81 +39,7 @@ &::-webkit-input-placeholder { color: @color; } // Safari and Chrome } -// Transformations -.scale(@ratio) { - -webkit-transform: scale(@ratio); - -ms-transform: scale(@ratio); // IE9 only - -o-transform: scale(@ratio); - transform: scale(@ratio); -} -.scale(@ratioX; @ratioY) { - -webkit-transform: scale(@ratioX, @ratioY); - -ms-transform: scale(@ratioX, @ratioY); // IE9 only - -o-transform: scale(@ratioX, @ratioY); - transform: scale(@ratioX, @ratioY); -} -.scaleX(@ratio) { - -webkit-transform: scaleX(@ratio); - -ms-transform: scaleX(@ratio); // IE9 only - -o-transform: scaleX(@ratio); - transform: scaleX(@ratio); -} -.scaleY(@ratio) { - -webkit-transform: scaleY(@ratio); - -ms-transform: scaleY(@ratio); // IE9 only - -o-transform: scaleY(@ratio); - transform: scaleY(@ratio); -} -.skew(@x; @y) { - -webkit-transform: skewX(@x) skewY(@y); - -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+ - -o-transform: skewX(@x) skewY(@y); - transform: skewX(@x) skewY(@y); -} -.translate(@x; @y) { - -webkit-transform: translate(@x, @y); - -ms-transform: translate(@x, @y); // IE9 only - -o-transform: translate(@x, @y); - transform: translate(@x, @y); -} -.translate3d(@x; @y; @z) { - -webkit-transform: translate3d(@x, @y, @z); - transform: translate3d(@x, @y, @z); -} -.rotate(@degrees) { - -webkit-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); // IE9 only - -o-transform: rotate(@degrees); - transform: rotate(@degrees); -} -.rotateX(@degrees) { - -webkit-transform: rotateX(@degrees); - -ms-transform: rotateX(@degrees); // IE9 only - -o-transform: rotateX(@degrees); - transform: rotateX(@degrees); -} -.rotateY(@degrees) { - -webkit-transform: rotateY(@degrees); - -ms-transform: rotateY(@degrees); // IE9 only - -o-transform: rotateY(@degrees); - 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; - -ms-transform-origin: @origin; // IE9 only - transform-origin: @origin; -} + // Transitions @@ -192,28 +49,6 @@ -o-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; -} -.transition-duration(@transition-duration) { - -webkit-transition-duration: @transition-duration; - transition-duration: @transition-duration; -} -.transition-timing-function(@timing-function) { - -webkit-transition-timing-function: @timing-function; - transition-timing-function: @timing-function; -} -.transition-transform(@transition) { - -webkit-transition: -webkit-transform @transition; - -moz-transition: -moz-transform @transition; - -o-transition: -o-transform @transition; - transition: transform @transition; -} // User select diff --git a/resources/less/metager/mixins/clearfix.less b/resources/less/metager/mixins/clearfix.less deleted file mode 100644 index cd3a84cac7e60e8cb8d497c43bbbc67bd6d0b657..0000000000000000000000000000000000000000 --- a/resources/less/metager/mixins/clearfix.less +++ /dev/null @@ -1,11 +0,0 @@ -.clearfix() { - &:before, - &:after { - content: " "; // 1 - display: table; // 2 - } - &:after { - clear: both; - } - } - \ No newline at end of file diff --git a/resources/less/metager/mixins/forms.less b/resources/less/metager/mixins/forms.less index 5d2f2e80a09ee9bef53991b0ffa1a01ca29eea9c..683527b18e1ed37d35f5ea36b001055cdeaa8ef4 100644 --- a/resources/less/metager/mixins/forms.less +++ b/resources/less/metager/mixins/forms.less @@ -4,83 +4,40 @@ // and successes. .form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) { - // Color the label and help text - .help-block, - .control-label, - .radio, - .checkbox, - .radio-inline, - .checkbox-inline, - &.radio label, - &.checkbox label, - &.radio-inline label, - &.checkbox-inline label { - color: @text-color; - } - // Set the border and box shadow on specific inputs to match - .form-control { - border-color: @border-color; - .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work - &:focus { - border-color: darken(@border-color, 10%); - @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%); - .box-shadow(@shadow); - } - } - // Set validation states also for addons - .input-group-addon { - color: @text-color; - border-color: @border-color; - background-color: @background-color; - } - // Optional feedback icon - .form-control-feedback { - color: @text-color; - } - } - - - // Form control focus state - // - // Generate a customized focus state and for any input with the specified color, - // which defaults to the `@input-border-focus` variable. - // - // We highly encourage you to not customize the default value, but instead use - // this to tweak colors on an as-needed basis. This aesthetic change is based on - // WebKit's default styles, but applicable to a wider range of browsers. Its - // usability and accessibility should be taken into account with any change. - // - // Example usage: change the default blue border and shadow to white for better - // contrast against a dark gray background. - .form-control-focus(@color: @input-border-focus) { - @color-rgba: rgba(red(@color), green(@color), blue(@color), .6); - &:focus { - border-color: @color; - outline: 0; - .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}"); - } - } - - // Form control sizing - // - // Relative text size, padding, and border-radii changes for form controls. For - // horizontal sizing, wrap controls in the predefined grid classes. `<select>` - // element gets special love because it's special, and that's a fact! - .input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { - height: @input-height; - padding: @padding-vertical @padding-horizontal; - font-size: @font-size; - line-height: @line-height; - border-radius: @border-radius; - - select& { - height: @input-height; - line-height: @input-height; - } - - textarea&, - select[multiple]& { - height: auto; - } - } - \ No newline at end of file + // Set the border and box shadow on specific inputs to match + .form-control { + border-color: @border-color; + .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work + + } +} + + +// Form control focus state +// +// Generate a customized focus state and for any input with the specified color, +// which defaults to the `@input-border-focus` variable. +// +// We highly encourage you to not customize the default value, but instead use +// this to tweak colors on an as-needed basis. This aesthetic change is based on +// WebKit's default styles, but applicable to a wider range of browsers. Its +// usability and accessibility should be taken into account with any change. +// +// Example usage: change the default blue border and shadow to white for better +// contrast against a dark gray background. +.form-control-focus(@color: @input-border-focus) { + @color-rgba: rgba(red(@color), green(@color), blue(@color), .6); +} + +// Form control sizing +// +// Relative text size, padding, and border-radii changes for form controls. For +// horizontal sizing, wrap controls in the predefined grid classes. `<select>` +// element gets special love because it's special, and that's a fact! +.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) { + height: @input-height; + padding: @padding-vertical @padding-horizontal; + font-size: @font-size; + line-height: @line-height; + border-radius: @border-radius; +} diff --git a/resources/less/metager/mixins/grid.less b/resources/less/metager/mixins/grid.less new file mode 100644 index 0000000000000000000000000000000000000000..131d4e647c0e2a5ba07da5d5edcadd49ccdf78fe --- /dev/null +++ b/resources/less/metager/mixins/grid.less @@ -0,0 +1,6 @@ +// Creates a wrapper for a series of columns + .make-row(@gutter: @grid-gutter-width) { + margin-left: ceil((@gutter / -2)); + margin-right: floor((@gutter / -2)); + &:extend(.clearfix all); + } diff --git a/resources/less/metager/mixins/mixins.less b/resources/less/metager/mixins/mixins.less index ee115c06f7b552cc0cf8aecf06474fd6a3f82d16..bcba71c5d82244ff4338d153c976e2351f6e08c8 100644 --- a/resources/less/metager/mixins/mixins.less +++ b/resources/less/metager/mixins/mixins.less @@ -1,2 +1,5 @@ @import "forms.less"; -@import "clearfix.less"; \ No newline at end of file +@import "tab-focus.less"; +@import "vendor-prefixes.less"; +@import "grid.less"; +@import "text-emphasis.less"; diff --git a/resources/less/metager/mixins/tab-focus.less b/resources/less/metager/mixins/tab-focus.less new file mode 100644 index 0000000000000000000000000000000000000000..f5759ce68cc7401d459f572b98ea9e349a0ebf86 --- /dev/null +++ b/resources/less/metager/mixins/tab-focus.less @@ -0,0 +1,8 @@ +.tab-focus() { + // WebKit-specific. Other browsers will keep their default outline style. + // (Initially tried to also force default via `outline: initial`, + // but that seems to erroneously remove the outline in Firefox altogether.) + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; + } + \ No newline at end of file diff --git a/resources/less/metager/mixins/text-emphasis.less b/resources/less/metager/mixins/text-emphasis.less new file mode 100644 index 0000000000000000000000000000000000000000..cdca6ba602580b469a5c1bbf0f234030ed56d3a5 --- /dev/null +++ b/resources/less/metager/mixins/text-emphasis.less @@ -0,0 +1,8 @@ +.text-emphasis-variant(@color) { + color: @color; + a&:hover, + a&:focus { + color: darken(@color, 10%); + } + } + \ No newline at end of file diff --git a/resources/less/metager/mixins/vendor-prefixes.less b/resources/less/metager/mixins/vendor-prefixes.less new file mode 100644 index 0000000000000000000000000000000000000000..0525094690c64d1c244a0ac33a3eccd7c2011ce1 --- /dev/null +++ b/resources/less/metager/mixins/vendor-prefixes.less @@ -0,0 +1,56 @@ +// Vendor Prefixes +// +// All vendor mixins are deprecated as of v3.2.0 due to the introduction of +// Autoprefixer in our Gruntfile. They have been removed in v4. + + +// - Box shadow +// - Box sizing +// - Placeholder text +// - Transitions +// - User select + +// Drop shadows +// +// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's +// supported browsers that have box shadow capabilities now support it. + +.box-shadow(@shadow) { + -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1 + box-shadow: @shadow; + } + + // Box sizing + .box-sizing(@boxmodel) { + -webkit-box-sizing: @boxmodel; + -moz-box-sizing: @boxmodel; + box-sizing: @boxmodel; + } + + + // Placeholder text + .placeholder(@color: @input-color-placeholder) { + // Firefox + &::-moz-placeholder { + color: @color; + opacity: 1; // Override Firefox's unusual default opacity; see https://github.com/twbs/bootstrap/pull/11526 + } + &:-ms-input-placeholder { color: @color; } // Internet Explorer 10+ + &::-webkit-input-placeholder { color: @color; } // Safari and Chrome + } + // Transitions + + .transition(@transition) { + -webkit-transition: @transition; + -o-transition: @transition; + transition: @transition; + } + // User select +// For selecting text on the page + +.user-select(@select) { + -webkit-user-select: @select; + -moz-user-select: @select; + -ms-user-select: @select; // IE10+ + user-select: @select; + } \ No newline at end of file