robdirienzo/cutnado — pull request #1 by montchr (2014-04-01 04:45:56+00:00)
Title: Re-implement Bootstrap-SASS

Rob,

Congrats on your first PR. This should be pretty simple.

I've brought back in some very basic Bootstrap stuff, but I've left the stuff I didn't use uncommented.

Behold the mighty [`assets/sass/_settings-twbs.scss`](assets/sass/_settings-twbs.scss) – this file contains all Bootstrap-SASS settings. If you want to change a color or padding or something like that, check to see if there's a setting in there for it. If there is, then set it to the value you'd like, and remove the `!default` flag. If not, add it to [`assets/sass/_settings-custom.scss`](assets/sass/_settings-custom.scss).

I'm not totally sure why b32dcc3697f814db86022485b22ab35e7bb14d1d and 346abe7cea53ab4a10a4c90b4e48fee11f8935e1 are included here – I thought you pulled those in already. Perhaps you didn't push back up to your GitHub repo…

If that's the case, then you're best off pushing before merging in this pull request. Let me know if you have questions.