[#709] column-break mixin #827

Closed
wants to merge 43 commits into
from

Conversation

Projects
None yet
8 participants
@nickcooley
Contributor

nickcooley commented Apr 3, 2012

Introducing column-break... Comments added to columns.scss. Tests included.

zanker and others added some commits Feb 27, 2012

Merge pull request #739 from zanker/master
Allow numeric filenames in sprites
Merge branch 'stable'
Conflicts:
	VERSION.yml
	doc-src/Gemfile.lock
Merge branch 'stable'
Conflicts:
	VERSION.yml
	doc-src/Gemfile.lock
	doc-src/content/CHANGELOG.markdown
Merge remote-tracking branch 'origin/master'
Conflicts:
	doc-src/content/CHANGELOG.markdown
Correct extremely silly syntax error.
The indented syntax obviously doesn’t use curly braces.
@chriseppstein

This comment has been minimized.

Show comment Hide comment
@chriseppstein

chriseppstein Apr 3, 2012

Owner

The compass convention is to have a 1-1 mapping between compass css3 mixins and css3 properties. I'm not opposed to also having a short cut mixin that makes common use cases more convenient.

Owner

chriseppstein commented Apr 3, 2012

The compass convention is to have a 1-1 mapping between compass css3 mixins and css3 properties. I'm not opposed to also having a short cut mixin that makes common use cases more convenient.

+
+// Mixin for setting column breaks.
+//
+// * legal values for '$type' : 'before', 'after', 'inside'

This comment has been minimized.

Show comment Hide comment
@chriseppstein

chriseppstein Apr 3, 2012

Owner

doesn't seem like these would need to be quoted.

@chriseppstein

chriseppstein Apr 3, 2012

Owner

doesn't seem like these would need to be quoted.

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 3, 2012

Contributor

no prob. Will update.

Contributor

nickcooley commented Apr 3, 2012

no prob. Will update.

@scottdavis

This comment has been minimized.

Show comment Hide comment
@scottdavis

scottdavis Apr 5, 2012

Owner

this will need to be rebased to master it will not cleanly merge in either stable or master

Owner

scottdavis commented Apr 5, 2012

this will need to be rebased to master it will not cleanly merge in either stable or master

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 5, 2012

Contributor

So what do I need to do?

Contributor

nickcooley commented Apr 5, 2012

So what do I need to do?

@scottdavis

This comment has been minimized.

Show comment Hide comment
@scottdavis

scottdavis Apr 5, 2012

Owner

rebase can be a pain in the butt but your commits should be ok
heres the best i can find on short notice

http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html
http://mettadore.com/analysis/a-simple-git-rebase-workflow-explained/

Owner

scottdavis commented Apr 5, 2012

rebase can be a pain in the butt but your commits should be ok
heres the best i can find on short notice

http://gitready.com/intermediate/2009/01/31/intro-to-rebase.html
http://mettadore.com/analysis/a-simple-git-rebase-workflow-explained/

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 5, 2012

Contributor

Thanks Scott --

I'll see what I can do. I did a revert and didn't realize it would wreak this kind of havoc on the commit.

Contributor

nickcooley commented Apr 5, 2012

Thanks Scott --

I'll see what I can do. I did a revert and didn't realize it would wreak this kind of havoc on the commit.

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 6, 2012

Contributor

currently rebasing -- please pay no attention to the additional commits as they will be removed. Sorry for the sloppiness...

Contributor

nickcooley commented Apr 6, 2012

currently rebasing -- please pay no attention to the additional commits as they will be removed. Sorry for the sloppiness...

@scottdavis

This comment has been minimized.

Show comment Hide comment
@scottdavis

scottdavis Apr 6, 2012

Owner

np as long as it gets in sync with master

Owner

scottdavis commented Apr 6, 2012

np as long as it gets in sync with master

mirisuzanne and others added some commits Apr 1, 2012

column-break mixin added
For issue [#709], added 1 new mixin: column-break (with comments)

Signed-off-by: Nick Cooley <nick@homecooley.com>
Mother-effing hyphenation
[#788] adds mixin for word-break and hyphens
@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 6, 2012

Contributor

Hey, @scottdavis -- I rebased and got my repo up to speed with master (sorry for the confusion there, was working off an old version that hadn't been updated/my bad). What I noticed, though, was that when I pulled latest from repo, I also got [ef267dd] included as part of the commit (It's Gemfile.lock) Let me know if you want me to back that out (and how), or if you'll just cherry-pick that. Thanks for your help and suggestions today!

Contributor

nickcooley commented Apr 6, 2012

Hey, @scottdavis -- I rebased and got my repo up to speed with master (sorry for the confusion there, was working off an old version that hadn't been updated/my bad). What I noticed, though, was that when I pulled latest from repo, I also got [ef267dd] included as part of the commit (It's Gemfile.lock) Let me know if you want me to back that out (and how), or if you'll just cherry-pick that. Thanks for your help and suggestions today!

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley Apr 11, 2012

Contributor

Hey @scottdavis -- Is there anything else you need from me on this?

Contributor

nickcooley commented Apr 11, 2012

Hey @scottdavis -- Is there anything else you need from me on this?

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley May 7, 2012

Contributor

Hey @scottdavis @ericam -- bump on this. Any issues here?

Contributor

nickcooley commented May 7, 2012

Hey @scottdavis @ericam -- bump on this. Any issues here?

@chriseppstein

This comment has been minimized.

Show comment Hide comment
@chriseppstein

chriseppstein May 7, 2012

Owner

Sorry, I've been super busy but hoping to plow thru some PRs soon. Unless @scottdavis beats me to it.

Owner

chriseppstein commented May 7, 2012

Sorry, I've been super busy but hoping to plow thru some PRs soon. Unless @scottdavis beats me to it.

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley May 7, 2012

Contributor

Thanks @chriseppstein -- Heard about the great talk you gave in Florida last week. I was speaking about Sass/Compass in London at the same time.

I've been a little wary of the rebase that I did considering all the additional commits (the ones at the top) that came along with it (just fetched latest from base,) so please let me know if you need me to do anything here. I'm a little new to github, so if there's anything you need me to change about the PR -- I'm glad to.

Contributor

nickcooley commented May 7, 2012

Thanks @chriseppstein -- Heard about the great talk you gave in Florida last week. I was speaking about Sass/Compass in London at the same time.

I've been a little wary of the rebase that I did considering all the additional commits (the ones at the top) that came along with it (just fetched latest from base,) so please let me know if you need me to do anything here. I'm a little new to github, so if there's anything you need me to change about the PR -- I'm glad to.

@chriseppstein

This comment has been minimized.

Show comment Hide comment
@chriseppstein

chriseppstein May 28, 2012

Owner

I pulled the columns and hyphenation commits into stable for the 0.12.2 release as commits 0cdff5a and 8db0b40 respectively.

Owner

chriseppstein commented May 28, 2012

I pulled the columns and hyphenation commits into stable for the 0.12.2 release as commits 0cdff5a and 8db0b40 respectively.

@nickcooley

This comment has been minimized.

Show comment Hide comment
@nickcooley

nickcooley May 28, 2012

Contributor

Thanks Chris! Will look at other issues to resolve!

Contributor

nickcooley commented May 28, 2012

Thanks Chris! Will look at other issues to resolve!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment