From 9d6cf2c3c8a9a848b8d52c86400326f5a9317e9c Mon Sep 17 00:00:00 2001
From: Connor Turland <connorturland@gmail.com>
Date: Mon, 11 Aug 2014 22:47:38 -0400
Subject: [PATCH] further improved explore maps switching

---
 app/assets/javascripts/metamaps/Metamaps.Backbone.js | 2 --
 app/assets/javascripts/metamaps/Metamaps.Router.js   | 5 ++++-
 app/assets/stylesheets/base.css                      | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/metamaps/Metamaps.Backbone.js b/app/assets/javascripts/metamaps/Metamaps.Backbone.js
index 98f9060f..61921ffb 100644
--- a/app/assets/javascripts/metamaps/Metamaps.Backbone.js
+++ b/app/assets/javascripts/metamaps/Metamaps.Backbone.js
@@ -94,8 +94,6 @@ Metamaps.Backbone.MapsCollection = Backbone.Collection.extend({
     },
     getMaps: function () {
 
-        Metamaps.Loading.loader.show();
-
         var self = this;
 
         this.fetch({
diff --git a/app/assets/javascripts/metamaps/Metamaps.Router.js b/app/assets/javascripts/metamaps/Metamaps.Router.js
index a14e9bdc..3702400c 100644
--- a/app/assets/javascripts/metamaps/Metamaps.Router.js
+++ b/app/assets/javascripts/metamaps/Metamaps.Router.js
@@ -75,7 +75,10 @@
 
             Metamaps.Views.exploreMaps.setCollection( Metamaps.Maps[capitalize] );
             if (Metamaps.Maps[capitalize].length === 0) {
-                Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render
+                Metamaps.Loading.loader.show();
+                setTimeout(function(){
+                    Metamaps.Maps[capitalize].getMaps(); // this will trigger an explore maps render
+                }, 1000); // wait 500 milliseconds till the other animations are done to do the fetch 
             }
             else {
                 Metamaps.Views.exploreMaps.render();
diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css
index cce83474..a1915205 100644
--- a/app/assets/stylesheets/base.css
+++ b/app/assets/stylesheets/base.css
@@ -413,7 +413,7 @@ float:left;
 }
 
 .addLink div {
-  display: inline-block;
+  float: left;
 }
 
 #addLinkBack {
@@ -433,7 +433,7 @@ padding: 7px 31px 7px 31px;
 height: 16px;
 width: 172px;
 margin: 0 0 0 0;
-border: 1px solid #EFEFEF;
+border: 1px solid #BDBDBD;
 outline: none;
 font-size: 16px;
 line-height: 16px;
@@ -449,6 +449,7 @@ font-family: 'LatoLight';
   width: 32px;
   height: 32px;
   cursor: pointer;
+  float:none;
 }
 
 .cardSettings {