diff --git a/.buildpacks b/.buildpacks index 47d4c0e8..b68505fc 100644 --- a/.buildpacks +++ b/.buildpacks @@ -1,2 +1 @@ -https://github.com/heroku/heroku-buildpack-ruby.git -https://github.com/stomita/heroku-buildpack-phantomjs.git \ No newline at end of file +https://github.com/heroku/heroku-buildpack-ruby.git \ No newline at end of file diff --git a/Procfile b/Procfile index 3a5d09e8..c6cfa4cd 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1 @@ -web: bundle exec rails server -p $PORT -worker: bundle exec sidekiq -c 5 -v \ No newline at end of file +web: bundle exec rails server -p $PORT \ No newline at end of file diff --git a/app/assets/javascripts/src/Metamaps.js b/app/assets/javascripts/src/Metamaps.js index 9f82b40e..8b217563 100644 --- a/app/assets/javascripts/src/Metamaps.js +++ b/app/assets/javascripts/src/Metamaps.js @@ -1043,8 +1043,8 @@ Metamaps.TopicCard = { }); $(showCard).find('.best_in_place_desc').bind("ajax:success", function () { - this.innerHTML = this.innerHTML.replace(/\r/g, '') - var desc = $(this).html(); + this.innerHTML = this.innerHTML.replace(/\r/g, ''); + var desc = $(this).html() === $(this).data('nil') ? "" : $(this).html(); topic.set("desc", desc); topic.trigger('saved'); }); diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 1c72ee8e..cc37c590 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -141,7 +141,7 @@ input[type="submit"]:active { } .leaveSpace { display: block; - height: 50px; + height: 25px; } .hidden { display: none; @@ -2113,10 +2113,8 @@ and it won't be important on password protected instances */ padding-bottom:12px; } -#about > p, #getInvolved > p, #invite > p, #colophon p { -/* color: #000; - font-size: 16px;*/ - margin: 0px 0px 20px 0px; +#about > p, #getInvolved > p, #invite > p, #colophon p, #donate > p { + margin: 0px 0px 10px 0px; line-height: 20px; } #about ul { diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 3461e768..6f8d2399 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -796,7 +796,7 @@ } .zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarCollaborateIcon:hover .tooltipsUnder, - .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .sidebarAccountIcon:hover .tooltipsUnder, + .sidebarFilterIcon:hover .tooltipsUnder, .sidebarForkIcon:hover .tooltipsUnder, .addMap:hover .tooltipsUnder, .authenticated .sidebarAccountIcon:hover .tooltipsUnder, .mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove { display: block; } @@ -903,11 +903,11 @@ border-bottom: 5px solid transparent; } -.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarAccountIcon div:after { +.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarAccountIcon .tooltipsUnder:after { left: 38%; } -.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon div:after { +.sidebarCollaborateIcon div:after, .sidebarFilterIcon div:after, .sidebarForkIcon div:after, .addMap div:after, .sidebarAccountIcon .tooltipsUnder:after { content: ''; position: absolute; top: 128%; diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 47fbd3f0..9e6c20ce 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -158,6 +158,7 @@
The Metamaps.cc project has been bootstrapped through our own pockets, passion, and patrons - including a couple of small grants which have gone to supporting our core contributors. Some of us have used Metamaps.cc as a tool for our own freelance consulting practice, and we are starting to create hosted and customized installations of Metamaps for different clients as one business model.
@@ -166,6 +167,7 @@Financial contributions in the form of patronage/donations/gifts are greatly appreciated in support of our work. You can donate Bitcoin directly or give us a weekly gift of gratitude for the work we do on Gratipay using the links below.
If you'd like to know what your money is going towards, we publish our financials transparently - everything is recorded through our value accounting system.
+