From 2a541bdedbbe461c8d39062560376dc22ff3ce42 Mon Sep 17 00:00:00 2001
From: Ena Bek <enabek@gmail.com>
Date: Thu, 30 Jun 2016 11:10:56 -0400
Subject: [PATCH 1/3] Add message drop down fix

---
 app/views/layouts/_header.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index b686a9a..ebdf6cc 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -20,18 +20,18 @@
           <a data-activates="slide-out" class="button-collapse">
           <i class="mdi-navigation-menu material-icons">reorder</i></a>
 
-            <li><a href="/users/<%=current_user.id%>">  
-                <i class="material-icons">message</i>
-                </a>
-            </li> 
-            <li><a href="/groups/<%=current_user.groups.first.id %>">
-                <i class="material-icons">supervisor_account</i>
-                </a>
-            </li>
-            <li><a href="/users/<%=current_user.id%>">
-                <i class="material-icons">assignment_ind</i>
-                </a>
-            </li>
+          <li><a class="dropdown-button" data-activates="group-chat-drop"><i class="material-icons chat-bubble">message</i></a></li>
+
+          <li><a href="/user_groups">
+              <i class="material-icons">supervisor_account</i>
+              </a>
+          </li>
+          <li><a href="/users/<%=current_user.id%>">
+              <i class="material-icons">assignment_ind</i>
+              </a>
+          </li>
+          </div>
+      
         <% else %>
           <div class="hide-on-large-only">
             <li class="brand-logo">TaskMate</li>
@@ -43,4 +43,4 @@
           </div>
         <% end %>
       </ul>
-  </nav>
+  </nav>
\ No newline at end of file

From cc0e58e6e8ead175515e88112404c4517177597e Mon Sep 17 00:00:00 2001
From: Ena Bek <enabek@gmail.com>
Date: Thu, 30 Jun 2016 11:16:23 -0400
Subject: [PATCH 2/3] Remove broken link to add member in user#show to make
 page work

---
 app/views/conversations/show.html.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/conversations/show.html.erb b/app/views/conversations/show.html.erb
index 77e8277..d9168bd 100644
--- a/app/views/conversations/show.html.erb
+++ b/app/views/conversations/show.html.erb
@@ -1,6 +1,5 @@
 <div id="chat-box">
   <div id="messages-container">
-  <%= link_to "Add a Member", %>
     <% if @messages %>
       <% @messages.each do |message| %>
         <% if message.sender == current_user %>

From 5c0e4d683af938eec74737763572a81e3c895ef6 Mon Sep 17 00:00:00 2001
From: Ena Bek <enabek@gmail.com>
Date: Thu, 30 Jun 2016 11:36:35 -0400
Subject: [PATCH 3/3] Style members#new

---
 app/views/invites/new.html.erb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/invites/new.html.erb b/app/views/invites/new.html.erb
index b24f241..18fada7 100644
--- a/app/views/invites/new.html.erb
+++ b/app/views/invites/new.html.erb
@@ -1,4 +1,4 @@
-<h4 class="group-join">Add Members to:</h4>
+<h4 class="group-join create-task center-align">Add members to:</h4>
 
 <div id="invite-message"></div>
 <div class="input-field">
@@ -11,6 +11,8 @@
 		<% end %>
 
 		<%= f.text_field :invitee, placeholder: "enter a member's email"  %>
-		<%= f.submit "invite"%>
+		<button class="waves-effect waves-light btn task-button">
+			<%= f.submit "invite"%>
+		</button>
 	<% end %>
-</div>
\ No newline at end of file
+</div>