CSSgram icon indicating copy to clipboard operation
CSSgram copied to clipboard

Adds Ludwig filter #126

Open annaboodle opened this issue 9 years ago • 4 comments

Fixed PR to only edit data/scss files!

Comparison: ludwig

annaboodle avatar Oct 06 '16 14:10 annaboodle

Awesome, thank you!!

Can you do me one more favor? Run git pull --rebase origin master and fix the merge conflict in cssgram.scss. It should look like:

@import 'aden';
@import 'inkwell';
@import 'perpetua';
@import 'reyes';
@import 'gingham';
@import 'toaster';
@import 'walden';
@import 'hudson';
@import 'earlybird';
@import 'mayfair';
@import 'lofi';
@import '1977';
@import 'brooklyn';
@import 'xpro2';
@import 'nashville';
@import 'lark';
@import 'moon';
@import 'clarendon';
@import 'willow';
@import 'rise';
@import 'slumber';
@import 'brannan';
@import 'valencia';
@import 'kelvin';
@import 'ludwig';

una avatar Oct 20 '16 23:10 una

@una Could you explain a bit more what you mean? I ran git pull --rebase origin master, but didn't see any merge conflicts in cssgram.scss. My file looks like yours, except the @imports are in a slightly different order...

annaboodle avatar Oct 21 '16 15:10 annaboodle

Right the order would cause a merge conflict. Is it not?

una avatar Oct 27 '16 01:10 una

The branch has merge conflicts still -- did you get those resolved? I'm happy to walk you through it if you need!

una avatar Nov 02 '16 14:11 una