-
Notifications
You must be signed in to change notification settings - Fork 663
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix issue #37 (removing spaces on !important) #55
Conversation
This pull request has way too many disparate things going on. It should not include the color keyword changes or the trailing comma bits. Those are other pull requests. |
@@ -218,6 +218,8 @@ public void compress(Writer out, int linebreakpos) | |||
css = sb.toString(); | |||
// Remove spaces before the things that should not have spaces before them. | |||
css = css.replaceAll("\\s+([!{};:>+\\(\\)\\],])", "$1"); | |||
// Restore spaces for !important | |||
css = css.replaceAll("!important", " !important"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change looks fine. All others (save for the travis notifications) should be removed from this pull request.
Also, do we have tests that verify this change?
@evocateur Thanks for reviewing - those other changes are actually things that have already been merged into YUICompressor, they're just showing up here because I merged them into my own repo after the PR had already been issued. Is there an easy way to let the PR show that, or is it best to close this PR and start a new one? I have a test, but it looks like I didn't have it on the PR; I'll fix that. |
Oh, I see. You should probably merge upstream changes into this pull request branch, then. I think GitHub will magically notice and remove those commits from this pull request. Assuming git checkout master
git pull
git fetch upstream
git merge upstream/master master
git push origin master
git checkout pr37
git merge master
git push origin pr37 |
Pretty sure that's what I did last time that resulted in this weird state, but I just tried it again...doesn't seem to have changed anything for me? |
Looking at https://github.com/yui/yuicompressor/pull/55/files now, it only shows the change to CssCompressor.java. I'd say that did the trick. (As an added bonus, now the GitHub UI for merging this pull request won't fail) |
Fix issue #37 (removing spaces on !important)
No description provided.