From eafd74d9b5fbfada1026ab604202d8a690286cb4 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Sat, 20 Feb 2016 20:41:40 -0500 Subject: [PATCH] stylus: finish/fix outer_width arg for columns --- stylus_helpers.styl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/stylus_helpers.styl b/stylus_helpers.styl index 39f68d1..d885abe 100644 --- 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 - 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 - 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 @@ -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 - 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 -- 1.7.10.4