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

narendasan/events and hackillinois #44

Merged
merged 23 commits into from
Jan 16, 2017

Conversation

narendasan
Copy link
Member

closing #30 for this

@narendasan
Copy link
Member Author

Just need the nav bar

Copy link
Member

@sameetandpotatoes sameetandpotatoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good to me (probably wanna fix merge conflicts first), only had a few comments. Did we want to add the events location now, or I can do it in another PR, since I have the events service running locally?

border-left: solid 2px @button-color;
border-right: solid 2px @button-color;
//border-left: solid 2px @button-color;
//border-right: solid 2px @button-color;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason some of these are commented out and not removed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if I wanted to bring them back, will probably remove

"<div class='event'> \
<h5><a href='" + event.url + "'>" + event.name + "</a></h5> \
<ul> \
<li>" + startDate + "<br/>" + startTime + "</li> \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to add the location of the event as well? I didn't do it before as @tyler-thetyrant never added it, but now he did so the data we're getting now looks like:

screenshot 2017-01-16 09 52 45

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Location would be good, have not attempted it, did not want to mess with the event or create a new one since all events are public on the page.

@@ -15,5 +15,5 @@
display: flex;
justify-content: center;
align-items: center;
transform: translateY(10%);
transform: translateY(100%);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The login page looks like this now. Is this intended?

screenshot 2017-01-16 09 57 19

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably needs to be adjusted a bit

@narendasan
Copy link
Member Author

dont merge this yet need to remove a commit

@narendasan
Copy link
Member Author

ok should be good merge, nav will be done later

Copy link
Member

@sameetandpotatoes sameetandpotatoes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, gonna merge

@bcongdon bcongdon deleted the narendasan/events_and_hackillinois branch February 14, 2017 02:24
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