Skip to content

Style Inconsistentcy: Check boxes and the rest#134

Merged
mattheu merged 8 commits into
masterfrom
fix-label-height
Feb 23, 2014
Merged

Style Inconsistentcy: Check boxes and the rest#134
mattheu merged 8 commits into
masterfrom
fix-label-height

Conversation

@mattheu
Copy link
Copy Markdown
Member

@mattheu mattheu commented Dec 1, 2013

Please have a look at the following. I think we should address this.

inconsistent

@mattheu
Copy link
Copy Markdown
Member

mattheu commented Dec 1, 2013

Can you test whether this fixes your issue?

I've also updated #116 to make sure this won't happen once 3.8 is released.

@banago banago closed this Dec 2, 2013
@willmot willmot reopened this Dec 3, 2013
@banago
Copy link
Copy Markdown
Contributor Author

banago commented Dec 3, 2013

Padding is great. But the style is still of, because it's a description obviously. Personally I would make the compromise to style the radio box descriptions as normal titles.

@banago
Copy link
Copy Markdown
Contributor Author

banago commented Feb 20, 2014

This is good to merge too.

@willmot
Copy link
Copy Markdown
Member

willmot commented Feb 20, 2014

Looks like it needs master merging

@banago
Copy link
Copy Markdown
Contributor Author

banago commented Feb 20, 2014

Yes. :)

@joehoyle
Copy link
Copy Markdown
Member

@banago I think that was a prompt for you to merge master into your branch, as there is a conflict. It's typically best for the patch contributor to do this as you wrote the code you'll be best to resolve a conflict :)

@banago
Copy link
Copy Markdown
Contributor Author

banago commented Feb 22, 2014

Hey @willmot and @joehoyle,

Master merge for branch fix-label-height is done. Please review here #168 and merge.

Fix label height 'master' merge
@banago banago closed this Feb 23, 2014
@mattheu mattheu reopened this Feb 23, 2014
@mattheu
Copy link
Copy Markdown
Member

mattheu commented Feb 23, 2014

Hey you opened a pull request to sync this with master - but I hadn't actually merged this pull request yet - but all looks good now so I'll go ahead!

mattheu added a commit that referenced this pull request Feb 23, 2014
Style Inconsistentcy: Check boxes and the rest
@mattheu mattheu merged commit bf5d275 into master Feb 23, 2014
@banago
Copy link
Copy Markdown
Contributor Author

banago commented Feb 23, 2014

Yep, forgot I pushed to fix-label-height branch. :)

@willmot willmot deleted the fix-label-height branch February 23, 2014 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants