removed worker from heroku deploy. styled lightboxes. made form for new user able to populate with code
This commit is contained in:
parent
ac40c0af48
commit
4e8dabba36
8 changed files with 15 additions and 15 deletions
|
@ -1,2 +1 @@
|
||||||
https://github.com/heroku/heroku-buildpack-ruby.git
|
https://github.com/heroku/heroku-buildpack-ruby.git
|
||||||
https://github.com/stomita/heroku-buildpack-phantomjs.git
|
|
3
Procfile
3
Procfile
|
@ -1,2 +1 @@
|
||||||
web: bundle exec rails server -p $PORT
|
web: bundle exec rails server -p $PORT
|
||||||
worker: bundle exec sidekiq -c 5 -v
|
|
|
@ -1043,8 +1043,8 @@ Metamaps.TopicCard = {
|
||||||
});
|
});
|
||||||
|
|
||||||
$(showCard).find('.best_in_place_desc').bind("ajax:success", function () {
|
$(showCard).find('.best_in_place_desc').bind("ajax:success", function () {
|
||||||
this.innerHTML = this.innerHTML.replace(/\r/g, '')
|
this.innerHTML = this.innerHTML.replace(/\r/g, '');
|
||||||
var desc = $(this).html();
|
var desc = $(this).html() === $(this).data('nil') ? "" : $(this).html();
|
||||||
topic.set("desc", desc);
|
topic.set("desc", desc);
|
||||||
topic.trigger('saved');
|
topic.trigger('saved');
|
||||||
});
|
});
|
||||||
|
|
|
@ -141,7 +141,7 @@ input[type="submit"]:active {
|
||||||
}
|
}
|
||||||
.leaveSpace {
|
.leaveSpace {
|
||||||
display: block;
|
display: block;
|
||||||
height: 50px;
|
height: 25px;
|
||||||
}
|
}
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
|
@ -2113,10 +2113,8 @@ and it won't be important on password protected instances */
|
||||||
padding-bottom:12px;
|
padding-bottom:12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#about > p, #getInvolved > p, #invite > p, #colophon p {
|
#about > p, #getInvolved > p, #invite > p, #colophon p, #donate > p {
|
||||||
/* color: #000;
|
margin: 0px 0px 10px 0px;
|
||||||
font-size: 16px;*/
|
|
||||||
margin: 0px 0px 20px 0px;
|
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
}
|
}
|
||||||
#about ul {
|
#about ul {
|
||||||
|
|
|
@ -796,7 +796,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.zoomExtents:hover .tooltips, .zoomIn:hover .tooltips, .zoomOut:hover .tooltips, .takeScreenshot:hover .tooltips, .sidebarCollaborateIcon:hover .tooltipsUnder,
|
.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 {
|
.mapInfoIcon:hover .tooltipsAbove, .openCheatsheet:hover .tooltipsAbove {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
|
@ -903,11 +903,11 @@
|
||||||
border-bottom: 5px solid transparent;
|
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%;
|
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: '';
|
content: '';
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 128%;
|
top: 128%;
|
||||||
|
|
|
@ -158,6 +158,7 @@
|
||||||
|
|
||||||
<div class="lightboxContent" id="donate">
|
<div class="lightboxContent" id="donate">
|
||||||
<h3>Donate!</h3>
|
<h3>Donate!</h3>
|
||||||
|
<div class="leaveSpace"></div>
|
||||||
|
|
||||||
<p>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.</p>
|
<p>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.</p>
|
||||||
|
|
||||||
|
@ -166,6 +167,7 @@
|
||||||
<p>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.</p>
|
<p>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.</p>
|
||||||
|
|
||||||
<p>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.</p>
|
<p>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.</p>
|
||||||
|
<div class="leaveSpace"></div>
|
||||||
<script data-gratipay-username="Metamaps.cc" src="//gttp.co/v1.js"></script>
|
<script data-gratipay-username="Metamaps.cc" src="//gttp.co/v1.js"></script>
|
||||||
<div style="font-size:16px;margin:0 auto;width:300px" class="blockchain-btn"
|
<div style="font-size:16px;margin:0 auto;width:300px" class="blockchain-btn"
|
||||||
data-address="15z24wj6E9tTsJgEBjnK81CtJ7kZZmxJYN"
|
data-address="15z24wj6E9tTsJgEBjnK81CtJ7kZZmxJYN"
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<%= f.password_field :password_confirmation %></div>
|
<%= f.password_field :password_confirmation %></div>
|
||||||
|
|
||||||
<div><%= f.label "Access Code:", :class => "fieldText" %>
|
<div><%= f.label "Access Code:", :class => "fieldText" %>
|
||||||
<%= f.text_field :joinedwithcode %></div>
|
<%= f.text_field :joinedwithcode, :value => params[:code] %></div>
|
||||||
|
|
||||||
<div><%= f.submit "Sign up!" %></div>
|
<div><%= f.submit "Sign up!" %></div>
|
||||||
|
|
||||||
|
|
2
buildpackswithphantom.txt
Normal file
2
buildpackswithphantom.txt
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
https://github.com/heroku/heroku-buildpack-ruby.git
|
||||||
|
https://github.com/stomita/heroku-buildpack-phantomjs.git
|
Loading…
Reference in a new issue