Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "or sign in" link to iframe too #153

Merged
merged 1 commit into from
Mar 4, 2016

Conversation

laughinghan
Copy link
Contributor

image

Why was it excluded in #80? With the button that opens the iframe
dialog, there's no link to the landing page, which means with the button
there's no link at all to the actual Slack channel.

Why was it excluded in rauchg#80? With the button that opens the iframe
dialog, there's no link to the landing page, which means with the button
there's no link at all to the actual Slack channel.
laughinghan added a commit to laughinghan/slackin that referenced this pull request Mar 2, 2016
laughinghan added a commit to laughinghan/slackin that referenced this pull request Mar 2, 2016
Conflicts with rauchg#153 feature.sign-in-link-in-iframe:
	lib/index.js
	  Added `large` param to splash() call, to which rauchg#153 had added `org`
	lib/splash.js
	  Converted px to rem where rauchg#153 had removed iframe branch and dedented
rauchg added a commit that referenced this pull request Mar 4, 2016
@rauchg rauchg merged commit b2b481b into rauchg:master Mar 4, 2016
@laughinghan laughinghan deleted the feature.sign-in-link-in-iframe branch March 4, 2016 21:39
laughinghan added a commit to laughinghan/slackin that referenced this pull request Mar 5, 2016
Conflicts with rauchg#153 feature.sign-in-link-in-iframe:
	lib/index.js
	  Added `large` param to splash() call, to which rauchg#153 had added `org`
	lib/splash.js
	  Converted px to rem where rauchg#153 had dedented
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.

2 participants