From 8fd7e1cd0044d0fb88b5b3bcd0bd1c92a77eb5b0 Mon Sep 17 00:00:00 2001
From: alexthomson1 <alexthomson070@gmail.com>
Date: Wed, 1 Jan 2020 14:01:21 -0700
Subject: [PATCH 1/3] Prevent accidentally closing tasks in edit mode.

---
 website/client/src/components/tasks/taskModal.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue
index be135b38fe..e31fddf3b5 100644
--- a/website/client/src/components/tasks/taskModal.vue
+++ b/website/client/src/components/tasks/taskModal.vue
@@ -1,8 +1,8 @@
 <template>
   <b-modal
     id="task-modal"
-    :no-close-on-esc="showTagsSelect"
-    :no-close-on-backdrop="showTagsSelect"
+    :no-close-on-esc="true"
+    :no-close-on-backdrop="true"
     size="sm"
     @hidden="onClose()"
     @show="handleOpen()"

From 8bd27b8313711b5a8a7031cd021d65412e1129b3 Mon Sep 17 00:00:00 2001
From: alexthomson1 <alexthomson070@gmail.com>
Date: Sat, 11 Jan 2020 23:16:24 -0700
Subject: [PATCH 2/3] Fixed bug in desktop navigation causing dropdown menu to
 get stuck until moused over again.

---
 website/client/src/assets/scss/dropdown.scss  | 10 +++---
 website/client/src/components/header/menu.vue | 33 +++++++++++--------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/website/client/src/assets/scss/dropdown.scss b/website/client/src/assets/scss/dropdown.scss
index efe06ebf7d..d573e6a1b2 100644
--- a/website/client/src/assets/scss/dropdown.scss
+++ b/website/client/src/assets/scss/dropdown.scss
@@ -35,22 +35,24 @@
   line-height: 1.71;
   color: $gray-50;
   cursor: pointer;
+  background-color: $purple-200;
 
   &:focus {
     outline: none;
     background-color: inherit;
   }
 
+
   &:active, &:hover, &.active {
-    background-color: rgba(#d5c8ff, 0.32);
+    background-color: #6133B4;
     color: $purple-200;
   }
 
   &.dropdown-inactive {
     cursor: default;
-    
+
     &:active, &:hover, &.active {
-      background-color: inherit;
+      background-color: $purple-200;
       color: inherit;
     }
   }
@@ -97,4 +99,4 @@
   .dropdown-menu.show {
     width: 100% !important;
   }
-}
\ No newline at end of file
+}
diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue
index c2b55381c2..d1a26d3e23 100644
--- a/website/client/src/components/header/menu.vue
+++ b/website/client/src/components/header/menu.vue
@@ -58,8 +58,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/inventory'),
-              'down': $route.path.startsWith('/inventory') && isDesktop()}"
+              'active': $route.path.startsWith('/inventory')}"
           >
             <div
               class="chevron rotate"
@@ -102,8 +101,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/shop'),
-              'down': $route.path.startsWith('/shop') && isDesktop()}"
+              'active': $route.path.startsWith('/shop')}"
           >
             <div
               class="chevron rotate"
@@ -169,8 +167,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/groups'),
-              'down': $route.path.startsWith('/groups') && isDesktop()}"
+              'active': $route.path.startsWith('/groups')}"
           >
             <div
               class="chevron rotate"
@@ -212,8 +209,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/group-plans'),
-              'down': $route.path.startsWith('/group-plans') && isDesktop()}"
+              'active': $route.path.startsWith('/group-plans')}"
           >
             <div
               v-if="groupPlans.length > 0"
@@ -246,8 +242,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/challenges'),
-              'down': $route.path.startsWith('/challenges') && isDesktop()}"
+              'active': $route.path.startsWith('/challenges')}"
           >
             <div
               class="chevron rotate"
@@ -283,8 +278,7 @@
           <li
             class="topbar-item droppable"
             :class="{
-              'active': $route.path.startsWith('/help'),
-              'down': $route.path.startsWith('/help') && isDesktop()}"
+              'active': $route.path.startsWith('/help')}"
           >
             <div
               class="chevron rotate"
@@ -809,7 +803,11 @@ export default {
     },
     dropdownDesktop (hover) {
       if (this.isDesktop() && hover.target.classList.contains('droppable')) {
-        this.dropdown(hover.target);
+        if (hover.type === 'mouseenter') {
+          this.openDropdown(hover.target);
+        } else {
+          this.closeDropdown(hover.target);
+        }
       }
     },
     dropdownMobile (click) {
@@ -827,6 +825,15 @@ export default {
       element.classList.toggle('down');
       element.lastChild.style.maxHeight = element.classList.contains('down') ? `${element.lastChild.scrollHeight}px` : 0;
     },
+    closeDropdown (element) {
+      element.classList.remove('down');
+      element.lastChild.style.maxHeight = 0;
+    },
+    openDropdown (element) {
+      element.classList.add('down');
+      element.lastChild.style.maxHeight = `${element.lastChild.scrollHeight}px`;
+    },
+
     closeMenu () {
       if (this.isMobile()) {
         this.menuIsOpen = false;

From ab4009bd32b11402ab7aa1a8759c176d2cad8386 Mon Sep 17 00:00:00 2001
From: alexthomson1 <alexthomson070@gmail.com>
Date: Sat, 25 Jan 2020 18:28:26 -0700
Subject: [PATCH 3/3] Refactoring dropdown.vue so that dropdownMobile calls
 openDropdown and closeDropdown

---
 website/client/src/components/header/menu.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/client/src/components/header/menu.vue b/website/client/src/components/header/menu.vue
index d1a26d3e23..5d27050b3e 100644
--- a/website/client/src/components/header/menu.vue
+++ b/website/client/src/components/header/menu.vue
@@ -811,9 +811,7 @@ export default {
       }
     },
     dropdownMobile (click) {
-      this.dropdown(click.currentTarget.parentElement);
-    },
-    dropdown (element) {
+      const element = click.currentTarget.parentElement;
       const droppedElement = document.getElementsByClassName('down')[0];
       if (droppedElement && droppedElement !== element) {
         droppedElement.classList.remove('down');
@@ -821,9 +819,11 @@ export default {
           droppedElement.lastChild.style.maxHeight = 0;
         }
       }
-
-      element.classList.toggle('down');
-      element.lastChild.style.maxHeight = element.classList.contains('down') ? `${element.lastChild.scrollHeight}px` : 0;
+      if (element.classList.contains('down')) {
+        this.closeDropdown(element);
+      } else {
+        this.openDropdown(element);
+      }
     },
     closeDropdown (element) {
       element.classList.remove('down');