Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[v1] Flex: revert to using padding for gutter gap, apply min/max limits to cols #2983

Closed
wants to merge 1 commit into from
Closed

[v1] Flex: revert to using padding for gutter gap, apply min/max limits to cols #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions quasar/src/css/core/flex.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ fg($name, $size)
@media (min-width $size)
{fe('.col<name>', $name, $noProcNotZero)}
&, &-auto, &-grow
min-width 0
max-width 100%
min-height 0
max-height 100%
.row > &, .flex > &
width auto
min-width 0
max-width 100%
.column > &, .flex > &
height auto
min-height 0
max-height 100%
&
flex 10**4 1 0%
&-auto
Expand Down Expand Up @@ -130,11 +130,11 @@ for $name, $size in $flex-gutter
&-x-{$name}
margin-left (- $size)
> *
margin-left $size
padding-left $size
&-y-{$name}
margin-top (- $size)
> *
margin-top $size
padding-top $size
&-{$name}
@extends .q-gutter-x-{$name}, .q-gutter-y-{$name}
> *
Expand Down
4 changes: 2 additions & 2 deletions quasar/src/css/flex-addon.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,11 @@ fg($name, $size)
&x-{$gname}
margin-left (- $gsize)
> *
margin-left $gsize
padding-left $gsize
&y-{$gname}
margin-top (- $gsize)
> *
margin-top $gsize
padding-top $gsize
&{$gname}
@extends .q-gutter{$name}-x-{$gname}, .q-gutter{$name}-y-{$gname}
> *
Expand Down