Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f009205
)
stylus: finish/fix outer_width arg for columns
author
Jason Woofenden
<jason@jasonwoof.com>
Sun, 21 Feb 2016 01:41:40 +0000
(20:41 -0500)
committer
Jason Woofenden
<jason@jasonwoof.com>
Sun, 21 Feb 2016 01:41:40 +0000
(20:41 -0500)
stylus_helpers.styl
patch
|
blob
|
history
diff --git
a/stylus_helpers.styl
b/stylus_helpers.styl
index
39f68d1
..
d885abe
100644
(file)
--- a/
stylus_helpers.styl
+++ b/
stylus_helpers.styl
@@
-369,15
+369,14
@@
wfpl_columns_helper(top, node, selector, parent_width, expected_width)
left_width += v
if match('^((margin|padding)-right)|(border-right-width)$', k)
right_width += v
left_width += v
if match('^((margin|padding)-right)|(border-right-width)$', k)
right_width += v
- if k != 'type' && k != 'child' && k != 'name' && k != 'outer-width' && k != 'outer_width'
+ if k != 'type' && k != 'child' && k != 'name' && k != 'outer_width'
css_rules[k] = v
for k, v in node
if k == 'width'
width = v
css_rules[k] = v
for k, v in node
if k == 'width'
width = v
- outer_width = left_width + v + right_width
- if k == 'outer-width' && k == 'outer_width'
- outer_width = k
- width = v - left_width - right_width
+ if k == 'outer_width'
+ outer_width = v
+ css_rules['width'] = v - left_width - right_width
if (!width) && (!outer_width)
if parent_width
outer_width = parent_width
if (!width) && (!outer_width)
if parent_width
outer_width = parent_width
@@
-391,7
+390,7
@@
wfpl_columns_helper(top, node, selector, parent_width, expected_width)
parent_width = outer_width
top['css'][selector] = css_rules
for k, v in node
parent_width = outer_width
top['css'][selector] = css_rules
for k, v in node
- if k != 'outer-width' && k != 'outer_width' && k != 'border-width' && k != 'border-left-width' && k != 'border-right-width'
+ if k != 'outer_width' && k != 'border-width' && k != 'border-left-width' && k != 'border-right-width'
if typeof(v) == 'unit' && unit(v) == 'px'
responsive_css_rules[k] = floor(unit((v / parent_width) * 100, '%'), 4)
top['responsive_css'][selector] = responsive_css_rules
if typeof(v) == 'unit' && unit(v) == 'px'
responsive_css_rules[k] = floor(unit((v / parent_width) * 100, '%'), 4)
top['responsive_css'][selector] = responsive_css_rules