Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
johnleider committed Mar 14, 2018
2 parents 770a496 + f450568 commit d2f6c58
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vuetify",
"version": "1.0.7",
"version": "1.0.8",
"author": {
"name": "John Leider",
"email": "[email protected]"
Expand Down
26 changes: 15 additions & 11 deletions src/stylus/components/_grid.styl
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

&.fluid
max-width: 100%

&.fill-height
align-items: center
display: flex

.layout
height: 100%
flex: 1 1 auto
Expand All @@ -32,13 +32,13 @@
.layout
.flex
padding: ($gutter / 2)

.layout:only-child
margin: -($gutter / 2)

.layout:not(:only-child)
margin: auto -($gutter / 2)

*:not(:only-child)
.layout:first-child
margin-top: -($gutter / 2)
Expand All @@ -60,6 +60,9 @@
&.column
flex-direction: column

> .flex
max-width: 100%

&.reverse
flex-direction: column-reverse

Expand All @@ -72,6 +75,7 @@ for size, width in $grid-breakpoints
.flex.{size}{n}
flex-basis: (n / $grid-columns * 100)%
flex-grow: 0
max-width: (n / $grid-columns * 100)%

.flex.order-{size}{n}
order: n
Expand All @@ -97,7 +101,7 @@ for size, width in $grid-breakpoints

&-baseline
align-items: baseline

.align-content
&-start
align-content: flex-start
Expand Down Expand Up @@ -155,26 +159,26 @@ for size, width in $grid-breakpoints

.no-wrap
white-space: nowrap

.ellipsis
white-space: nowrap
overflow: hidden
text-overflow: ellipsis

// Display helpers
.d-flex
display: flex !important

.d-inline-flex
display: inline-flex !important

.d-flex,
.d-inline-flex
> *
flex: 1 1 auto !important

.d-block
display: block !important

.d-inline-block
display: inline-block !important

0 comments on commit d2f6c58

Please sign in to comment.