From c22499617ed0ffd1c473ac36dd1e6bff5b0b77a2 Mon Sep 17 00:00:00 2001 From: dmi3y Date: Tue, 4 Apr 2017 15:33:57 -0700 Subject: [PATCH] do not format values with slash in lost grid properties --- lib/formatValues.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/formatValues.js b/lib/formatValues.js index c23ace3..2c04915 100644 --- a/lib/formatValues.js +++ b/lib/formatValues.js @@ -2,13 +2,15 @@ var formatTransforms = require('./formatTransforms') var formatColors = require('./formatColors') var formatZeros = require('./formatZeros') var formatShorthand = require('./formatShorthand') -var getProperty = require('./util').getProperty +var getProperty = require('./util').getProperty function formatvalues (decl, stylelint) { var isDataUrl = /data:.+\/(.+);base64,(.*)/.test(decl.value) var isVarNotation = /var\s*\(.*\)/.test(decl.value) var isString = /^("|').*("|')$/.test(decl.value) var isFunctionCall = /\w+\(.+\)/.test(decl.value) + // Lost grid custom properties http://lostgrid.org/ + var isLostGridSubsetProp = (['lost-column', 'lost-row'].indexOf(decl.prop) > -1) if (decl.raws.value) { decl.raws.value.raw = decl.raws.value.raw.trim() @@ -49,8 +51,8 @@ function formatvalues (decl, stylelint) { if (!isFunctionCall) { // format math operators before `$` or `(`. decl.value = decl.value.replace(/(?!^)[+\-*%](?=\$|\()/g, ' $& ') - // don't format "/" from a "font" shorthand property. - if (decl.prop !== 'font') { + // don't format "/" from a "font" shorthand property and from the lost grid + if (decl.prop !== 'font' && !isLostGridSubsetProp) { decl.value = decl.value.replace(/\/(?=\$|\(|\d)/g, ' $& ') } // format "-" if it is between numbers @@ -68,11 +70,10 @@ function formatvalues (decl, stylelint) { decl.value = formatTransforms(decl.value) if (decl.important) { - decl.raws.important = " !important" + decl.raws.important = ' !important' } return decl } - module.exports = formatvalues