Skip to content
This repository has been archived by the owner on Jan 14, 2018. It is now read-only.

Sass! #44

Merged
merged 9 commits into from
May 25, 2012
Merged

Sass! #44

merged 9 commits into from
May 25, 2012

Conversation

jina
Copy link
Contributor

@jina jina commented May 18, 2012

I have added 4 folders, so people can choose which works best for them.

  1. Sass (original syntax)
  2. Sass + Compass
  3. SCSS (newer syntax)
  4. SCSS + Compass

Let me know if you have any questions.

@mikekelly
Copy link

zomg

win.

@jina
Copy link
Contributor Author

jina commented May 22, 2012

Hey Andy, were there any issues with this?

Also I noticed someone else submitted a SCSS + Compass version, but I already have that included here… in case you're confused if what he did is different. :)

@malarkey
Copy link
Owner

@jina I intend to merge your files, but Github says “This pull request cannot be automatically merged.” I know. I’m a moron. What should I do?

@jina
Copy link
Contributor Author

jina commented May 23, 2012

Hrm. Do you mind giving me temporary access to the repository and then I can try to help you manually merge it in? I won't touch any of your less files or main files; I'll just be adding my new ones in.

@malarkey
Copy link
Owner

I made you admin (I think).

@jina
Copy link
Contributor Author

jina commented May 24, 2012

👍

@jina jina merged commit 7a17798 into malarkey:master May 25, 2012
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants