diff --git a/app/javascripts/components/gather.js b/app/javascripts/components/gather.js index ddb7582..9eb8ab1 100644 --- a/app/javascripts/components/gather.js +++ b/app/javascripts/components/gather.js @@ -703,9 +703,9 @@ const GatherMenu = exports.GatherMenu = React.createClass({ }, itemClass(gather) { - let className = ["list-group-item", "pointer"]; + let className = ["treeview"]; if (gather.type === this.props.currentGather) { - className.push("list-group-item-success"); + className.push("active"); } return className.join(" "); }, @@ -723,23 +723,23 @@ const GatherMenu = exports.GatherMenu = React.createClass({ render() { return ( -
-
Gather Menu
-
+ {gather.description} + + + ); + }) + } + ); } }); diff --git a/app/javascripts/components/gatherArchive.js b/app/javascripts/components/gatherArchive.js index fd96cb3..a43b7e8 100644 --- a/app/javascripts/components/gatherArchive.js +++ b/app/javascripts/components/gatherArchive.js @@ -23,7 +23,7 @@ const ArchivedGathers = exports.ArchivedGathers = React.createClass({ }); return ( -
+
Archived Gathers
{archive} diff --git a/app/javascripts/components/main.js b/app/javascripts/components/main.js index 9d5e1f9..ee3d3fc 100644 --- a/app/javascripts/components/main.js +++ b/app/javascripts/components/main.js @@ -473,6 +473,15 @@ const GatherPage = React.createClass({ {connectionStatus}
+ + -
    -
  • Information
  • - - -
-
+
-
-
- - {eventsPanel} + {eventsPanel}

-
+
diff --git a/app/javascripts/components/message.js b/app/javascripts/components/message.js index d5f5249..c4477db 100644 --- a/app/javascripts/components/message.js +++ b/app/javascripts/components/message.js @@ -203,7 +203,7 @@ const Chatroom = exports.Chatroom = React.createClass({ let node = ReactDOM.findDOMNode(this.refs.messageContainer); node.addEventListener('scroll', this.scrollListener); - this.scrollToBottom(); + $(window).on("load", this.scrollToBottom); }, componentWillUnmount() { @@ -250,7 +250,6 @@ const Chatroom = exports.Chatroom = React.createClass({ if (prevProps.messages.length < this.props.messages.length) { this.scrollToBottom(); } - console.log(this.props.containerHeight); }, scrollToBottom() { @@ -456,12 +455,13 @@ const MessageBar = React.createClass({
; } return ( +
}); return ( -
+
    {users}
diff --git a/app/stylesheets/app.css b/app/stylesheets/app.css index 1e3c805..a6af846 100644 --- a/app/stylesheets/app.css +++ b/app/stylesheets/app.css @@ -33,6 +33,16 @@ html, body { padding-right: 20px; } +#message-input { + border: 1px solid #367fa9 !important; + -webkit-border-top-left-radius: 3px; + -webkit-border-bottom-left-radius: 3px; + -moz-border-radius-topleft: 3px; + -moz-border-radius-bottomleft: 3px; + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; +} + .signin { margin: 0px 10px; } @@ -71,11 +81,6 @@ html, body { /*Gather Styles*/ -.archived-gather-panel { - max-width: 1140px; - margin: 0 auto; -} - .vote-button { min-width: 60px; } @@ -246,16 +251,15 @@ html, body { .users-list-group { padding: 10px 0; - max-height: 200px; - overflow-y: scroll; } + .users-list-group-item { position: relative; display: block; - padding: 5px 10px; + padding: 5px 15px 0px 15px; margin-bottom: -1px; /*background-color: #073642;*/ - border: 1px solid #586e75; + // border: 1px solid #586e75; } .users-list-group-item:first-child { border-top-right-radius: 3px;