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

Added collapsable components under Channels, Direct Messages, and Private Groups #40

Merged
merged 6 commits into from
Aug 13, 2015

Conversation

bbrockman
Copy link

Added collapsable components under Channels, Direct Messages, and Private Groups
Added Kadira Debug
Added Boostrap - Included only required components for collapsible functionality
Added styles for collapsable components

Added Boostrap - Included only required components for collapsible functionality
Added styles for collapsable components
Added collapsable components under Channels, Direct Messages, and Private Groups
@rwakida
Copy link

rwakida commented Aug 7, 2015

Verified it expands/collapses. 👍

Suggestions:

  1. Can we show the arrow only if there are items to collapse. e.g. if user is not a channel member, then show "You aren't part of any channel yet" message and hide arrow.
  2. either move the arrow to be right-aligned with section's '+' or nudge to the right so that it's left-aligned with section title.

@bbrockman
Copy link
Author

Good ideas.

Just finished your first suggestion. I'll take a look at your second.

1) Added logic to collapse to make sure there was at least 1 room/direct message/channel before adding the collapsible icon.
2) Aligned the collapsable icons to the icons above them.
@bbrockman
Copy link
Author

Updated them both.

Reid,
Can you check out the updates to see if you agree with the changes.

@rwakida
Copy link

rwakida commented Aug 10, 2015

nice. 👍

@douglasrapp
Copy link

I like it. Looks good to me.

right: percentage((@columns / @grid-columns));
}
}

Choose a reason for hiding this comment

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

I like how 99% of the code change in this pull request is adding giant bootstrap files ;)

Copy link
Author

Choose a reason for hiding this comment

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

All so I can use the collapse functionality.

javawebdeveloper and others added 4 commits August 13, 2015 07:43
# Conflicts:
#	.meteor/packages
#	client/stylesheets/base.less
* origin/master:
  Fixed Indenting error!  Thanks Coffee!
  Added comment to not add additional fields to be returned with the publication because it now returns all users.
  Removed logging
  Updated onlineUsers to allUsers for rooms because we want to see everyone in the room Removed offset Added profile first name and last name to user data publication Updated userObserve to include new profile fields Updated room to display first name and last name (sort by last name) instead of username
  Added status-{{status}} to paragraph that displayed username in Member List. In room.coffee: returned offline for the status in the method userActiveByUsername.  The method previously pulled the user from the session when doing the check.  It disregarded it if the user was not in the session (offline). Commented out the base.less file that was overriding the status color in the member list.
bbrockman added a commit that referenced this pull request Aug 13, 2015
Added collapsable components under Channels, Direct Messages, and Private Groups
@bbrockman bbrockman merged commit 2f106fb into master Aug 13, 2015
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