Skip to content
This repository was archived by the owner on Feb 18, 2025. It is now read-only.

Conversation

@ghecho
Copy link
Contributor

@ghecho ghecho commented May 15, 2015

The sign up button was not appearing so I moved it a bit to the top (I didn't move the hidden textfield of the one time generated password).

@ghecho ghecho mentioned this pull request May 15, 2015
@radazzouz
Copy link
Contributor

Looks good @ghecho! 👍

Can you please make the same change to the Objective-C storyboard for ACME?

Thanks!

@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

Sure. I will and I'll submit a PR
On Fri, May 15, 2015 at 12:38 AM Rad Azzouz notifications@github.com
wrote:

Looks good @ghecho https://github.com/ghecho! [image: 👍]

Can you please make the same change to the Onjective-C storyboard for ACME?

Thanks!


Reply to this email directly or view it on GitHub
#213 (comment)
.

@radazzouz
Copy link
Contributor

You could do it it in this very PR. No need for another 😉

@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

Sure. Didn't think of that, I'll do that. 👍
On Fri, May 15, 2015 at 12:40 AM Rad Azzouz notifications@github.com
wrote:

You could do it it in this very PR. No need for another [image: 😉]


Reply to this email directly or view it on GitHub
#213 (comment)
.

@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

I just pushed the Objective-C layout fix but I just noticed that somehow there're some conflicts. Do you have any idea of why? I'm investigating right now.

@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

I think I now know. I think you pushed some changes after I made my changes. I'll try to resolve this so it can be automatically merged unless you have a better idea.

ghecho added 2 commits May 15, 2015 01:22
…on the iPhone

Signed-off-by: Diego <ghecho@gmail.com>

Conflicts:
	Demos/App Demo for iOS/App Demo for iOS/Base.lproj/Main.storyboard

Fix for merge conflicts

Fix layout issue on the iPhone in the Swift and Objective-C version
@ghecho ghecho force-pushed the new/swift-demo-apps branch from 6758c61 to 9361919 Compare May 15, 2015 06:33
@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

I did a force-push with the fix right now.

Here're my steps:

  • "save" the 2 commits by tagging them
  • revert to your last known commit
  • pull the rest of your commits
  • cherry pick my 2 commits
  • force push to my branch

@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

Also I had to fix a merge conflict with some internal version of the storyboard (it's super fun to manage this Xcode file changes in git) but I did tried both versions and they seemed to be working, in any case, let me know what you think.

@radazzouz
Copy link
Contributor

Thanks so much for helping out @ghecho 👍

The PR looks good now. I'll merge it!

Cheers!

@radazzouz radazzouz added the done label May 15, 2015
@radazzouz radazzouz self-assigned this May 15, 2015
radazzouz pushed a commit that referenced this pull request May 15, 2015
Update constraints for iPhone screen so the "Sign Up" button is visible
@radazzouz radazzouz merged commit 7a50c7a into agilebits:new/swift-demo-apps May 15, 2015
@ghecho ghecho deleted the new/swift-demo-apps branch May 15, 2015 14:47
@ghecho
Copy link
Contributor Author

ghecho commented May 15, 2015

Sure, happy to help.

Cheers!

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants