summaryrefslogtreecommitdiff
path: root/bower_components/bootstrap/less/mixins.less
diff options
context:
space:
mode:
Diffstat (limited to 'bower_components/bootstrap/less/mixins.less')
-rwxr-xr-xbower_components/bootstrap/less/mixins.less46
1 files changed, 18 insertions, 28 deletions
diff --git a/bower_components/bootstrap/less/mixins.less b/bower_components/bootstrap/less/mixins.less
index f726b940..3f230205 100755
--- a/bower_components/bootstrap/less/mixins.less
+++ b/bower_components/bootstrap/less/mixins.less
@@ -286,7 +286,7 @@
// Reset filters for IE
//
-// When you need to remove a gradient background, don't forget to use this to reset
+// 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)"));
@@ -340,7 +340,7 @@
// Panels
// -------------------------
-.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {
+.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border;) {
border-color: @border;
& > .panel-heading {
color: @heading-text-color;
@@ -524,26 +524,16 @@
.container-fixed() {
margin-right: auto;
margin-left: auto;
+ padding-left: (@grid-gutter-width / 2);
+ padding-right: (@grid-gutter-width / 2);
.clearfix();
}
// Creates a wrapper for a series of columns
.make-row(@gutter: @grid-gutter-width) {
- // Then clear the floated columns
+ margin-left: (@gutter / -2);
+ margin-right: (@gutter / -2);
.clearfix();
-
- .container & {
- @media (min-width: @screen-small) {
- margin-left: (@gutter / -2);
- margin-right: (@gutter / -2);
- }
- }
-
- // Negative margin nested rows out to align the content of columns
- .row {
- margin-left: (@gutter / -2);
- margin-right: (@gutter / -2);
- }
}
// Generate the extra small columns
@@ -568,7 +558,7 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-small) {
+ @media (min-width: @screen-sm) {
float: left;
width: percentage((@columns / @grid-columns));
}
@@ -576,17 +566,17 @@
// Generate the small column offsets
.make-sm-column-offset(@columns) {
- @media (min-width: @screen-small) {
+ @media (min-width: @screen-sm) {
margin-left: percentage((@columns / @grid-columns));
}
}
.make-sm-column-push(@columns) {
- @media (min-width: @screen-small) {
+ @media (min-width: @screen-sm) {
left: percentage((@columns / @grid-columns));
}
}
.make-sm-column-pull(@columns) {
- @media (min-width: @screen-small) {
+ @media (min-width: @screen-sm) {
right: percentage((@columns / @grid-columns));
}
}
@@ -601,7 +591,7 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-medium) {
+ @media (min-width: @screen-md) {
float: left;
width: percentage((@columns / @grid-columns));
}
@@ -609,17 +599,17 @@
// Generate the large column offsets
.make-md-column-offset(@columns) {
- @media (min-width: @screen-medium) {
+ @media (min-width: @screen-md) {
margin-left: percentage((@columns / @grid-columns));
}
}
.make-md-column-push(@columns) {
- @media (min-width: @screen-medium) {
+ @media (min-width: @screen-md) {
left: percentage((@columns / @grid-columns));
}
}
.make-md-column-pull(@columns) {
- @media (min-width: @screen-medium) {
+ @media (min-width: @screen-md) {
right: percentage((@columns / @grid-columns));
}
}
@@ -634,7 +624,7 @@
padding-right: (@gutter / 2);
// Calculate width based on number of columns available
- @media (min-width: @screen-large) {
+ @media (min-width: @screen-lg) {
float: left;
width: percentage((@columns / @grid-columns));
}
@@ -642,17 +632,17 @@
// Generate the large column offsets
.make-lg-column-offset(@columns) {
- @media (min-width: @screen-large) {
+ @media (min-width: @screen-lg) {
margin-left: percentage((@columns / @grid-columns));
}
}
.make-lg-column-push(@columns) {
- @media (min-width: @screen-large) {
+ @media (min-width: @screen-lg) {
left: percentage((@columns / @grid-columns));
}
}
.make-lg-column-pull(@columns) {
- @media (min-width: @screen-large) {
+ @media (min-width: @screen-lg) {
right: percentage((@columns / @grid-columns));
}
}