mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-29 16:19:53 +02:00
Replace Sass division with multiplication and custom divide() function
Fixes #34353. Co-Authored-By: Slaven Tomac <slaventomac@gmail.com>
This commit is contained in:
@@ -69,7 +69,7 @@
|
||||
// Align tooltip to form elements
|
||||
.form-row > .col > &,
|
||||
.form-row > [class*="col-"] > & {
|
||||
left: $form-grid-gutter-width / 2;
|
||||
left: $form-grid-gutter-width * .5;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -8,8 +8,8 @@
|
||||
%grid-column {
|
||||
position: relative;
|
||||
width: 100%;
|
||||
padding-right: $gutter / 2;
|
||||
padding-left: $gutter / 2;
|
||||
padding-right: $gutter * .5;
|
||||
padding-left: $gutter * .5;
|
||||
}
|
||||
|
||||
@each $breakpoint in map-keys($breakpoints) {
|
||||
|
@@ -4,8 +4,8 @@
|
||||
|
||||
@mixin make-container($gutter: $grid-gutter-width) {
|
||||
width: 100%;
|
||||
padding-right: $gutter / 2;
|
||||
padding-left: $gutter / 2;
|
||||
padding-right: $gutter * .5;
|
||||
padding-left: $gutter * .5;
|
||||
margin-right: auto;
|
||||
margin-left: auto;
|
||||
}
|
||||
@@ -13,8 +13,8 @@
|
||||
@mixin make-row($gutter: $grid-gutter-width) {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
margin-right: -$gutter / 2;
|
||||
margin-left: -$gutter / 2;
|
||||
margin-right: -$gutter * .5;
|
||||
margin-left: -$gutter * .5;
|
||||
}
|
||||
|
||||
// For each breakpoint, define the maximum width of the container in a media query
|
||||
@@ -33,16 +33,16 @@
|
||||
// always setting `width: 100%;`. This works because we use `flex` values
|
||||
// later on to override this initial width.
|
||||
width: 100%;
|
||||
padding-right: $gutter / 2;
|
||||
padding-left: $gutter / 2;
|
||||
padding-right: $gutter * .5;
|
||||
padding-left: $gutter * .5;
|
||||
}
|
||||
|
||||
@mixin make-col($size, $columns: $grid-columns) {
|
||||
flex: 0 0 percentage($size / $columns);
|
||||
flex: 0 0 percentage(divide($size, $columns));
|
||||
// Add a `max-width` to ensure content within each column does not blow out
|
||||
// the width of the column. Applies to IE10+ and Firefox. Chrome and Safari
|
||||
// do not appear to require this.
|
||||
max-width: percentage($size / $columns);
|
||||
max-width: percentage(divide($size, $columns));
|
||||
}
|
||||
|
||||
@mixin make-col-auto() {
|
||||
@@ -52,7 +52,7 @@
|
||||
}
|
||||
|
||||
@mixin make-col-offset($size, $columns: $grid-columns) {
|
||||
$num: $size / $columns;
|
||||
$num: divide($size, $columns);
|
||||
margin-left: if($num == 0, 0, percentage($num));
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@
|
||||
// style grid.
|
||||
@mixin row-cols($count) {
|
||||
> * {
|
||||
flex: 0 0 100% / $count;
|
||||
max-width: 100% / $count;
|
||||
flex: 0 0 divide(100%, $count);
|
||||
max-width: divide(100%, $count);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user