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

Bootstrap Carousel inserted into tabs and connected to search button. Test file added. #12

Open
wants to merge 80 commits into
base: master
Choose a base branch
from

Conversation

freeflyfreak
Copy link
Contributor

Bootstrap Carousel partial created,inserted into tabs and connected to search button. Test data file added.

@dman1973 dman1973 closed this Feb 8, 2016
@dman1973 dman1973 reopened this Feb 8, 2016
Sergei added 3 commits February 12, 2016 11:05
# Conflicts:
#	app/controllers/landing_page_controller.rb
#	app/views/landing_page/index.html.erb
#	app/views/layouts/_bootstrap_carousel.html.erb
#	app/views/layouts/_navbar.html.erb
#	app/views/layouts/_search.html.erb
kylelk and others added 30 commits February 21, 2016 11:39
The file _landing_page_friends.html.erb was a duplicate of
_entry.html.web, I deleted the file and changed it to reuse the user
entry template. I also limited the friend list on the show page to 15
users.
changed typeahead width to 45% in swipe nav
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