From 1227eaa84c39cbafb007fdee3faeae73f326613c Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Tue, 17 May 2016 22:49:43 -0400
Subject: [PATCH 1/2] Move the recurring todo dialog below the navbar

Fixes #2007
---
 app/assets/javascripts/tracks.js.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index d3f9fd5b..75c8679d 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -812,6 +812,7 @@ var RecurringTodosPage = {
         autoOpen: false,
         height: 690,
         width: 750,
+        position: { my: 'top', at: 'bottom+10', of: 'nav', collision: 'none' },
         modal: true,
         buttons: {
           create: {
@@ -845,6 +846,7 @@ var RecurringTodosPage = {
         autoOpen: false,
         height: 690,
         width: 750,
+        position: { my: 'top', at: 'bottom+10', of: 'nav', collision: 'none' },
         modal: true,
         buttons: {
           "Update": {

From 091697fe1e1fe71b3934480d15af843931607bd6 Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Tue, 17 May 2016 23:16:23 -0400
Subject: [PATCH 2/2] Fix recurring todo edit form formatting

Fixes #1938
---
 app/assets/javascripts/tracks.js.erb   | 3 ++-
 app/assets/stylesheets/legacy.css.scss | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/tracks.js.erb b/app/assets/javascripts/tracks.js.erb
index 75c8679d..9fdbbb90 100644
--- a/app/assets/javascripts/tracks.js.erb
+++ b/app/assets/javascripts/tracks.js.erb
@@ -866,7 +866,8 @@ var RecurringTodosPage = {
           RecurringTodosPage.hide_all_recurring();
           RecurringTodosPage.reset_radio();
           $('#recurring_daily').show();
-        }
+        },
+        appendTo: "#content"
       });
 
       /* change recurring period radio input on edit form */
diff --git a/app/assets/stylesheets/legacy.css.scss b/app/assets/stylesheets/legacy.css.scss
index 8391c817..dd9519eb 100644
--- a/app/assets/stylesheets/legacy.css.scss
+++ b/app/assets/stylesheets/legacy.css.scss
@@ -707,6 +707,10 @@ li {
     position:relative;
 }
 
+#edit-recurring-todo {
+  background: #fff;
+}
+
 /* Right align labels in forms */
 .label {
     text-align: right;