From 1e6d96fce24bea6b9a6c828aab00d17263c236d8 Mon Sep 17 00:00:00 2001
From: Devin Howard <devin@callysto.com>
Date: Thu, 24 Nov 2016 16:48:44 -0500
Subject: [PATCH] notification dot for mobile

---
 app/assets/stylesheets/mobile.scss.erb | 27 +++++++++++++-------------
 app/views/layouts/_account.html.erb    | 20 +++++++++----------
 app/views/layouts/_mobilemenu.html.erb | 12 +++++++++++-
 3 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/app/assets/stylesheets/mobile.scss.erb b/app/assets/stylesheets/mobile.scss.erb
index 46d52bc0..42576bb5 100644
--- a/app/assets/stylesheets/mobile.scss.erb
+++ b/app/assets/stylesheets/mobile.scss.erb
@@ -213,6 +213,15 @@
   line-height: 50px;
 }
 
+#menu_icon .unread-notifications-dot {
+  top: 5px;
+  left: 29px;
+  width: 12px;
+  height: 12px;
+  border: 3px solid #eee;
+  border-radius: 9px;
+}
+
 #mobile_menu {
   display: none;
   background: #EEE;
@@ -223,29 +232,19 @@
   width: 200px;
   box-shadow: 3px 3px 3px rgba(0,0,0,0.23), 3px 3px 3px rgba(0,0,0,0.16);
 
-  #menu_icon .unread-notifications-dot {
-    top: 5px;
-    left: 29px;
-    width: 12px;
-    height: 12px;
-    border: 3px solid #eee;
-  }
-
   li {
     padding: 10px;
     list-style: none;
 
     &.notifications {
       position: relative;
-    }
 
-    .unread-notifications-dot {
-      top: 4px;
-      right: 4px;
+      .unread-notifications-dot {
+        top: 17px;
+        left: 0px;
+      }
     }
   }
-
-
 }
 
 /*
diff --git a/app/views/layouts/_account.html.erb b/app/views/layouts/_account.html.erb
index 3cbf4f52..1c1cddf0 100644
--- a/app/views/layouts/_account.html.erb
+++ b/app/views/layouts/_account.html.erb
@@ -8,6 +8,16 @@
   <%= image_tag account.image.url(:sixtyfour), :size => "48x48", :class => "sidebarAccountImage" %>
   <h3 class="accountHeader"><%= account.name.split[0...1][0] %></h3>
   <ul>
+    <% if current_user.present? %>
+      <li class="accountListItem accountNotifications <%= user_has_unread_notifications? ? 'unread' : 'read' %>">
+        <div class="accountIcon">
+          <% if user_has_unread_notifications? %>
+            <div class="unread-notifications-dot"></div>
+          <% end %>
+        </div>
+        <%= link_to "Notifications", notifications_path %>
+      </li>
+    <% end %>
     <li class="accountListItem accountSettings">
       <div class="accountIcon"></div>
       <%= link_to "Account", edit_user_url(account) %>
@@ -22,16 +32,6 @@
       <div class="accountIcon"></div>
       <%= link_to "Apps", oauth_authorized_applications_path %>
     </li>
-    <% if current_user.present? %>
-      <li class="accountListItem accountNotifications <%= user_has_unread_notifications? ? 'unread' : 'read' %>">
-        <div class="accountIcon">
-          <% if user_has_unread_notifications? %>
-            <div class="unread-notifications-dot"></div>
-          <% end %>
-        </div>
-        <%= link_to "Notifications", notifications_path %>
-      </li>
-    <% end %>
     <li class="accountListItem accountInvite openLightbox" data-open="invite">
       <div class="accountIcon"></div>
       <span>Share Invite</span>
diff --git a/app/views/layouts/_mobilemenu.html.erb b/app/views/layouts/_mobilemenu.html.erb
index e012a808..c557f516 100644
--- a/app/views/layouts/_mobilemenu.html.erb
+++ b/app/views/layouts/_mobilemenu.html.erb
@@ -2,7 +2,11 @@
   <div id="header_content">
     <%= yield(:mobile_title) %>
   </div>
-  <div id="menu_icon"></div>
+  <div id="menu_icon">
+    <% if user_has_unread_notifications? %>
+      <div class="unread-notifications-dot"></div>
+    <% end %>
+  </div>
 </div>
 <div id="mobile_menu">
   <ul>
@@ -49,6 +53,12 @@
       <li>
         <%= link_to "Account", edit_user_url(current_user) %>
       </li>
+      <li class="notifications">
+        <%= link_to "Notifications", notifications_path %>
+        <% if user_has_unread_notifications? %>
+          <div class="unread-notifications-dot"></div>
+        <% end %>
+      </li>
       <li>
         <%= link_to "Sign Out", "/logout", id: "Logout" %>
       </li>