From 6669e7b65a039232bfbe89beee794b1be4add547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Fri, 10 Aug 2012 22:24:39 +0200 Subject: [PATCH 1/3] flex: add base-size hacks for obsolete browsers --- lib/nib/flex.styl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/nib/flex.styl b/lib/nib/flex.styl index 0b72fd2e..dd2152e9 100644 --- a/lib/nib/flex.styl +++ b/lib/nib/flex.styl @@ -56,8 +56,12 @@ flex-direction(direction) vendor('box-direction', reverse, ignore: official) if row == direction || row-reverse == direction vendor('box-orient', horizontal, ignore: official) + >* + height: auto !important else if column == direction || column-reverse == direction vendor('box-orient', vertical, ignore: official) + >* + width: auto !important // new vendor('flex-direction', arguments, only: webkit official) From 7fadc819970059e196d48f5e0bd5b62890ea24b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Fri, 10 Aug 2012 22:32:53 +0200 Subject: [PATCH 2/3] flex: insert base-size hack in flexed elements --- lib/nib/flex.styl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/nib/flex.styl b/lib/nib/flex.styl index dd2152e9..6c15d4f8 100644 --- a/lib/nib/flex.styl +++ b/lib/nib/flex.styl @@ -43,9 +43,12 @@ align-items(align) // new vendor('align-items', arguments, only: webkit official) -flex(growth) +flex(growth = 0, shrink = 0, base = auto) // obsolete vendor('box-flex', growth) + if base != auto + width: base + height: base // new vendor('flex', arguments, only: webkit official) From 98059993b23182d55dc24a814dc1be17d42fe218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Buscht=C3=B6ns?= Date: Fri, 10 Aug 2012 23:11:50 +0200 Subject: [PATCH 3/3] flex: improves basic-size hack and adds flex-basis --- lib/nib/flex.styl | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/lib/nib/flex.styl b/lib/nib/flex.styl index 6c15d4f8..b8e5121c 100644 --- a/lib/nib/flex.styl +++ b/lib/nib/flex.styl @@ -20,9 +20,6 @@ align-content() align-self() vendor('align-self', arguments, only: webkit official) -flex-basis() - vendor('flex-basis', arguments, only: webkit official) - flex-shrink() vendor('flex-shrink', arguments, only: webkit official) @@ -43,16 +40,35 @@ align-items(align) // new vendor('align-items', arguments, only: webkit official) -flex(growth = 0, shrink = 0, base = auto) +flex(growth, shrink = null, basis = null) // obsolete - vendor('box-flex', growth) - if base != auto - width: base - height: base + if growth == "none" // flex: none + vendor('box-flex', 0) + width: auto + height: auto + else if basis != null // flex: <'flex-grow'> <'flex-shrink'> <'flex-basis'> + vendor('box-flex', growth) + width: basis + height: basis + else if shrink != null // flex: <'flex-grow'> <'flex-shrink'> || <'flex-grow'> <'flex-basis'> + vendor('box-flex', growth) + if unit(shrink) != "" // flex: <'flex-grow'> <'flex-basis'> + width: basis + height: basis + else // flex: <'flew-grow'> + vendor('box-flex', growth) // new vendor('flex', arguments, only: webkit official) +flex-basis(basis) + // obsolete + width: basis + height: basis + + // new + vendor('flex-basis', arguments, only: webkit official) + flex-direction(direction) // obsolete if row-reverse == direction || column-reverse == direction