Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
a66d9a3d
Commit
a66d9a3d
authored
4 years ago
by
Martijn Cuppens
Committed by
XhmikosR
4 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Backport #30605
grid: checks for `$grid-columns > 0`
parent
9d009701
6 merge requests
!36532
My v4 dev
,
!34086
v4: Fix prevented show event disables modals with fade class from being displayed again
,
!33729
V4 dev
,
!33086
V4 dev
,
!31901
Add opacity utilities
,
!31513
Update icons.md
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scss/mixins/_grid-framework.scss
+19
-12
scss/mixins/_grid-framework.scss
with
19 additions
and
12 deletions
+19
-12
scss/mixins/_grid-framework.scss
+
19
-
12
View file @
a66d9a3d
...
...
@@ -15,12 +15,15 @@
@each
$breakpoint
in
map-keys
(
$breakpoints
)
{
$infix
:
breakpoint-infix
(
$breakpoint
,
$breakpoints
);
// Allow columns to stretch full width below their breakpoints
@for
$i
from
1
through
$columns
{
.col
#{
$infix
}
-
#{
$i
}
{
@extend
%grid-column
;
@if
$columns
>
0
{
// Allow columns to stretch full width below their breakpoints
@for
$i
from
1
through
$columns
{
.col
#{
$infix
}
-
#{
$i
}
{
@extend
%grid-column
;
}
}
}
.col
#{
$infix
}
,
.col
#{
$infix
}
-auto
{
@extend
%grid-column
;
...
...
@@ -47,9 +50,11 @@
@include
make-col-auto
();
}
@for
$i
from
1
through
$columns
{
.col
#{
$infix
}
-
#{
$i
}
{
@include
make-col
(
$i
,
$columns
);
@if
$columns
>
0
{
@for
$i
from
1
through
$columns
{
.col
#{
$infix
}
-
#{
$i
}
{
@include
make-col
(
$i
,
$columns
);
}
}
}
...
...
@@ -61,11 +66,13 @@
.order
#{
$infix
}
-
#{
$i
}
{
order
:
$i
;
}
}
// `$columns - 1` because offsetting by the width of an entire row isn't possible
@for
$i
from
0
through
(
$columns
-
1
)
{
@if
not
(
$infix
==
""
and
$i
==
0
)
{
// Avoid emitting useless .offset-0
.offset
#{
$infix
}
-
#{
$i
}
{
@include
make-col-offset
(
$i
,
$columns
);
@if
$columns
>
0
{
// `$columns - 1` because offsetting by the width of an entire row isn't possible
@for
$i
from
0
through
(
$columns
-
1
)
{
@if
not
(
$infix
==
""
and
$i
==
0
)
{
// Avoid emitting useless .offset-0
.offset
#{
$infix
}
-
#{
$i
}
{
@include
make-col-offset
(
$i
,
$columns
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets